gentoo auto-resync : 30:07:2022 - 09:09:33

1088 files changed, 6298 insertions, 6650 deletions

diff --git a/Manifest b/Manifest
index 4aa6f8c3c1d6..a89f49756d6b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29626 BLAKE2B c687e7ea067ec0859a84de2cfe7ade9e134a7f7b451f2cf4e7ae9894adb397531d9feeb1ebb82819277fdb34f9e922a45f48b429ed7ed4babdd4701ead6ab3e0 SHA512 1b8c070ba040915e3e11cf448bf72ced5974419c4a0421c68f405e5518f81c5ff4b820cc3db04998f271eeb58e6ee9c8c6ff3940a353123f227fbf74ff73056b
-TIMESTAMP 2022-07-30T00:39:36Z
+MANIFEST Manifest.files.gz 29624 BLAKE2B c694ca72fbb7e391a5cd10450c768a6f64bc264ee4c3a67ec8281e31b38b721448bed894837c829ef0a2f9c79b6b19279fc247e2539ad11b6a091e3c818acd7f SHA512 87988038cc3f2857e38cfdb48814a6a05efb10a9bb3c1764b93052f5aa1d75fd3a373c8eb9328be9ec0826e18cefefca72aa5e6384e3866c0ff05b799a2e8ad9
+TIMESTAMP 2022-07-30T06:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkfchfFIAAAAAALgAo
+iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLk0jJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDQsRAAjMGbfY6SI6C57yp1YR6da/lJynCPf2EC7unMxg34HjWC87siokLyZyEg
-IGa0kqQJcMYUQ1LwO7qfKizN+D2KBe1cG/vXLrrrUf3vBCGMpOxhQqvxKM5IpRSr
-4WxsWlURJeMGk/HOse340ty1YZvIgmKR7tHVa/pJYZYcDFKZ8zHdLM3to/wOLar0
-EZlLd33ikkjF8eEihqSd+btfRlaMuq9GFSdqwshb0SA3HRLIZJRv5QN/1rtjyVYL
-KaMRXTwNFpWdKpxf8zt1ioFWh6dHzJFVjV/a91l7a18ExTUA7M1EwjeY7EwUW/4X
-NpO4aCvMjOsn0VUNV5AFaI1fN+uKZqTg0UtNWv5jg06101kjkKSt3pgpvlFgZ6XG
-nGm9qhifpXQaZkGiWkKEqrz9nb+ZbYwgJCMbtik0niclLuYIMwhXSzO0n7mREN92
-ghWwptOLoIyTVEDcHjMypkBZniKomw5pCalFPxNClegCTKhXtqEzQESNw7u1k+6+
-C182ySpA7vFPjOfWviZwwcSFwLUFv2GRRtaLp0TzEnJJjzfK1vBoJa8TQ4FeBRB0
-yIaBRdgThrYyX7m4Y1RU8Rhoc0uzzdZxM4R7sZIj1s7vHmgfbAvWPJWYRxfQ6FVp
-IScFHL1JxNOFM0ZeYRz4JnvYPJCaqzMGLlyg5bnZBpL6DdVMWrk=
-=wzhq
+klAStQ/4o4ew299kRpDmI/P5zssTZU1NsnBf1QK/Dwtfo65/i945ot3hFB9vuyOj
+/IuoptD/raBotuVMdf+RC6Tf2MfSzr7rD6gH42vO2EGA/TEVmHNAbrUQQoKAKcdr
+MJ7XXwGvB820tTqoSNFHt1V5OGuOhn53/62SxujQd6naTh1NONQ9qYenKuxGaLj8
+ovfuoLzZMcUyz8GpDpPQZyogVU+gmPq0mF6++X4PvWx4BHYOGsQxdDZfzA1rVxnB
+RTvID7B61oex3vpzMLrcAG3MF1QgeVAD3VGc0kYCXsNGkQqgdeknyXwBS8DmVQpJ
+MTTV/vj2Y8OhH16L8b72IIWymSuCMODgBAZlD9vs0pXKN3ht852MwF3hW+wW0A6R
+fXuEIBfKKFUferzMxWf+T4kw2sRKN953QSQecy3Pe8KGfBA94BsP4yZBmCFb6Wem
+qUIzsYXyjzGuEldX72bsEPm6FmkOu/CL5Mv+929zxWcdBzztKj+TmZp6lYKvzJJF
+CpM8oDIEjlZfR5+juH4WxZpzowFPUX15ZuXCoCV98Mn1ZBcGh6taXimKvuPCcmJv
+vTVMFhqdbzJqlaefE0+z41iSU4wwE/EdMwbvzyYkfDtXk1fPpHEbRONPX/r8D1vq
+xE8ZnHeRqPuwloOrLp2F3810iDz6yJX6BobmY26bWLE2fzKOaw==
+=HmMa
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index cfd849d1fe8d..39fdebbabf9f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 88af92097f42..d1831d1ca57b 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 0875aced0cd7..272cf6c11fff 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,4 +1,6 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 DIST nxml-gentoo-schemas-20220525.tar.xz 8836 BLAKE2B 5506f976b43218d5bb85ae96c31137c51691cef5f3a524d4214584cc0cb1dae26f45b97d636c8361ec06e7bff5cbf2337b8ed82795aba72dd079127db2238ece SHA512 7df23a9d73a09fc26c6e38665d28c3b633d371bf9c84d56b9318045d80ccab23c3b9c115d68efd6733b9048918118612a05405a1a590b41eac4fb7405746b34e
+DIST nxml-gentoo-schemas-20220730.tar.xz 8856 BLAKE2B 7c08bd09242a30998d6dd535b5143bb920aebaaf209f9acbac734fec258d08711945d58322912f455ef251d59df7f6bad8bec8a758065d67c63cd9dc926950f6 SHA512 91c2183acb3d435e5deca67cb0e9c14fb0af1795a490c8f35076442dcf7f49bff419e3f74d3a34f5790faafd68c643e152ff292c0e994e6ec8f34e4f74efa3fd
 EBUILD nxml-gentoo-schemas-20220525.ebuild 605 BLAKE2B 044abdce5f928923960fee501cb237c924a6b0e368f496a1fe333a47dc67a32eee610dfcd0710b6d10fbc93d446880adc088e04b85055556f674faca4d134251 SHA512 04e8077a40dafca96fb08e851c61a493104ea139144f3278cd002e5160390771b50d5af670ab284c611d7b78d1cb23127ecc0ad1ce79379c63a474c4ef39fc86
+EBUILD nxml-gentoo-schemas-20220730.ebuild 612 BLAKE2B d5a9e12ffaf904d633192aef3553e32b3a59afa8663d0a94d4b5d68cca0da23597096c28dc68ca472edbd5dec09a47261cdbba41f2b03bda027006eac3c14207 SHA512 fb23fb411e5d2e4488b9abe427d1aff73bb6e9f13afc4efbd52ec94dfa45aded1a50121d323768b36ee1187fac062f4043b5a6a6c14ad980bc371f77c564e25f
 MISC metadata.xml 370 BLAKE2B 2af6298a56b5da7f2c32b4bed09ae442df3068aecaddf3be04c6d6d4abed1f23430d14a54bb33b13580cfeca7177e2da00c8eab62d17a84427ad1201e105572b SHA512 abaa11228666364188cd1b23903b43b5b49456050287ba12be8a6bd31a1f063c65b3efe50de478614f8f70f953ae22b238989724be5179df71a2ce820d356904
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild
new file mode 100644
index 000000000000..b17eee1c1d08
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 74603cc88e13..e7efbf0c624f 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 316344c21bd5..1418e15ad27e 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,7 +1,5 @@
-DIST ibus-typing-booster-2.16.0.tar.gz 10811558 BLAKE2B d171972f3c6242234ce73112e4ea8fde9e713e102a7fb2111017e7489811c1128146582e2a9a60f49dfca8b5282949415fb33e79b7c1be16521dba2dd03536fa SHA512 a90ea11a72d770765ef55ff6fc288bf6ddfa5e5ae1c7393f195ed3466a207022872f5e27f9629101b8b31e26c84dc8512e4cd261b2c503fd98daa8438e47dfb9
 DIST ibus-typing-booster-2.16.7.tar.gz 10819738 BLAKE2B ac9da1e63d97045881d8012b5dc6bd27cb8ee48aff065876cede2b40a81518880e610580f13590ad89f6261ced266e1d245183ea77a3a56e32b60af08af28470 SHA512 f0dda59b43460c39392ab12748780e93668ac81aa04b15aae2afa2025ce8bbc9e2712430658f43db7e86c7a1e59271d62ecf6cda6cb2b9cc554134000c21c95b
-DIST ibus-typing-booster-2.18.0.tar.gz 10842286 BLAKE2B 5aebac3da0d706a14d5aa5ae7a0085fbfe48d42c0eb855983f69865c1145661b7dcf401a5aa4aca1b7cdd500f41a24f94fa536617707ed14966cbe2429c8616b SHA512 11355bd254dbb9776005fac058541b8761bb2e68cc18f98afcef707a334049696d4698e490bc57bda69903820b37b692544fd1a789923649427d820c37d67a25
-EBUILD ibus-typing-booster-2.16.0.ebuild 1150 BLAKE2B 7dbb9179f77c4a6d5dc619a9a33488c048bf4caee8dae5d58781c2210cff7b063f9b1192dd865e3820f38168e5559284783c97e16b7774e6c7a87f6e872b7b62 SHA512 6887d95b52245276feced655d8e0fe407c618fbe60eb48fc5abb44402498aaeab25b6639f0f460d67fe546476ab36cd2c381e127f03ac63a35a0e8f11f3d81d5
-EBUILD ibus-typing-booster-2.16.7.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
-EBUILD ibus-typing-booster-2.18.0.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
+DIST ibus-typing-booster-2.18.6.tar.gz 10970204 BLAKE2B 983d25dc3bd5fcfa1ffc770dbd6fdfcc13dec14e5c96da05576dff046bc968403c0d6649b854bf75e1bec6b6c44c5e959792583ec0902a1eb17f30a52b34e936 SHA512 7bd43f5a5c8a9b22979c84987e71b2466a7e110da43bd994b541c2f581b81804633983477575e770f2fb075098b9f6d2991da83e7c52632b62083f9704ede056
+EBUILD ibus-typing-booster-2.16.7.ebuild 1150 BLAKE2B 7dbb9179f77c4a6d5dc619a9a33488c048bf4caee8dae5d58781c2210cff7b063f9b1192dd865e3820f38168e5559284783c97e16b7774e6c7a87f6e872b7b62 SHA512 6887d95b52245276feced655d8e0fe407c618fbe60eb48fc5abb44402498aaeab25b6639f0f460d67fe546476ab36cd2c381e127f03ac63a35a0e8f11f3d81d5
+EBUILD ibus-typing-booster-2.18.6.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
 MISC metadata.xml 331 BLAKE2B e076fda3780cbfebae0a799bcc320de0417dfc2a726320c014d253163625da4fd629b180442449368e316e134bf2024f7e03373f2ca0342c4b63a11c63475697 SHA512 f79eaa01a0ad3005064928ef7fbaed4bc98f8850ca36b23309096647b6158c7500e0075f149e4e764a89af99a8fe342eb6a1d9b83a347557300545ecf870e4d8
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
deleted file mode 100644
index 23bfd6ae5804..000000000000
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Completion input method for IBus"
-HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
-SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/m17n-lib
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	')"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild
index 58166b805e3c..23bfd6ae5804 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.6.ebuild
index 58166b805e3c..58166b805e3c 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.6.ebuild
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index 7d8138cb1901..e7385261bf27 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,5 +1,5 @@
 DIST manpages-l10n-4.14.0.tar.bz2 102563001 BLAKE2B 500744ab21482e83e076543539dac58b16e2dfb1f4a0f38b9adfe933cc69a0d68534663e3bc07f053ad3580021b34150fe8a40e9ecd0d01b968f8570ca74b051 SHA512 335b7b34ed6135b5ceb53a75cee2f71198733df02ba8727d55863f2ceb4ae37c44636d78feca123f5d53ba07018af2ce51567c0605b242dcb441a0a56dcf9106
 DIST manpages-l10n-v4.12.1.tar.bz2 90676890 BLAKE2B 7f261407007971063abc34f1154f5ab7d5a268dd21c76185f47cfbd73a1091950a3dc7bf0d4ad6bac56259fecbc1524b35b42316a1c2103f426ed936e203607d SHA512 42f5c61591959a0d804c215a9baddd6a182b30aedf5f6d6899f621cc8da9936fc10a1353aad5027eb4177f391f9708cc3018333256444433e937d37d8cdd3067
 EBUILD man-pages-l10n-4.12.1-r2.ebuild 2112 BLAKE2B 8ab78f455497c8761f70a55987bfc1ec80db54b20b29d3b782fb02dbe5addeaccc14531822e8088cb20d532d0d15e7eb1c333d7f812a1701495e2ad92c956ed7 SHA512 a4216b00dc86e76b790a80136edfc704ccbe935fc03dc2aca8059fbe894371f845520da8e921bfdb088730c8a88e0bc90efced57c3796a0d71fd47c23ffd28b8
-EBUILD man-pages-l10n-4.14.0.ebuild 1991 BLAKE2B 34d2dcb96b79c72a78e01972313143fa3a8811cd5be0a218ae4e6a1df86a3bdc6bc5659a9fa3b652a136e732c48940641faed4389bf11ce5f4b2afcf58d0be68 SHA512 7002e694ff8ffef305110e38e6ca7fdb12359edeeeabbb36ebb0335c9bc6633f50d0ff7d27ecdad59537fc8efafe27c65dbaa36da45fcb50d6dd199b6bf3c24b
+EBUILD man-pages-l10n-4.14.0-r1.ebuild 1758 BLAKE2B fa36fff87ba8946f2fa54d3372084145074ca90f7cc88227b16e756d7517bc9093928aa69a98ff56eb5dff0974ab638edce53ce2c954382ed3acc9ecb53e020f SHA512 c145dc8e1e648b74052cb2c93e85482656d6749e387bfe29c4a0aa91681e33b0d584edd2dc81b96ee8ab0afbc886e405496d50fcb7289eb34c70dcb736766bb0
 MISC metadata.xml 236 BLAKE2B 4573b45e3f887eefa853dc47285138b1804285f5fca6cbc79cc9a475d19d9fe653ae5be35dfa9e8b04e5cf8e0de0ad4c58c8ec1b0c013213a01c13e7cbec2394 SHA512 3c9ef4b64af9b84abb15d7e0d315767d85a0ddb001471e4e8f0108ba4381fcf4bf3d7474929813e0da27d068e75b1bae56fdaadbb701d4f5f8a768e25c1b882b
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild
index 3254d8837780..f3ee6041875e 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild
@@ -32,50 +32,51 @@ src_prepare() {
 	sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
 
 	# some packages have their own translations
-	local noinst_manpages=(
+	local f noinst_manpages=(
 		# app-arch/xz-utils
-		de/xz.1
-		de/xzdec.1
-		de/xzdiff.1
-		de/xzgrep.1
-		de/xzless.1
-		de/xzmore.1
+		xz.1
+		xzdec.1
+		xzdiff.1
+		xzgrep.1
+		xzless.1
+		xzmore.1
 		# sys-apps/shadow
-		{cs,de,es,hu,nl,pl}/groups.1
-		de/su.1
+		groups.1
+		su.1
 		# sys-apps/sysvinit
-		de/last.1
-		de/mesg.1
-		de/mountpoint.1
-		de/utmpdump.1
-		de/wall.1
-		fr/bootlogd.8
-		de/halt.8
-		{fr,pl}/killall5.8
-		de/runlevel.8
-		de/sulogin.8
+		last.1
+		mesg.1
+		mountpoint.1
+		utmpdump.1
+		wall.1
+		bootlogd.8
+		halt.8
+		killall5.8
+		runlevel.8
+		sulogin.8
 		# sys-process/procps
-		{de,fr,pl}/free.1
-		{de,fr}/pgrep.1
-		{de,fr}/pmap.1
-		{de,fr,pl}/ps.1
-		{de,fr}/pwdx.1
-		{de,fr}/tload.1
-		{de,fr,pl}/uptime.1
-		{de,fr}/sysctl.conf.5
-		{de,fr}/sysctl.8
-		{de,fr}/vmstat.8
+		free.1
+		pgrep.1
+		pmap.1
+		ps.1
+		pwdx.1
+		tload.1
+		uptime.1
+		sysctl.conf.5
+		sysctl.8
+		vmstat.8
 		# sys-process/psmisc
-		{de,nl,pl}/fuser.1
-		{de,pl}/killall.1
-		de/peekfd.1
-		de/prtstat.1
-		de/pslog.1
-		{de,pl}/pstree.1
+		fuser.1
+		killall.1
+		peekfd.1
+		prtstat.1
+		pslog.1
+		pstree.1
 	)
-	printf '%s\n' "${noinst_manpages[@]}" \
-		| sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm
-	assert
+
+	for f in "${noinst_manpages[@]}"; do
+		rm po/*/"man${f##*.}/${f}.po" || die
+	done
 }
 
 src_configure() {
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7c92de3e126c..41e5e2df65e7 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index bb3d0194882b..6954f8e37b07 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,5 +1,7 @@
 DIST mgorny-dev-scripts-21.tar.gz 11674 BLAKE2B cb3c217df259a6ef48f8e11da8d42c3dcba6c50cbed7e9006d0a02520b0f4bd54a7ea330c680f8570a93d799accfd7f93f410e8fc085cd544fb9f09168a47f84 SHA512 be49f0f5392817cf881ec9bcbca78da525f8170b0f9babdfcc0f7c2b9fdd3a0bd31db332498e98c937b22b3b6a5b6325ec2f7150548847cbbdc915d589a99b06
 DIST mgorny-dev-scripts-22.tar.gz 11684 BLAKE2B 6a17ecec290d761df650d8607f246411d85e80e8511ef1073d671878544785c055dfc4e35bb9e8d937747eac731e4c18075dcbc95044fff3bfe3e8567ed9300b SHA512 597505fe6d27fb0f21308a4966714bc9161e976abe66ac5437d4705a161d960a4beeaa9d3dc36346e69221b1dc912a5957a6ad537ae0f7b4b96f33a419d6933b
+DIST mgorny-dev-scripts-24.tar.gz 11691 BLAKE2B bfc81908b4769a111eee3ad12c931f8d3c1b60715d6b9828ff091da19a7df8258878105cfb402f7b1f4760f27e746db5e65e452bc5a727366cdd51be442e5bd2 SHA512 f2fd31f1a8c9de6b7310c7cc24bf861836948a9d88adb389ebdde9fc0d365efafae908f7fdba556a83c6de607587c55a90fd96116c48e78d39900e8b6dfb15b7
 EBUILD mgorny-dev-scripts-21.ebuild 662 BLAKE2B 19c9b1e870586b42036e48983021b78c5237ad4492d2819fa74a4c9090f9123dc69aa938dcab8c1d6cd78b637e4820ed34a3233b394fad7d46eba11f82945eb7 SHA512 c26fde3efa808e48b2414ef1f7106ff2d1788c3c868efe50a2405977d060149e7116c8c6f8a5220cb4870ffc28d4b9d3298f57ca9ded609e45be71aa557f055d
 EBUILD mgorny-dev-scripts-22.ebuild 666 BLAKE2B d710ad936e36c317afcd07ecedd163a30c30669e259d0f9379abf123ff8081a178d95c92aa9f05f267bb69173819ae0d8e3ff0a69b53bfd33fd0d05b41672455 SHA512 28fd5a01b940970ee1a5eead332cde991ed0feae7b030aed7cef34b866e75572d6abe9f48c3cbe9ccf89e1444707964d87aa6c5d3a6425f8d775be00315f801f
-MISC metadata.xml 362 BLAKE2B 5ae49da675b0f3d8cdd77e60bd3c75b1e2c1c70148015add23ff37bcd1fc864d4548c298418057f5a5d0e35c7f949dd813df382efd36d64653e3b93a57ed1a67 SHA512 bbe8597d25d90b8b05a01e9d694925c76da176cb9ff9d01516f5bf2426fddb159c6991199a14197f1e8fc580dc1eca43c13d4eb36d785dd7feb94458c1c51241
+EBUILD mgorny-dev-scripts-24.ebuild 666 BLAKE2B 3b35b5f9e8a3462fc06dfe58c77c9a62affe90641fdacb11998746cc4c1c67b2deeba8abdad58a0320777b56bf2c6bf82d70656d1fcbf85533086650fa9e40d1 SHA512 c7dc3f9dc74cba4a45895aa68319300d5ed8337931c16034eba6bcbc41fb3707da5a875c3ea8cbfdf9c829a59392deb171eb52130ba4005552fe33e04a4fc62f
+MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/metadata.xml b/app-portage/mgorny-dev-scripts/metadata.xml
index 927c3cba6c37..f6bc84ddbbb6 100644
--- a/app-portage/mgorny-dev-scripts/metadata.xml
+++ b/app-portage/mgorny-dev-scripts/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">mgorny/mgorny-dev-scripts</remote-id>
+		<remote-id type="github">projg2/mgorny-dev-scripts</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24.ebuild
new file mode 100644
index 000000000000..09ed49fb3813
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts"
+SRC_URI="https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	app-portage/gentoolkit
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff
+"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6a8c06fa7749..ac5acbd2c53a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 51c0e347af4f..7ce50a78cbbc 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,4 +1,4 @@
 AUX pandoc-2.18-tests.patch 3868 BLAKE2B 16bbe9fba3e4e18c4ec37911ba462d7ca9773e6c0f7e19d9b75d8cf507c141d5a983de2ef4eee4149a1a9877afbb279b021ff691ae15183c102f9903ee938665 SHA512 9ef5dde4e854f20d55f6266cf24ad8bcd9e696b9efe9d1fda8901be7c00c25103849cb2d2cfc200b31f02cf6142180270d398f8d28b957ffb1fda3d4c3327385
 DIST pandoc-2.18.tar.gz 7251114 BLAKE2B 90413c0c2061f52cfdf2e8b50aa376605a3872e357baa951d327560094638d1f0dadd9f77e4b8ff5beadaf79330dd91e23fdbee490df8d1b6a6224b8abd9086f SHA512 0e8210a37dda6818b23b9fac25b73b240d67f8e03c41d1f3a776dcf95d7fdf48354a25c08ad64eea069003f4ab7a3167ee9c3e80d4f6684ad6ec33d8c477d212
-EBUILD pandoc-2.18.ebuild 6495 BLAKE2B 137d67e155fe3ec562fea77c329858b138e64214845a078e86b944b8ab0047d05657e0431419ad5818ca76ac2e5fdaa2ae4394821ed73477092044cdac1cc908 SHA512 731dbb39b8e674db58dda6852577902e06b197a737987a3807d08a6655570d2637a360c93892b52b97c135156ec917058e189030ee385184fc0991d55e2ea5a7
+EBUILD pandoc-2.18-r2.ebuild 6125 BLAKE2B 35ae467d09e819337315726cea44fdd19b36b29df8e18821dcdebee86341b24b5508ec5dfd4e3cb62073a64067f061b0f9eca4125e10a18969de2a8ffbc4b89c SHA512 16e8e0a93c61aea84440c17fc253a998389a9d061b22bc78760333be0d6486ed3c0158c2a1cf1fc68fc11fcc63246e998417c480bc05b252b40fb22c0cdfc0ee
 MISC metadata.xml 861 BLAKE2B edac13880204a325ec7f8755aa34fe63a9b90c7afbe7cb9eae87b3f820e5808e2be18d7b609410da6c2a4a136685b689f391745a6a491c91a49a45356957dfe9 SHA512 15f941b83736276d38eb6597611f63abf6b3a38cc019dd0a7339b7f88212f108acdd7ec7c2ee631d7d3d2860593f6139dc3eef5454376776979434ad27c75257
diff --git a/app-text/pandoc/pandoc-2.18.ebuild b/app-text/pandoc/pandoc-2.18-r2.ebuild
index 5e4604cd6f1d..1e73bcd0c280 100644
--- a/app-text/pandoc/pandoc-2.18.ebuild
+++ b/app-text/pandoc/pandoc-2.18-r2.ebuild
@@ -4,11 +4,10 @@
 EAPI=8
 
 # ebuild generated by hackport 0.7.1.1.9999
-#hackport: flags: -static
+#hackport: flags: -static,-lua53
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-LUA_COMPAT=( "lua5-3" )
-inherit haskell-cabal lua-single
+inherit haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
 HOMEPAGE="https://pandoc.org"
@@ -16,9 +15,8 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="embed-data-files lua trypandoc"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed-data-files trypandoc"
 
 RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
 	>=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
@@ -77,9 +75,7 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
 	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
 	>=dev-lang/ghc-8.10.1:=
-	lua? ( >=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.2:=[profile?]
-			>=dev-haskell/hslua-aeson-2.1:=[profile?] <dev-haskell/hslua-aeson-2.3:=[profile?] )
-	!lua? ( >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] )
+	>=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?]
 	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
 			>=dev-haskell/wai-extra-3.0.24:=[profile?] )
 "
@@ -93,16 +89,12 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-tests.patch ) # backport from upstream, remove on next release
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
+PATCHES=("${FILESDIR}"/${P}-tests.patch )
 
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag lua lua53) \
+		--flag=-lua53 \
 		--flag=-static \
 		$(cabal_flag trypandoc trypandoc)
 }
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 2b557f214884..43f16f2f2265 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,7 +8,7 @@ DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de521
 DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3f0a10ca59f234622cee22760cd18a566c952f94a1e7263294d6f43c34c861cf53bde59b4bd92f806efe136f92197 SHA512 d3d8a0f50ddcf2020bbbc3c21c6fcdd6f31b431d984622c2a4ae4986b82a14d79969d7113588ba5d9a672babe4dc01fe2f5e8d9ce73a9fbce14685220d914f02
 DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d
 EBUILD poppler-22.05.0.ebuild 3397 BLAKE2B 69946eb58b8b7844de29734e327cdc8c912fa535c3281f908739e68901fc99ac6ca92c437f771bc3e328fcd48fb76b522146941f76df9fe414fc8305d8b23c86 SHA512 e1130a9e67d32e1fe3052c8fa9dd0f43c96024c69cb6ec44c8a103c8fcd8b98d7e29e7f2ecf05384f6bf582f0efd8757d04801024ec8d284f752c5f1b0d873b8
-EBUILD poppler-22.06.0.ebuild 3622 BLAKE2B 37b92883fd3f411702d93367406e987bab8478c0b1c53adc228f33d019f383c1f3dbc2bc05a2d824afac79c6bd908556f68d1e3d4ab80120b6856c1e18d6f302 SHA512 ba14f515952d24441659f6394c5972832254a0469ea1b43377292626207d63a864819868aaa6fec430e4b7a534031f86a88b9cf1e9a2727508efeaf3d674583e
+EBUILD poppler-22.06.0.ebuild 3621 BLAKE2B 8dfd3ec8744b01a482b29b7583c609e5fd0bf7923b3a776316f0e0b87e73eba67b88f44507e8a5ef8a474c247172b360037c1a712a264e2471dffc939c695dd5 SHA512 8762203dd2a883850fdbad102bdd33a5749ec6cc67a45c328a48ddac62e87c67fb205f3cf9d3adc6eb5462611c1b7a7a2c0cab6e30cea9d6387890cc01c4f169
 EBUILD poppler-22.07.0.ebuild 3656 BLAKE2B c4afa4a9b28fa4ca0e4b08f52d5ae33b2d0c6fdbb22228b42c8cf36522a76ddaeb6520e79c0e920ec7c201a87ddda06ad15ec8e34391a51162235d9cfc8b27b2 SHA512 8343422ad9b5978b3646a9e3ae7eb0c5a3689a330112a4ba1183ff09fb1bcc7b731cbea87dcf6abcf2a8687e29c25bc4e8cac673d74716e81aa52c223d85b27d
 EBUILD poppler-9999.ebuild 3656 BLAKE2B c4afa4a9b28fa4ca0e4b08f52d5ae33b2d0c6fdbb22228b42c8cf36522a76ddaeb6520e79c0e920ec7c201a87ddda06ad15ec8e34391a51162235d9cfc8b27b2 SHA512 8343422ad9b5978b3646a9e3ae7eb0c5a3689a330112a4ba1183ff09fb1bcc7b731cbea87dcf6abcf2a8687e29c25bc4e8cac673d74716e81aa52c223d85b27d
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.06.0.ebuild b/app-text/poppler/poppler-22.06.0.ebuild
index dc6aeb1977aa..a45c4fcca60f 100644
--- a/app-text/poppler/poppler-22.06.0.ebuild
+++ b/app-text/poppler/poppler-22.06.0.ebuild
@@ -15,7 +15,7 @@ else
 
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/122"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 063622da6a2f..624296b233e5 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index 293cb949dad7..a520fae21081 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -2,8 +2,10 @@ AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183b
 AUX clucene-2.3.3.4-fix-clang.patch 2219 BLAKE2B 7572c05d9e2676eedb3aabc8030eea6b97a19af9f02eb1c336b40606105bc89800a8da8ea6f899ef550fa114776133fec962622ac3e337ca0f52fc0305c81bd3 SHA512 f3822c5d127b37fdb0a405a3fa0a2d2a168133da106a222de0311c2074aaacb7d9651a1be7ad7afda44da22cc2c8baa8d5db756aaaef5c344e12d52625e2c2e1
 AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
+AUX clucene-2.3.3.4-libcxx.patch 1486 BLAKE2B 237f5a6b674a56c238ffb42282b610d92f8500e5dad4423536ef1dd7184fbbfadd223ac5e79794370c086780ae91863bb3f5444cc0ad8aebc77512b33b6cd487 SHA512 7602a10f3fdd5f4a40a10603abf65f2661eb3cddda9d2c38382f7d362564c0eb8ca1968755090ae78ec5a9a9e6c7d3f889c11fefe9f140c10818c824c7c5f77f
 AUX clucene-2.3.3.4-musl-pthread.patch 256 BLAKE2B 30c38a06d98c2e4c34f1ebf1c8b0021d57e66fd2b49e01cd9f165c3c7fef8a67152ed2136ccc733b2e6b07b8c39b3057b3fc4961330e3195c9d0b4c0d686fb95 SHA512 329ae45428e1d9b2f005c818b69030e7146b6441ca0a8d17bc3c711f76aa4c384c61718b717170fd88a1ae16e371396b77f8ba072aac6879b82aedaba3238207
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
 EBUILD clucene-2.3.3.4-r7.ebuild 1567 BLAKE2B 7643f76d4468d77a6f81f78a4e0ef33ea8bceeaf0990b69eb3c7ca2e53ba2b11e413b78c2a51097b8fddfdc6ba4f45232e6f732b8c9260c8dfbd734527820cc7 SHA512 ed532c29d7e7bf35b42cf9a601839ca674f8b9d175650ce34329b7a0f25617f7ff5ec5d6735fdd18e7e4bf3c7976211c543e4f5f852112dc999008e69e10be91
+EBUILD clucene-2.3.3.4-r8.ebuild 1596 BLAKE2B 2ddd3a91158728e12f427eb03737333ced9ba6d6f65ae8b71407168f168f102dab2a8d5f3a6fbf17e878fbf69cbf8d614d1e3ae62721a76601e11faa0081ec27 SHA512 655b254c31d256aa99bdb155133e1cceb183b8f18e78259a7cd41c59b2e10d19216b232107ba019bd78c15767eead770f172a9c59af974bdff970d816f3c087a
 MISC metadata.xml 243 BLAKE2B f6749558bd65896555f359d7b6f67fdb5a9656eecbb944c5074a450ec952b2c9d5285be4d078c3eba5622bf4084d535f3d0860b8812cc4ad6590f18e593134c1 SHA512 675d016d3802dc7f8d70f98c6f044f39b32ca7722c7e0aa1e1aa6aad4acf83da129cddce37d72a4c899e2dd202f2ba1eba7ea7137ad24354b2c927f310732bae
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
new file mode 100644
index 000000000000..6c22b70622bf
--- /dev/null
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}"-core
+MY_P="${MY_PN}"-"${PV}"
+
+inherit cmake
+
+DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
+HOMEPAGE="http://clucene.sourceforge.net/"
+SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+IUSE="debug doc static-libs"
+
+BDEPEND="
+	doc? ( >=app-doc/doxygen-1.4.2 )
+"
+
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-clang.patch"
+	"${FILESDIR}/${P}-contrib.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/${P}-gmtime.patch"
+	"${FILESDIR}/${P}-musl-pthread.patch"
+	"${FILESDIR}/${P}-libcxx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# patch out installing bundled boost headers, we build against system one
+	sed -i \
+		-e '/ADD_SUBDIRECTORY (src\/ext)/d' \
+		CMakeLists.txt || die
+	rm -rf src/ext || die
+}
+
+src_configure() {
+	# Disabled threads: see upstream bug
+	# https://sourceforge.net/p/clucene/bugs/197/
+	local mycmakeargs=(
+		-DENABLE_ASCII_MODE=OFF
+		-DENABLE_PACKAGING=OFF
+		-DDISABLE_MULTITHREADING=OFF
+		-DBUILD_CONTRIBS_LIB=ON
+		"-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_CLDOCS=$(usex doc)
+		-DBUILD_STATIC_LIBRARIES=$(usex static-libs)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch
new file mode 100644
index 000000000000..268b887f6d86
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/862195
+https://cgit.freebsd.org/ports/tree/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
+https://cgit.freebsd.org/ports/plain/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
+--- a/src/core/CLucene/index/DocumentsWriter.cpp
++++ b/src/core/CLucene/index/DocumentsWriter.cpp
+@@ -125,7 +125,7 @@
+   if (this->postingsFreeListDW.values){
+       if (this->postingsFreeCountDW < this->postingsFreeListDW.length) {
+           memset(this->postingsFreeListDW.values + this->postingsFreeCountDW
+-              , NULL
++              , 0
+               , sizeof(Posting*));
+       }
+       postingsFreeListDW.deleteUntilNULL();
+
+--- a/src/core/CLucene/util/VoidMap.h
++++ b/src/core/CLucene/util/VoidMap.h
+@@ -11,8 +11,13 @@
+ #include "CLucene/LuceneThreads.h"
+ 
+ #if defined(_CL_HAVE_TR1_UNORDERED_MAP) && defined(_CL_HAVE_TR1_UNORDERED_SET)
++#if defined(_LIBCPP_VERSION)
++	#include <unordered_map>
++	#include <unordered_set>
++#else
+ 	#include <tr1/unordered_map>
+ 	#include <tr1/unordered_set>
++#endif
+ #elif defined(_CL_HAVE_HASH_MAP) && defined(_CL_HAVE_HASH_SET)
+ 	//hashing is all or nothing!
+ 	#include <hash_map>
+@@ -83,7 +88,7 @@
+ 	_vt get( _kt k) const {
+ 		const_iterator itr = base::find(k);
+ 		if ( itr==base::end() )
+-			return (_vt)NULL;
++			return static_cast<_vt>(0);
+ 		else
+ 			return itr->second;
+ 	}
+@@ -316,6 +321,7 @@
+ 		if ( _this::dk || _this::dv )
+ 			_this::remove(k);
+ 
++		(*this)[k] = v;;
+ 	}
+ };
+ 
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index ca26871b129b..82eab81cb083 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/abstract-deque-tests/Manifest b/dev-haskell/abstract-deque-tests/Manifest
index cc1fa1d496ee..975762367e1e 100644
--- a/dev-haskell/abstract-deque-tests/Manifest
+++ b/dev-haskell/abstract-deque-tests/Manifest
@@ -1,3 +1,3 @@
 DIST abstract-deque-tests-0.3.tar.gz 11427 BLAKE2B 2a43e52bb0a5b7634f179e5857eb01d76429134345003fc2f3b14460363221940f8296ac3adc5f024e2578e684664092c2ec5c1b2eb45af378ec32011e1dca67 SHA512 0e7ecb27d156e91c156a81866a1854aabd0fa88b57598575fbacb578bbfa769ba4de699158e8e12a7d26afe583e2a397b871ac0c08819a5b63bef749f8c1c213
-EBUILD abstract-deque-tests-0.3.ebuild 811 BLAKE2B 977aa569146569ae7ba693949909c54598bd543e5d76b89d7c4f7bf833f29dacd65fa86d93b1ad066aa4ae9a59666e4de4f68edd93c788f971ddccb2042b720c SHA512 d0254cc0f92597512a12e7a6a35d2f0bf3087b52f999d5d0304421a4ef36bff908fb6d3b5c206c80635a89bc3d35aac9069bccf6d4d88373bdc524bcd7afe489
+EBUILD abstract-deque-tests-0.3.ebuild 818 BLAKE2B 991e1fc2b2cf912f0f0415a9c2948541806582b5ee45d867ebb793e57c1dbd7a15228c251c50cd229ead02db8b903593305d2ef2d525f38bd7a9a91184de7b90 SHA512 b09ce2a22be67485fd2c806a87784b435092466c1c315492992fffbb96fc1de111a97498d70f9229eba49c22ddec0d7942ba300127f4031d61cd2f17b3e6b23e
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild b/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
index f7d8def802ae..3830a9eb91d7 100644
--- a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
+++ b/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?]
diff --git a/dev-haskell/abstract-deque/Manifest b/dev-haskell/abstract-deque/Manifest
index f96f2512f266..f038a67071fd 100644
--- a/dev-haskell/abstract-deque/Manifest
+++ b/dev-haskell/abstract-deque/Manifest
@@ -1,4 +1,4 @@
 AUX abstract-deque-0.3-atomic-primops.patch 412 BLAKE2B b59de5a3ff423ffd1cf5e56f6c0cbbd32fd295aa9d069707d7be50cd5ef8e3d9ae9af8a135fb010a0579e8083185f3ce99cb0621aa9f813f59caab438307149a SHA512 f5efd76b7bdd7c26ce8610d6a4403e8166d6dcea4ce044cbf21aea11c500b4be1e12f268ea0cf34b3c83f79905c33f34dffff420ff98280a4560a386eeb950df
 DIST abstract-deque-0.3.tar.gz 7219 BLAKE2B 46bb9997b6ff7dc111bafb650feaf35fa2955d2b2db34dbb964c982a042967bec5994b43e333b2b248717f6e486347a202b3abc2c688e305e9fa683b3ef59df6 SHA512 9293a366918f54458ffe13f6737bab2bee961b730732eff563d900b451bf5f7dde30276c9406bfc5c0ea64104afb70db3588b13d478bf9c60842dad906195f7a
-EBUILD abstract-deque-0.3.ebuild 797 BLAKE2B 8fad45c254e3a8a308a035ee0d15cb8d70a25b8573557de66551d062dfcee3ce7c439bab05158717380683bc82c0a65dc75e6f4261220a75b84f62388757f1ea SHA512 f77a67a003075dd2fb8e187431d5a3b4e1f51b2aa8905d67880ad3eabd9cc5af11fdc5e2e85174621bdec37738c8829b79b236be0fd0d835f925cb15a6daa2de
+EBUILD abstract-deque-0.3.ebuild 804 BLAKE2B 035d46bb587aeb29d8c9260a61df01b986d9040d2cf915b9e108e35be451e576cbf48b2a0006cf5c12630e3994a13b95761a6edbb07c2c230f1d91236b231f08 SHA512 6ed18524b958b3a8382bb5d8bfd066a1d8dc734cf874da56fd21cab6531178e631ae87d776e123e85658d504bdf6aa499a270ebbdfa17bcd9aa3e8da54a3b307
 MISC metadata.xml 1179 BLAKE2B 8fcc2ba358bfb3fc0855e765bb287c6dc7ac5d86d9f8aa2c88cda8b3a51915bffce33c65c3cdc3bef1bda7d14b8cccc6c7c781df72bfdd2e563833abc35a3f0c SHA512 646cbaffbd13e8a5d140b2ba2bdd05deaa558dc8fa55b355106425f2ba4be934eaea978df3bd4960931ae90e0a2ebca3f833d5f319fea93d38d81aaaa81a68f7
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
index 74ca8d523ded..78fe651e108f 100644
--- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
+++ b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="usecas"
 
 RDEPEND="dev-haskell/random:=[profile?]
diff --git a/dev-haskell/abstract-par/Manifest b/dev-haskell/abstract-par/Manifest
index 718035ee3bcb..b9d893211852 100644
--- a/dev-haskell/abstract-par/Manifest
+++ b/dev-haskell/abstract-par/Manifest
@@ -1,3 +1,3 @@
 DIST abstract-par-0.3.3.tar.gz 4714 BLAKE2B d43acc721fc7d4e0f9c9fc85f2edeb489ea145332173840d93bfac9b0bcffcc50a89cf33a1b0f8736c76fc894140ba8d45f13821bf1515491d012f0ee53915a7 SHA512 d603745202ececf5a514e5ac7da82fdd03dd27ec4fbb11a870a7b0a6c92e468cf3bd68763afa748434b3ed0ed5b80a1d2cefaa84c68a84b82028225400841605
-EBUILD abstract-par-0.3.3-r1.ebuild 571 BLAKE2B 7954ffddb1f1af17b59f3362f8cbfe6ce3097566eb3c0d9745dcae26989f3b4f70232f00ceb552fe28c73389a410c6fdde96e17b3bd7e67bad16810933906751 SHA512 f0763b701c2dbb49c423b576ee46dc3b722a14337ef28b85ba68e04ede424c8e800732912e05b4b519855d80ebee8f2223c4d87d407e8badf5e90512ea331842
+EBUILD abstract-par-0.3.3-r1.ebuild 578 BLAKE2B 909a3ed9d90781803529a12c1a55ed74a6bf51863a714893b0824fb2af829374a1f849743f5771a0349780921d67d542c8b9955e40dd84fa65370c0dace2ea1a SHA512 be3b17fe795b90df182c59127e6fd2865fc4223d113edd4a166ef73a4479a50c6a2cd222ef7cc95609d6085ed9010fa674627e353c7ce51a30c7d3b0202b6b01
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
index 26e5aa08e9c8..43a2a5dfcd91 100644
--- a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
+++ b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/aeson-diff/Manifest b/dev-haskell/aeson-diff/Manifest
index 83dc6776e40c..a882cc237dab 100644
--- a/dev-haskell/aeson-diff/Manifest
+++ b/dev-haskell/aeson-diff/Manifest
@@ -1,3 +1,3 @@
-DIST aeson-diff-1.1.0.9.tar.gz 16227 BLAKE2B 8bde3a62353e2ae5d6c5ceb2862da5537908bf3231d590c20dea24e820928b526ee84b463aef28e448f28a399f9a64dd8dcb6058f75999a9636866a59dd913c4 SHA512 2778eabe53ac0520028c9eccae7f52dcdeb2eccb4df4ff6a84e4625afc5d46533ebf61b6b99c16eb5ffe9792e781b0f9a8e1e43c2b69b751d1dbc5dd627635d9
-EBUILD aeson-diff-1.1.0.9.ebuild 1212 BLAKE2B ed5b99cf51b347337c37ce85d23983323f2b1d3d05671c73610e7253a84d1a79bfa3510c4937bdc4a082ab6d487215536900eadfc53eef31ab5e4c578cf7a2a9 SHA512 9d60dc2c4ed616ecc91b6466db7d0f791207167a58cea96a7931bc9c61036bae31a616db7c86ec5cde44979b7a35d665cbe34c38b373a14c78cdb451a1f11a6e
+DIST aeson-diff-1.1.0.13.tar.gz 17172 BLAKE2B 0135fd65b4bc1efbe11d8c86144e8f0b030f649c6519685d6ba01387cfd64026ea53300c31598104645d82e02ff136da0b7a2cec0f2afb7fa3a8c6bd25af4088 SHA512 78ae5da41f4962871bc3dd0a2cc79abf4964e639eb7cdb5b5cb65f5a4dfabeddd9c3fc9fe4446f2ae1b3dde1fe888091205540a852da451e76743efee07febe2
+EBUILD aeson-diff-1.1.0.13.ebuild 1011 BLAKE2B f6e7935d02f5c5ae22cf6aab14f78600c685ff69badd476c7802bfa7382297b1b056f193b56ed20f76b7b168c223e1c96186947a3b7467668c205933216e6ec9 SHA512 f2699b446a7a134c484083cd794726c0dbc3591a4a87004710198e46c14d3696f7f9a739481e39c2b9c22d038cef1ab3f22dbd318cafd317b9e74fe7b50bb1c6
 MISC metadata.xml 501 BLAKE2B 3ffc727b51998b4c4f43bfd3105e663386551866e7eba05d8d4a59c9ebaed7d3911b0aa694a5e233f8bd4145769b99a9d16e05b86487d9a51c418c9abad3d4f8 SHA512 3340a169a4eb8e115ae333684eae101afeec6968acbb9d98d9c5be2aa9d77b7dabba0c529e95a8478cd3ff4fab62a38f132d0e1c5ba2164caec95f901fa1947b
diff --git a/dev-haskell/aeson-diff/aeson-diff-1.1.0.9.ebuild b/dev-haskell/aeson-diff/aeson-diff-1.1.0.13.ebuild
index 1d4b1fc48bed..7fba9e5d45b5 100644
--- a/dev-haskell/aeson-diff/aeson-diff-1.1.0.9.ebuild
+++ b/dev-haskell/aeson-diff/aeson-diff-1.1.0.13.ebuild
@@ -1,46 +1,35 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.2.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Extract and apply patches to JSON documents"
-HOMEPAGE="https://github.com/thsutton/aeson-diff"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HOMEPAGE="https://github.com/ysangkok/aeson-diff"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # Ambiguous module name ‘Data.Vector’: found in multiple packages: AC-Vector-Fancy-2.4.0 vector-0.12.0.2
 RESTRICT=test
 
-RDEPEND="dev-haskell/aeson:=[profile?]
+RDEPEND=">=dev-haskell/aeson-2.0.3:=[profile?]
 	dev-haskell/edit-distance-vector:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/mtl:=[profile?]
 	dev-haskell/optparse-applicative:=[profile?]
 	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
 	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/doctest-0.9
+	>=dev-haskell/cabal-2.2.0.1 <dev-haskell/cabal-4
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.18.2
 		dev-haskell/glob
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
+		dev-haskell/quickcheck )
 "
-
-src_prepare() {
-	default
-	cabal_chdeps \
-		'base >=4.9 && <4.15' 'base >=4.9'
-}
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 214c2439aa97..2286fbe2f7bc 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,3 +1,3 @@
 DIST alex-3.2.7.1.tar.gz 108229 BLAKE2B 1c1c3488c6e0f559003de5edc1250afdd09098eb4da3414d8c461d03ee5f08b94f80e6f6d32366f6d8d0563a068ee8b2a1c9cb7b78bbbf0a1dcf3767ea448ffd SHA512 f8ff12de874b905449fdda0d704f9e4ac30fa3e60e965f82d7bb2d6e3974cf926f85134d32878c48faf0ec4a002ea7240cf6696e1cbcad25a0eebb9d1850cc07
-EBUILD alex-3.2.7.1.ebuild 1451 BLAKE2B d4394b85d471973c94289456a90b83336f2c7b2dd342d5073f7bdb29a0e25bf2b44744865af4f63ef8a6447bfff86f7eebed130a257f999332407be75cab5746 SHA512 947fb3e242ed1add636df46b0e7a28c644a9502a2ca2a8196804794ff4412f464c5b0032a3bf3146fd8958e834492194e046fc23a645e77e85ab35e9113d3c71
+EBUILD alex-3.2.7.1.ebuild 1458 BLAKE2B c63e477d8f1a584029c7ec6b84179353b41706734bd0d66645c4b3cbb25acdb6e0ba656111143bdf943dabbfe6d9b77c3dd4143dd38b4d96f08205026ed16f11 SHA512 ae1c039080dcee0674956c5f554a2620f3ba78686d7c7ea3bc00d12909cbd52594a095215b30afa13ed03b9b53fba649613165e6a14647ccc43b697acdd5534f
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/alex/alex-3.2.7.1.ebuild b/dev-haskell/alex/alex-3.2.7.1.ebuild
index ec1778f3abc6..9e128bbf90b8 100644
--- a/dev-haskell/alex/alex-3.2.7.1.ebuild
+++ b/dev-haskell/alex/alex-3.2.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/async/Manifest b/dev-haskell/async/Manifest
index f43eccd6896a..44485bb05ffd 100644
--- a/dev-haskell/async/Manifest
+++ b/dev-haskell/async/Manifest
@@ -1,6 +1,4 @@
-DIST async-2.2.2.tar.gz 12927 BLAKE2B a0fa95525153e1065888072d4c7590a6184fbbedd957d0a7867235414681c9959be385a75007160d50fb3a9e015c83651175c4399f24b7a0d981cfbe0f8bf250 SHA512 6984c74b76dc1db73363ca2e360d2be6f2e7b4de5c7de452c4df7ee996b2256790a8cecb532af6d7d675541315a16f8e4ce566c5f79e4102e4a857f057e2d811
 DIST async-2.2.4.cabal 3095 BLAKE2B cb0491c2fa792c794308485031c8cb876b596f37f06bc53eb824eb09d83f539d315b1e5a49478fef5282609ab755c22442051684dda79e94dc02bca7cb2c5824 SHA512 a19d1ce77902377fe6afc24c10002ef539d21fb402cf245e0816a67086c2a13b0b2e7b984e054a6b846f2acbcbd0fd942819e381e8ff29ba995757cbf8d8aa8f
 DIST async-2.2.4.tar.gz 14148 BLAKE2B c47e47a4bbe98d05bdd6b8ad89888013643f36ea5ede8af306b98749cec3cf9c3e87330339af4152cf7e84f5b9ced39c1eb69079921d4c0b7c993191bc052c2d SHA512 24f37f974dd7573138475d04c0fccb97fcbd8b3de56f7d06199b8f936fd9a29cd0ba0574212a753a81de8958b3292ecee79d0e8d0d2f51eb91874424e6219569
-EBUILD async-2.2.2.ebuild 989 BLAKE2B b3e8231232b64e70a1b6df3941086ba27f436afd8d134ff4ae1f6050e1fb5a10746a4acefeb147b098a3cfb2fdd944e16ea095f2221e5da36851e4d53297f8b8 SHA512 57e692ff5f5378f5a6b000dc977b63d958581e7a7376693dabdc2ccc71f7f4c2b5685e313d46afcd8b2874ed3fc959cff04ae686776843af20dbc465ce7620ac
 EBUILD async-2.2.4.ebuild 1301 BLAKE2B 893163138fb44ff28b5fbf71655e1848d93906816d6cefed89922891dfed57446ee282bc1fd7546f9ddc8a9501f5352a1e01d1125f98e554f526b86d47f8e466 SHA512 464ec4cf7e0bfcb2f6f8c8646ff9aaf4f030c65d639f96a530ed4fda27e4ef792ae7934e9c348087ffee98fe8689300cdf9ac2fe6678d7a51ccdf89c0a10342a
 MISC metadata.xml 1592 BLAKE2B 60a430af3879dce2792c2eef6e141fbb3c56224cae82a374f6018b7d3faaccd6fafe5cca5cdc50ecfcc262677d1ba7da9dd823469736d68e50c9b99c668f8bae SHA512 3b780ae480db0c7af6cb57f3f49bc713bff5cdb15e8cd77fb7f8543d09f44a2132add61db56ba229cc1c4bf66014ede90db4ebd864989061ffe9f30bbdfcf11c
diff --git a/dev-haskell/async/async-2.2.2.ebuild b/dev-haskell/async/async-2.2.2.ebuild
deleted file mode 100644
index 56eecdbe0d44..000000000000
--- a/dev-haskell/async/async-2.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -bench
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bench
-}
diff --git a/dev-haskell/atomic-primops/Manifest b/dev-haskell/atomic-primops/Manifest
index b0b15e3d9523..137942ff3784 100644
--- a/dev-haskell/atomic-primops/Manifest
+++ b/dev-haskell/atomic-primops/Manifest
@@ -1,3 +1,3 @@
 DIST atomic-primops-0.8.4.tar.gz 33639 BLAKE2B 5293b6f839599fe7a47c8f3f13a03df12fe8a5d7223a4b488a86b7f1f2c208ecd01f75acf7378668b4f91046221d9076875e05ca2611bb51d6ff1ad7a2e0d8f6 SHA512 a9e873e6f4eba26541d370c5ee3b81b518a1bf0f54d303d26a2065ba47eac7db1366436661b108c0648503386ffb9cb121567236c9635bf30d4e523a2d63a8b4
-EBUILD atomic-primops-0.8.4.ebuild 693 BLAKE2B 07fb854758c17511b4a731a882c293c6a56191744e75014cfd923a2aeb9672eb073f94707dade6ce6167d4294c18a5d0659b037ed6cfbee16c3063731f89df7a SHA512 f1aeccc0c3aadf2281990df0a02e82787d207367bb585eb6e0bd224e62a72bbd2604fdaca93303adb2f177e8f5a2f7ae505ae0cdfda3b1a202e14ea7f1f546bb
+EBUILD atomic-primops-0.8.4.ebuild 700 BLAKE2B 0317690296643078716a7ac9fefe70aff0321a1056dbf2a87f96b8e58eb0bbb2b33cc6466e4b936a1dcba7cbcce6882dcbbd9c43224d1c280a1ef5c2278d9112 SHA512 149c71d893e802cff1af5f55d558855cad8139609db4f0a296e104e1e6c7556e9283150a2df15355b1f1748702ff84a1cb26c346744a7bbdfdd5499a644ffd20
 MISC metadata.xml 985 BLAKE2B bdc88207e30c05665b2dd2b91d733d9bfbd2b9c93028b8e1259baf7f16e0391d36547fc7a61c79be6d3495cacafdfb44c03fadcf11c143c17dc0000cac3462fc SHA512 fbcb6b7dce3acc68b236b752432576857e75b9cc33d45cddb8782f4797644fbd3ace901941552d479ff2bc4344447b6ad7ee33e52c017ca2fd8222cd353e17b3
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
index 5222fa5a40cd..d3c750c107e5 100644
--- a/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
+++ b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="dev-haskell/primitive:=[profile?]
diff --git a/dev-haskell/attoparsec-iso8601/Manifest b/dev-haskell/attoparsec-iso8601/Manifest
index 31a29af1763d..eb4964d47397 100644
--- a/dev-haskell/attoparsec-iso8601/Manifest
+++ b/dev-haskell/attoparsec-iso8601/Manifest
@@ -1,5 +1,3 @@
-DIST attoparsec-iso8601-1.0.1.0.tar.gz 4317 BLAKE2B 80c7f9dc3bb52799117177daf5389882413656713d7b0671694f725110e0ebfe54d93ff6e439359556d3f0895354d3ba6994287967eda3f05c9d4d4cbc2dabc0 SHA512 a1d751d388446a7d2f628d7112b72beab338061bf2f8dc74c26549f0e93ebbb955bd9082db8a70db71cd80ceb576b22a94195c34f816eb6cecd5c584cb100e8b
 DIST attoparsec-iso8601-1.0.2.1.tar.gz 4457 BLAKE2B f613d95643c53cc01061e0ee88c1bc42a05d3b9d5f60993b1a3744b09ff74a2d039bd5c75e23696ba0c6953227dd9bcd47cbdd4be719448698cfb9774b8600a6 SHA512 7be279057d0338c5825f5a9d578df23364325e274334d0cca37a4cba6a3a626202994fa284f529b08c3e1067278f6a1fbabbcaf2769a845efdaa05605ed4a6e0
-EBUILD attoparsec-iso8601-1.0.1.0-r1.ebuild 966 BLAKE2B a5b0084c588bc12afa37487f5046731c93516460ddeeccf4273f6ec3652680878ef9a23bf4616171882fd2c5c55f5a9ba728d2a86c6983f28f2ede0e3b8a80cc SHA512 b8ac894b08f2a8e693ef81e5c650181e28aac09f6f88a90444119dcbee6fc39fb3209aa575dced5048daabd29261223dda56f28f8a77041393a920fc03f5f16b
 EBUILD attoparsec-iso8601-1.0.2.1.ebuild 953 BLAKE2B d1cb3d37ba16f3c02b69692713a98c346d72d8d8931df4ee6cc2d5c56ea474b44aa5c9de1ff4bcc566fc6b7491b11baa0f66d01bacdeacd1e8f1a8363cfd0560 SHA512 ce9990aa0595ae81167bb9178174834f3e7119bafde49dc92fd8c4914d11d8d91bce17102fbf010424f48c774f65d0171ca26ca9cdc42c5cbeaf568ee6100676
-MISC metadata.xml 380 BLAKE2B aee2e46e65f4559e3bb61643fbdac419ffaefbf49577ad17f42fc6e16532d9e5938587c19b1e10e382d9bd462a6355aa7043e1b3293a474e9233aa001233ee08 SHA512 15456c87d311d0b61fae9af6afd6be12f6655260e9d89b5527b81badffc4f8d533ab7c9059f4ffe1cfb0381319011614d0fab539c73b9da81158253724dcf0c5
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
deleted file mode 100644
index e7b5c6dd1290..000000000000
--- a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -developer -fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="developer fast"
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
-	>=dev-haskell/base-compat-0.9.1:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-	cabal_chdeps \
-		'base-compat >= 0.9.1 && < 0.11' 'base-compat >= 0.9.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag developer developer) \
-		--flag=-developer -fast \
-		$(cabal_flag fast fast)
-}
diff --git a/dev-haskell/attoparsec-iso8601/metadata.xml b/dev-haskell/attoparsec-iso8601/metadata.xml
index 8ca0c5599269..937381521944 100644
--- a/dev-haskell/attoparsec-iso8601/metadata.xml
+++ b/dev-haskell/attoparsec-iso8601/metadata.xml
@@ -5,8 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="developer">operate in developer mode</flag>
-		<flag name="fast">compile without optimizations</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
index d9cc814744cb..62e57979c0b6 100644
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@@ -1,5 +1,3 @@
-DIST attoparsec-0.13.2.3.tar.gz 162346 BLAKE2B 02bcd5d2c4993db547a723fa9f30ddca882a3c13d7c68073e9ed2b093def2f86062b5d9d5c87d9a5ccd13d59ef1b2f962537979320d56444027a1fc931dc98fc SHA512 84805ff547f1aa5eebd320c1bd738bc1098a9789fb330eff7bdcb1b0477e9709d86f93bd8848f4a8501a123b6add6bd22af59cfa94af66f1d57703745706a194
 DIST attoparsec-0.14.4.tar.gz 160701 BLAKE2B eb7094b0e1b064f5b10c198950b33a085722ee22bd6f0036c8e53aa5475f1b40fe08d528ec3afd547b13cd5712a51e5bcb86a8465a59174a35d603b3f9c13a0a SHA512 48aa7743b24def2db7041e3e0189d9844194c42b5d216ff5060806a80eb550200ddcb11e9321a910ac4881ffdd7381d80a4b88a73acfb29209c650eababb925b
-EBUILD attoparsec-0.13.2.3.ebuild 1016 BLAKE2B 5275ae71da8e6229c12c6af8e3cbd46c61a3acb438a76d4867f9d463555c987c18a40729a6493d083d482f23505cc5162dccee7b6248916741cd815a77e58547 SHA512 46c927c2377a70e7271a09ae2c945c03f9bba128b5066dd6ea250595e85e181675533097d37bb5dc0c8e1f60cd629a55ac38272afb9f8f5391f41877920c2bf5
 EBUILD attoparsec-0.14.4.ebuild 1011 BLAKE2B 0baf7e2340552298cc43d8c43ce1f816e6626cdd48f793a5c8e8fd9095a86c89249852a3db0fa432a9acdf80313175a44e5b3d6c8b02c2503e93ad0e1cff126a SHA512 074f7c82ca2d339655e58a6591cda9fb688f46f5c6be9f29ca10b21779dd56e07ff93a6299e091d248e07cfd68c76b39405aa88d5c90e3989e888a0be5522fa1
 MISC metadata.xml 515 BLAKE2B 0dff22eb1e895cad8222849d25347ad574bd8d404c3849afaab26ca96c20259ea96b70b92d3342e1a0d37fa15df23c3b708d51a39f751dbf03834db84d52767f SHA512 14e7f7e93444fbe31bc60c5fc75f4812a2ee5f9ac9d4d3007e11a7fbcabad96ed8ea4d56585d2665a9d585aafc0757247c78519ea2cf1973cf8353e92f8f37f7
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
deleted file mode 100644
index 20e44cf82d48..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # QC-2.10 finds contradiction
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest
index 03368a0d048e..ce9524dd0c80 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -1,4 +1,5 @@
-DIST aws-0.22-r4.cabal 15515 BLAKE2B 7936d1ba22ef5d60baf8804d5d77b5202f6fcef31b63cba9c06ffe5f66aae8d584c3877887e408033efe36bc9cf04c738c545ca61e9eceeaee61bb168ac1e062 SHA512 a6a1d639cedf6929f60cf4b4187fbefb72f7024cbdaa3c3d383acc933be1f03b139c4b58a34afaf7ecdc355ee507f4411e9953f98127850d4978a6ba859f4e8e
+AUX aws-0.22-aeson-2.patch 7603 BLAKE2B 6c3247b7b9e580fa462e11d41bad7b42131a4212a9a8c678f74a337cc15099694e565d6019e8b90f28fc9568827dcac97c99fe25569e7efc4ae5ddece42d079c SHA512 b439e8178c5a70278e23b9dbc7eb74c26358a81bdba27e8b12584439c2e59c52c0c662575f70c56e150f487d6d4094739a1e7816eb89583a893d15b37aa3892a
+DIST aws-0.22-rev3.cabal 15515 BLAKE2B 7936d1ba22ef5d60baf8804d5d77b5202f6fcef31b63cba9c06ffe5f66aae8d584c3877887e408033efe36bc9cf04c738c545ca61e9eceeaee61bb168ac1e062 SHA512 a6a1d639cedf6929f60cf4b4187fbefb72f7024cbdaa3c3d383acc933be1f03b139c4b58a34afaf7ecdc355ee507f4411e9953f98127850d4978a6ba859f4e8e
 DIST aws-0.22.tar.gz 106122 BLAKE2B b4ff46e2742d53323c80952c303a4605d13600fd60085a2e0501af2fc0a74f0c2769c6bf0692710bbfd972c474b9cab26fd97e9126fdcfb3eaff90afbab1d9ae SHA512 e7ff376c47a7ca7a65c8f10f19e591d4a4b4d2cfa333b4727f88f0b170d7acb0aff402617f2d617c522fe5d16ce92b249a23f1fb0a8bfe5bbefaef2931b786bd
-EBUILD aws-0.22-r4.ebuild 3863 BLAKE2B 3e1e457a7126651235c945c17f758470000a0498276f59449b2d7bc2bd999849c5e895ec9333ea1f3e4b9a8ec6f0fbf0c4125eb8beed9d0cd5c77423cbae92e3 SHA512 ab0c5bb4340b2352e768a946bbb8694697213d65d6e6e2d2e2f9f6d64f801cc5b565b3b963f01b5dad279d45633ab03bb4fde440dfb95018956f6fe6cc207c57
+EBUILD aws-0.22-r5.ebuild 2952 BLAKE2B 0a9870774db31fa319d06c8ccec73c4004bbbcc5b41b81403cc719a216a839fed11413844f53ca0ab2f2df638be69dc2c9cc4bdcb63e3e511b6ed6819152bcfc SHA512 52c53474b8e03065f9b6cbb6776cdd20f7b94291d23b967a33ec8e4e8e7ad7f32f36dfe587b5ee969eb6fdb57b6c011d9512a899ea495316d15d4305e5a61679
 MISC metadata.xml 580 BLAKE2B 2f6f53f53684dd447ad3c69e408afb8740a8ff0d565c75fa4c5aa55e271f73d79eb42969a7c48320b80096ea53daacaaf5fb22e52de91e388ec96b8b12129b85 SHA512 f3f8d31ba04946e95357b929e5aa611cfe8b58ee484837767eceb2aab10fd07b20e7c7cb2f6fa60f8a409980ef5fdc5294aeaa9656e61365ed2674c9b63b0391
diff --git a/dev-haskell/aws/aws-0.22-r4.ebuild b/dev-haskell/aws/aws-0.22-r5.ebuild
index 78feeaf7c7df..fa12e302fc1c 100644
--- a/dev-haskell/aws/aws-0.22-r4.ebuild
+++ b/dev-haskell/aws/aws-0.22-r5.ebuild
@@ -3,28 +3,28 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.1.2.9999
 #hackport: flags: +networkbsd
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite requires deps porting
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Amazon Web Services (AWS) for Haskell"
 HOMEPAGE="https://github.com/aristidb/aws"
-HACKAGE_REV="3"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="examples"
 
 RESTRICT=test # requires aws account
 
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0:=[profile?]
+RDEPEND=">=dev-haskell/aeson-2.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
 	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
 	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
 	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
@@ -33,52 +33,31 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
 	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
 	>=dev-haskell/cryptonite-0.11:=[profile?]
 	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
 	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
 	>=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
 	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
 	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
 	dev-haskell/memory:=[profile?]
 	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
+	>=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
 	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
 	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
 	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
 	>=dev-haskell/scientific-0.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
 	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
 	>=dev-haskell/unordered-containers-0.2:=[profile?]
 	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
 	>=dev-haskell/vector-0.10:=[profile?]
 	>=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.10.1:=
 	examples? ( >=dev-haskell/errors-2.0:=[profile?] )
-	>=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
-	>=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3"
-#	test? ( >=dev-haskell/aeson-0.7
-#		>=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.8
-#		>=dev-haskell/lifted-base-0.2
-#		>=dev-haskell/mtl-2.1
-#		>=dev-haskell/quickcheck-2.7
-#		>=dev-haskell/quickcheck-instances-0.3
-#		>=dev-haskell/tasty-0.8
-#		>=dev-haskell/tasty-hunit-0.8
-#		>=dev-haskell/tasty-quickcheck-0.8
-#		>=dev-haskell/text-1.1
-#		>=dev-haskell/transformers-base-0.4
-#		!examples? ( >=dev-haskell/errors-2.0 ) )
-
-src_prepare() {
-	# pull revised cabal from upstream
-	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+	>=dev-haskell/cabal-3.2.0.0
+"
 
-	# Apply patches *after* pulling the revised cabal
-	default
-}
+PATCHES=( "${FILESDIR}"/${P}-aeson-2.patch )
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/aws/files/aws-0.22-aeson-2.patch b/dev-haskell/aws/files/aws-0.22-aeson-2.patch
new file mode 100644
index 000000000000..25d5966ed0a7
--- /dev/null
+++ b/dev-haskell/aws/files/aws-0.22-aeson-2.patch
@@ -0,0 +1,185 @@
+From 7af7586c5d244d07f77d49e5fdc739e6e8e54816 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joeyh@joeyh.name>
+Date: Mon, 18 Oct 2021 14:35:30 -0400
+Subject: [PATCH] build with aeson 2
+
+---
+ Aws/DynamoDb/Commands/Table.hs      |  4 +--
+ Aws/DynamoDb/Commands/UpdateItem.hs |  5 ++--
+ Aws/DynamoDb/Core.hs                | 39 +++++++++++++++--------------
+ aws.cabal                           |  2 +-
+ 4 files changed, 26 insertions(+), 24 deletions(-)
+
+diff --git a/Aws/DynamoDb/Commands/Table.hs b/Aws/DynamoDb/Commands/Table.hs
+index 5fb42e0..a5fe025 100644
+--- a/Aws/DynamoDb/Commands/Table.hs
++++ b/Aws/DynamoDb/Commands/Table.hs
+@@ -35,9 +35,9 @@ module Aws.DynamoDb.Commands.Table
+ import           Control.Applicative
+ import           Data.Aeson            ((.!=), (.:), (.:?), (.=))
+ import qualified Data.Aeson            as A
++import qualified Data.Aeson.KeyMap     as KM
+ import qualified Data.Aeson.Types      as A
+ import           Data.Char             (toUpper)
+-import qualified Data.HashMap.Strict   as M
+ import           Data.Scientific       (Scientific)
+ import qualified Data.Text             as T
+ import           Data.Time
+@@ -281,7 +281,7 @@ data TableDescription
+ 
+ instance A.FromJSON TableDescription where
+     parseJSON = A.withObject "Table must be an object" $ \o -> do
+-        t <- case (M.lookup "Table" o, M.lookup "TableDescription" o) of
++        t <- case (KM.lookup "Table" o, KM.lookup "TableDescription" o) of
+                 (Just (A.Object t), _) -> return t
+                 (_, Just (A.Object t)) -> return t
+                 _ -> fail "Table description must have key 'Table' or 'TableDescription'"
+diff --git a/Aws/DynamoDb/Commands/UpdateItem.hs b/Aws/DynamoDb/Commands/UpdateItem.hs
+index 0d94a59..1152b5a 100644
+--- a/Aws/DynamoDb/Commands/UpdateItem.hs
++++ b/Aws/DynamoDb/Commands/UpdateItem.hs
+@@ -31,6 +31,7 @@ module Aws.DynamoDb.Commands.UpdateItem
+ -------------------------------------------------------------------------------
+ import           Control.Applicative
+ import           Data.Aeson
++import qualified Data.Aeson.Key      as AK
+ import           Data.Default
+ import qualified Data.Text           as T
+ import           Prelude
+@@ -91,9 +92,9 @@ instance ToJSON AttributeUpdates where
+     toJSON = object . map mk . getAttributeUpdates
+         where
+           mk AttributeUpdate { auAction = UDelete, auAttr = auAttr } =
+-            (attrName auAttr) .= object
++            (AK.fromText (attrName auAttr)) .= object
+             ["Action" .= UDelete]
+-          mk AttributeUpdate { .. } = (attrName auAttr) .= object
++          mk AttributeUpdate { .. } = AK.fromText (attrName auAttr) .= object
+             ["Value" .= (attrVal auAttr), "Action" .= auAction]
+ 
+ 
+diff --git a/Aws/DynamoDb/Core.hs b/Aws/DynamoDb/Core.hs
+index 1c116d3..b9a6cc4 100644
+--- a/Aws/DynamoDb/Core.hs
++++ b/Aws/DynamoDb/Core.hs
+@@ -128,6 +128,8 @@ import           Control.Monad.Trans.Resource (throwM)
+ import qualified Crypto.Hash                  as CH
+ import           Data.Aeson
+ import qualified Data.Aeson                   as A
++import qualified Data.Aeson.Key               as AK
++import qualified Data.Aeson.KeyMap            as KM
+ import           Data.Aeson.Types             (Pair, parseEither)
+ import qualified Data.Aeson.Types             as A
+ import qualified Data.Attoparsec.ByteString   as AttoB (endOfInput)
+@@ -141,7 +143,6 @@ import           Data.Conduit
+ import           Data.Conduit.Attoparsec      (sinkParser)
+ import           Data.Default
+ import           Data.Function                (on)
+-import qualified Data.HashMap.Strict          as HM
+ import           Data.Int
+ import           Data.IORef
+ import           Data.List
+@@ -536,7 +537,7 @@ instance ToJSON PrimaryKey where
+     toJSON (PrimaryKey h (Just r)) =
+       let Object p1 = toJSON h
+           Object p2 = toJSON r
+-      in Object (p1 `HM.union` p2)
++      in Object (p1 `KM.union` p2)
+ 
+ instance FromJSON PrimaryKey where
+     parseJSON p = do
+@@ -544,8 +545,8 @@ instance FromJSON PrimaryKey where
+        case length l of
+           1 -> return $ head l 
+           _ -> fail "Unable to parse PrimaryKey"     
+-      where listPKey p'= map (\(txt,dval)-> hk txt dval)
+-                          . HM.toList <$> parseJSON p'
++      where listPKey p'= map (\(k,dval)-> hk (AK.toText k) dval)
++                          . KM.toList <$> parseJSON p'
+ 
+ 
+ -- | A key-value pair
+@@ -661,9 +662,9 @@ instance ToJSON Attribute where
+ -------------------------------------------------------------------------------
+ -- | Parse a JSON object that contains attributes
+ parseAttributeJson :: Value -> A.Parser [Attribute]
+-parseAttributeJson (Object v) = mapM conv $ HM.toList v
++parseAttributeJson (Object v) = mapM conv $ KM.toList v
+     where
+-      conv (k, o) = Attribute k <$> parseJSON o
++      conv (k, o) = Attribute (AK.toText k) <$> parseJSON o
+ parseAttributeJson _ = error "Attribute JSON must be an Object"
+ 
+ 
+@@ -674,7 +675,7 @@ attributesJson as = object $ map attributeJson as
+ 
+ -- | Convert into JSON pair
+ attributeJson :: Attribute -> Pair
+-attributeJson (Attribute nm v) = nm .= v
++attributeJson (Attribute nm v) = AK.fromText nm .= v
+ 
+ 
+ -------------------------------------------------------------------------------
+@@ -962,7 +963,7 @@ conditionsJson key (Conditions op es) = b ++ a
+     where
+       a = if null es
+           then []
+-          else [key .= object (map conditionJson es)]
++          else [AK.fromText key .= object (map conditionJson es)]
+ 
+       b = if length (take 2 es) > 1
+           then ["ConditionalOperator" .= String (rendCondOp op) ]
+@@ -1046,7 +1047,7 @@ renderCondOp c = case c of
+ 
+ 
+ conditionJson :: Condition -> Pair
+-conditionJson Condition{..} = condAttr .= condOp
++conditionJson Condition{..} = AK.fromText condAttr .= condOp
+ 
+ 
+ instance ToJSON CondOp where
+@@ -1076,12 +1077,12 @@ data ConsumedCapacity = ConsumedCapacity {
+ 
+ 
+ instance FromJSON ConsumedCapacity where
+-    parseJSON (Object v) = ConsumedCapacity
+-      <$> v .: "CapacityUnits"
+-      <*> (HM.toList <$> v .:? "GlobalSecondaryIndexes" .!= mempty)
+-      <*> (HM.toList <$> v .:? "LocalSecondaryIndexes" .!= mempty)
+-      <*> (v .:? "Table" >>= maybe (return Nothing) (.: "CapacityUnits"))
+-      <*> v .: "TableName"
++    parseJSON (Object o) = ConsumedCapacity
++      <$> o .: "CapacityUnits"
++      <*> (map (\(k, v) -> (AK.toText k, v)) . KM.toList <$> o .:? "GlobalSecondaryIndexes" .!= mempty)
++      <*> (map (\(k, v) -> (AK.toText k, v)) . KM.toList <$> o .:? "LocalSecondaryIndexes" .!= mempty)
++      <*> (o .:? "Table" >>= maybe (return Nothing) (.: "CapacityUnits"))
++      <*> o .: "TableName"
+     parseJSON _ = fail "ConsumedCapacity must be an Object."
+ 
+ 
+@@ -1115,8 +1116,8 @@ data ItemCollectionMetrics = ItemCollectionMetrics {
+ 
+ 
+ instance FromJSON ItemCollectionMetrics where
+-    parseJSON (Object v) = ItemCollectionMetrics
+-      <$> (do m <- v .: "ItemCollectionKey"
+-              return $ head $ HM.toList m)
+-      <*> v .: "SizeEstimateRangeGB"
++    parseJSON (Object o) = ItemCollectionMetrics
++      <$> (do m <- o .: "ItemCollectionKey"
++              return $ (\(k, v) -> (AK.toText k, v)) $ head $ KM.toList m)
++      <*> o .: "SizeEstimateRangeGB"
+     parseJSON _ = fail "ItemCollectionMetrics must be an Object."
+
+
+--- a/aws.cabal      2022-07-25 08:47:06.270139909 +1000
++++ b/aws.cabal   2022-07-25 08:47:28.497479783 +1000
+@@ -35,7 +35,7 @@
+   Default: True
+ 
+ Library
+-  build-depends: aeson <1.6
++  build-depends: aeson >= 2.0
+ 
+   Exposed-modules:
+                        Aws
diff --git a/dev-haskell/base-compat-batteries/Manifest b/dev-haskell/base-compat-batteries/Manifest
index effa07ea2c33..a49c7495c770 100644
--- a/dev-haskell/base-compat-batteries/Manifest
+++ b/dev-haskell/base-compat-batteries/Manifest
@@ -1,6 +1,4 @@
-DIST base-compat-batteries-0.11.1.tar.gz 16748 BLAKE2B bd24a8fb165b8056023f7280745ce972d2036df33cd72f2824055455899d2643b4ca90d116d1692795ea504f0c03a97bc256eaeba7db491f35961061d28d0aba SHA512 a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217
 DIST base-compat-batteries-0.12.1-rev2.cabal 8891 BLAKE2B b7d6ebe0a100757dc6b95b3dcc25b5922b7a5c781c726fe69549d21631be0339dd08a0017427830e35c36dd2074b5be55b6f71d6555c6ca0050e7b825b2cb1b0 SHA512 38d81b3d72e9cb731d5c25310e71a5f73b004a37a4211315fb750c29e3bbccca40daeae175d25f8c602d1b2d13eee899cf5b2dea401d1aa5bf821b588b93572a
 DIST base-compat-batteries-0.12.1.tar.gz 17623 BLAKE2B c5bd92d32b4dbd67e28fc355a06c6e431be28f52db08f7ae9ba5fb067ac9536cbbf6c1315bf09417278856f1402bbc8376b51b34d564f0d0d15e21d0f317b4f1 SHA512 346ad1e53e4712017e610d1883e91371c1bbdefdce35b2830b8807e207f6fbd2233e2be153d85b6632059f58d3d9c74435537719823533ddddd47d96b231b0cf
-EBUILD base-compat-batteries-0.11.1.ebuild 1332 BLAKE2B 867923987abe0e7a494f367a2ae1c8dc327da5db0694e6a65c873611be7126be32a3932bc9c0a03ef64f8582512e92d8036d78cda8fbecb56e0f0e53f40fc342 SHA512 51c37eba33d6a5b3008777f0f68e5e352124539a63679342cf4df34266f73c30876cb677ffb925604f05a9007705270bdfc3c4283e41f161b140a545a56f7876
 EBUILD base-compat-batteries-0.12.1.ebuild 1329 BLAKE2B 4a11d30589d58b6009bef4667ee1894686c548f50b99d50049e5cb7f918bf2bbbc095a93c62cbfda1e297723372f67ff81f51ab34c7097d1bcfc32dffd9e13e8 SHA512 1e565fb3eff4c0aeb64869ac8b3a383ede7c7528f200a564b50f7e3bdab2aa544c95ede6b812961c0207a2532259adbeb5c59d4a100472b2fab9cc61d16da1a2
 MISC metadata.xml 1227 BLAKE2B 8eb53108c233a4104ebdbfb65ae119f19bd2ec64c1ce4be9e565b95845b7413128471ebfe760dca9ab4aea748b707645f8a40c4b704f72b8b7cce3c7a8270167 SHA512 99c6fa60f41d4d82c8a9593fe0c0afbbff5ecc3ae640429000d86ba451ecb2a70081b578133df41e327452858193d01f987294144c11cf58cca73bde75c5fca3
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
deleted file mode 100644
index 44b59da090b3..000000000000
--- a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="base-compat with extra batteries"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/base-compat-0.11.1:=[profile?]
-	>=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
-	>=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
-	>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-prelude/Manifest b/dev-haskell/base-prelude/Manifest
index 342c48051c27..d056609962cc 100644
--- a/dev-haskell/base-prelude/Manifest
+++ b/dev-haskell/base-prelude/Manifest
@@ -1,3 +1,3 @@
 DIST base-prelude-1.3.tar.gz 4323 BLAKE2B 3d36ddfa5528f16d4323f690c42fe8871f563cbfc926d5e79831ddb0aebe5ca705842bb87d21dc960bbfaa088a298f7f810dd085228877755678b3daa6c67b4c SHA512 de0f500e0d2d962491951445e7409f337bbf5614417cf6dd54cf04e1dad9ad181bc09648c9f7e0201838fde38ca86b2f89eb40805c9d9df7afb9dbaae565eda9
-EBUILD base-prelude-1.3.ebuild 572 BLAKE2B 6d4ae70c26db6bc1123448bd7d99962b1ab5db4e0c501aaafa60547a58a21166f546946e5c6d630bf81d7c27d84d8fbd575a6f077aa07c718e74d45d382dae27 SHA512 a2a522974a895575a13129057a694ad7851fa69018f4503b6750716ad0756bc1f0d9a1af1d232b2dd304299b52d9256383f8b32fc9a92a3e6dec3032e79918d9
+EBUILD base-prelude-1.3.ebuild 579 BLAKE2B 67606abebce94dc38a44fc4ffcbef5ef0e23478a57d04d25a93dc8c43b33fe5d6b820f17f4aa6b30db480fdcdf5482b0b0b63228a32415235c9a3748694882ff SHA512 145bd3685d279ea205eb9ec3fcaa1de3369f01b7e030e1876438151a8d6043e54b67682c327f588c368b775349ea9315107041bd7ac1c6fa655f40d471db010e
 MISC metadata.xml 892 BLAKE2B 26398dc5f2510f70554fce7ce42bce96a659fae80678e1e5d786a2b555509b846bdebfb1054c0bfc8b3497804b98651e09301370157c158f5358720a30dd9ec5 SHA512 ac1658ca34b2b343c0a9146017235e220fcd5104fd5f1de035bb01af6dbc3d6a64fbdda9ab756b3ecf539e208ca49d9b8d8413112d056f54285b5b02198d8695
diff --git a/dev-haskell/base-prelude/base-prelude-1.3.ebuild b/dev-haskell/base-prelude/base-prelude-1.3.ebuild
index 68bd3c865ce3..95d505e05ae3 100644
--- a/dev-haskell/base-prelude/base-prelude-1.3.ebuild
+++ b/dev-haskell/base-prelude/base-prelude-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.6.1:=
diff --git a/dev-haskell/bencode/Manifest b/dev-haskell/bencode/Manifest
index f7d74b825596..3ef194d775e6 100644
--- a/dev-haskell/bencode/Manifest
+++ b/dev-haskell/bencode/Manifest
@@ -1,3 +1,3 @@
 DIST bencode-0.6.1.1.tar.gz 7008 BLAKE2B 9fe866d2588f9feddaa6691ab09c96bfbdb6b91efb79ab48de35fa40d45397f8940423c18b918a4f1289a94574982a8cb96d0c0770f9f346a43193389eec8d09 SHA512 e2f4c312923412a47cbea62caf6e001e30418946165405f2cd9d77f06c13ff2846b352e28ca6cbbfce3bf236fb42f0b108442b17e2b0e8bac702af6d6a114f09
-EBUILD bencode-0.6.1.1.ebuild 691 BLAKE2B 61a5a33983fcf9efa0b6e62a8de94cd67c5390cc273fcd6d8b20b14b11e0fb5bbaa4c5c2058d4f87424aba77cb8e0f8fd526898a19aaf5b512271c67def9c2f4 SHA512 dc333f2df5464ca23909a4716c46974fc751501c3db620b128628d565790a89cf00d704eaafdfdc69b77f140d60d5ddbcb91f163754a1a4f6c7c373409a37899
+EBUILD bencode-0.6.1.1.ebuild 698 BLAKE2B 91fe4882eca06b909fbfae16b4673070e050197c845e7bdec965b905c3045c53d4a77af2ae671063186221e8abfb2a7d7479ac073699bbc6c947929ced9e1ee7 SHA512 a0b40dddf1fd4f8f00f7bf6c0a738b3a37a8085a684d8f8ca6197f457ce84da65e00642a34b7aa40acd966e26c71f2ffa7a644486e2eec294fac8a8faa4b9bd6
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/bencode/bencode-0.6.1.1.ebuild b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
index e2d92b959353..c131540ddf13 100644
--- a/dev-haskell/bencode/bencode-0.6.1.1.ebuild
+++ b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/parsec:=[profile?]
diff --git a/dev-haskell/binary-orphans/Manifest b/dev-haskell/binary-orphans/Manifest
index 25a280927d99..ddd1ea5f4e5a 100644
--- a/dev-haskell/binary-orphans/Manifest
+++ b/dev-haskell/binary-orphans/Manifest
@@ -1,3 +1,4 @@
-DIST binary-orphans-1.0.1.tar.gz 4425 BLAKE2B 2f94e8e2fa70578b0feaa338ea5148f2f373cabdf4fcfaa3092ff7f92484fc7708da09bba8ea51de626c70c74de3051a6eae6c0a2280d125504d168c730e0f14 SHA512 067df608ec5fee2907c1648c19116a4de7a237c41101e811ba02789fbe22c5726443d4950b03bd156ad8ea336acc6c71da3efe7a6cf1127519ec5eb9778ec11d
-EBUILD binary-orphans-1.0.1.ebuild 1479 BLAKE2B 5e713575df405e18cd59b3e66e39b8e6fe816912926dd6b30b460a2da6a1bc680956547121b17fed9126f4e8167c48bbe7c84d476eef026b67ff65a0b8087e57 SHA512 acbc21ef06b22f8407b5bce89fe1abddd2cab38649625566681fec283accd2ba05a85c06b3aed8b04e059f3638ffb7c5d8fd1a75650339330b16c32b90affdf5
+DIST binary-orphans-1.0.2.cabal 2264 BLAKE2B aba78e56c07192df484757aa58fdc79ea201cf4545499b11f3a82cbfd0af57c0db0fd1134255f7697b0276f2e7807ba5a74b9b591d233b99e6fec4c908ecdda8 SHA512 8cb030d9a9dc32a4a3ada6684babc5b45d8a6a786261668eb01ae36f3d496f1ca25b0a31782c3728bfb3ede3883df52015aefd85bbf0911ac7e0222d1a33de6e
+DIST binary-orphans-1.0.2.tar.gz 4566 BLAKE2B bdb19771f2ef1201d55766bb26b461341d23899356379a0fa031cf014dc8dd9341bab1538488fe739c9ccecd51ad686e4781220c962a073866238a443ddac389 SHA512 49b6c758b0e94594e9a5feab7f5c3398fcd6b0498c06fffa5e9eb1d39c753f64c0eafbfdd2826a9581a47f2caa5e4194aef89840ce95ba1455844e74b6d6ad1e
+EBUILD binary-orphans-1.0.2.ebuild 1411 BLAKE2B d6161b53de53f7f5194837af74e5641fb65d6aa37345943ef7e1f61066fe1b15d42bebe99d66abcd10a0164b9431f6da14ffff78c74f2e37a67024c0e4e9e28f SHA512 401cff85ed2094be85bd4bf20472236bab5dde2253abc9d5df111aead3c097508b4f6358262285fbccf012c5d9051906f5903d472ed49fcfa7ffcb10241e7673
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
deleted file mode 100644
index 7003eae643b2..000000000000
--- a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for binary"
-HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?]
-	>=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7
-		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base          >=4.5     && <4.14' 'base          >=4.5' \
-		'binary        >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.7' 'binary        >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.9' \
-		'semigroups >=0.18.5 && <0.19.1' 'semigroups >=0.18.5'
-}
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
new file mode 100644
index 000000000000..5c7b1efe0f97
--- /dev/null
+++ b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Tests fail to build
+
+DESCRIPTION="Compatibility package for binary; provides instances"
+HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
+HACKAGE_REV="1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+#	test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+#		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
+#		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7
+#		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.5
+#		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 )
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/blaze-builder/Manifest b/dev-haskell/blaze-builder/Manifest
index c2b5d858667b..db40114e4794 100644
--- a/dev-haskell/blaze-builder/Manifest
+++ b/dev-haskell/blaze-builder/Manifest
@@ -1,5 +1,3 @@
-DIST blaze-builder-0.4.1.0.tar.gz 61365 BLAKE2B 6c6a1c2f7b97a75bb7489471e34674d0502ec1b2871643dc945ef0574d94cc09c2726d03fcc4f38d43f34baadd8629a0e81d5292998153ee8b907d546153488c SHA512 0962634113a19d39fb19a9df895a4e4e3e0fc5b2c17fd0d5c27e1cd9da128fd3af2f01d7b0ce894d3964b5b3bd874aeae205b126e069a6e5d964ad97c753da39
 DIST blaze-builder-0.4.2.1.tar.gz 60704 BLAKE2B 0799da061985559e3281d064dc2624a1ae2310befaadfc2cddca6999f3725bfc2a8a97d73810566c82b6037e1524ee19059c10ed6eb88707e95792ce2c1282ce SHA512 30f8d1d70a1aeb5b4c4e3170e40207c0f39933050e04bbdff49683a8b2e850921e80fa8e2d7f2b7a2a19fd6340bb65fad9c1d33999abf8a388d3f0ce921d0744
-EBUILD blaze-builder-0.4.1.0.ebuild 924 BLAKE2B 848d196d7a01a64c646bf44171142dff78c60e005c49deaea9a762929bac5c3e27a7d24082a494f267424d0256846f080e6748e99d8d63cef6aaf9b1bc16705e SHA512 4417ad5424eed50ea346a51fc57a17397ffcaf6ffe93fa3e198ae6141468e07a7d421441ddcc119fbf8a2c60cb24f2367d55a4eb0609237ef02b67265683963d
 EBUILD blaze-builder-0.4.2.1.ebuild 799 BLAKE2B deeef92857cc22227eecf8b9c8aeebe0edcdadeeeb9a036b33f508185d305f81f8a83372cf93a6867301292ba63446aef0558640ddb2f48b8e103d8835b9c60a SHA512 f4f7f133b74d2b3093bae4fa41647d611d5bd540bfde57b6e380e927205af711ab7d6dfc9e6920921b0a501ccf22b77bc2b503bb2647d9040a524ddb848cef16
 MISC metadata.xml 870 BLAKE2B c6f825d6982b1effd706675994c79fdf6b54e18913e952416112fa2f1c87865ef18e9fc0a44311d725b2ed1fb142a4b74fd35a38813cdbf070f23138ec0cb279 SHA512 d42eeff87f396fd4d18d89d472a4a28599d625e084004b3160bab03c2d2a83bb4599bd6e3c132d6e1fd69518b79be76c990032c125dc369e4cca216f08854e81
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
deleted file mode 100644
index 7393389c427f..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/lpsmith/blaze-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/utf8-string )
-"
diff --git a/dev-haskell/blaze-html/Manifest b/dev-haskell/blaze-html/Manifest
index 488a43b25d7a..c28a873ce0a8 100644
--- a/dev-haskell/blaze-html/Manifest
+++ b/dev-haskell/blaze-html/Manifest
@@ -1,4 +1,3 @@
 DIST blaze-html-0.9.1.2.tar.gz 81617 BLAKE2B 36e86647db47ee55a32daf2cf2afa51fd58436c7de7e7dac81b298cc1ea7e1ba1fd470d2a19def3bc6aabc51bd046c8c611300fa4ecb5f0e1cee2286a0b461e6 SHA512 26e5294285033fa453ab9914a5bdb37c42f5b7c3a10400be1ff6dd125a70499d556c106cc8128154dc0c455c8b80b489a883265fcb626e2d4afcd8e4d94374bc
 EBUILD blaze-html-0.9.1.2-r1.ebuild 1243 BLAKE2B 728186095a28040f382a24c6fd5aedf8daccb1f31b828c4b6f254fcab72c30b8cb65e7e9cf3148c3624d14bd284019050e8fe709ac672b6fb8f09686146b0528 SHA512 c7c1164be8d5376ab12bd9a308cb61b4e0ea64fe97a8b62554ad7825e832d7bf64de941049ac3766e5bf927a7e9a3af06bc812307ebcb9e02466d955dd86923d
-EBUILD blaze-html-0.9.1.2.ebuild 1152 BLAKE2B bc5053b4c5cabe7ac6def9b69e19dd8feda36e1a58d0f62401bb2184bd3932011582f194d6f710629aaa6ccee915783e56245eefdff35afe39f7d7db0d74a90b SHA512 82aad15a706d95f49d9fdcecf335b11bc4bbf0753ff750ad82473204517c67ebf4c3792d5790acbfa89cee4067cab898491cb9f050617f5d84ebe46035233c5d
 MISC metadata.xml 499 BLAKE2B 9290f055a6deb0891546b9d6047210c746a5d63fa6c8056f7f7863c54a11b5d7089946852fc020c565bc1506eafb8c47a5389a66d3129f05fb38cd292eb8db3f SHA512 671fe748ac662c1e8a795b95190dfd8601c50fcaadc1934a5d8f82d894b9197bdcda97b947f45a39ffa96c3ced281905bb121bb6c012bc5e04244d557e773459
diff --git a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
deleted file mode 100644
index 3540a0048cb3..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/bloomfilter/Manifest b/dev-haskell/bloomfilter/Manifest
index b2636fe8ff46..3466efb948ab 100644
--- a/dev-haskell/bloomfilter/Manifest
+++ b/dev-haskell/bloomfilter/Manifest
@@ -1,3 +1,3 @@
 DIST bloomfilter-2.0.1.0.tar.gz 22100 BLAKE2B c00a904a32c2e16810b19e27d7adef365ecf48b62bcd8da871aa3b33cb9b6e18cb11771da5a7df7209ce048e2fa1176b9c3f015030d0349a10a32375f462df02 SHA512 1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21
-EBUILD bloomfilter-2.0.1.0.ebuild 697 BLAKE2B cab813121d2b9220017fd33c968bb34a53d93f1134147d266d9c93d36b99fdfe2eaa009545c9dc2b7d8acb67ddee5f19e1050221656744ee8e28c153a754a33f SHA512 a3afe03b5a0700e38f8443cfba3624756704805371fcd8af1b1798f8eed4a360e07e68997dfd96dbd7e78675e2fd32e404c195959e59eea09e2a8ea95539e479
+EBUILD bloomfilter-2.0.1.0.ebuild 704 BLAKE2B 16fd3a183d343a49f77bc8110bb944882ef79332b79af35f4ee9b2d4c12479b2dc58afb3b477f4675d021c82f39911f8148e8d5536cbffa4ada4f018bb236c1c SHA512 fa0e80a876cc431abd8a42d1330c3474b6a709cd77f99226fc47f1c44fbc32a290ae742fbdc9141d7f536e0323a2bbc65c61a1fe8c7764cfff805da0b1ac2008
 MISC metadata.xml 330 BLAKE2B d0aca87a33112d83a4dd2b83131e016256a90db4129bb28e746cc76ae58c07617ea9464bb2eb5ada341f45fe6a9c7c52385f4a06b81a4fc129d7edca39b05293 SHA512 aca6a407a70e78604949e4b0c49858bca387bee5f823f9d13a255d244362fdce0e3755418289533a1f70fe30ad5f45e29743dfe88107455f215aca9ba1ea3c50
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
index 746d11fb076a..885194de24df 100644
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/byteable/Manifest b/dev-haskell/byteable/Manifest
index f94fa1de6796..4f99c9ca8297 100644
--- a/dev-haskell/byteable/Manifest
+++ b/dev-haskell/byteable/Manifest
@@ -1,3 +1,3 @@
 DIST byteable-0.1.1.tar.gz 2400 BLAKE2B 0da53566faeb934ffb63623dbc58f6f3b2e4499f6a5547ff6707b034e8e5ea097c4dea600d83421f7da47958cc54c0377d4f53e123480aba464ab5fcfe7780bb SHA512 f2e6225390be9f35ee6a4ce981aaa8c2683f1627a8401386b1abb7fff5fe1474ae0fa07e71a0c83694d7a18ca793943fe36b844d868c3e9c3387ce1a7b2bf54c
-EBUILD byteable-0.1.1.ebuild 560 BLAKE2B 3c3348649255a7d630e090951d577c3debede0b82881c9a74f456ebd9f47252805690c38410e7ee614003a3bb1a0f1bda38f76dd8faa407e54835c69848ea24b SHA512 4577cfbd94a20cebe618eac5ce84422819c4553bd4a47cd6ea28a64120fda2eb223aa8892dd76babf5bcfc1147b695992e440f1acc847d4e4167b0e410bc4ffa
+EBUILD byteable-0.1.1.ebuild 567 BLAKE2B 6609383d2b635a9c656d8b69f2c975ede40d3994b5d73ed8a1bbe51c58b2044c764ca67742379cc72dfd9521e4348bcaea01c1d150108727aaf46ce99fcd48a9 SHA512 b9252b51eb1a2fd825237dca89c0504e825210aefe60fbeb0978288622255507f0c375302866fbfbe08d08fca6dc50cf5848c2bf04ac353d51a0a806eb7d30bd
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index baf7a77b5f27..5dc32ecfc4e5 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index f0344a95cbd7..b7479af7360e 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,9 +1,5 @@
 AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5
 AUX cabal-install-3.2.0.0-rankntypes.patch 415 BLAKE2B 8a0459bac359c3f53750f50131e8fb0fa30ae5346ab718f0471959b543d17c91a691649066349ea129777bfc238dcc66ef4df6b222e5e76ae65ccbef863a57b1 SHA512 1b650dcef65df682b7058f67d43664910f8ffdf558a81d1df033080df1255460e45a3685b5897129339c00fe20d8cff23e1b3d5bc0f08c041b4e177fac9fe9d2
-DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062
 DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db
-EBUILD cabal-install-3.2.0.0-r2.ebuild 2585 BLAKE2B 043e4de1d9fea9945d2806ddf1ec2f5a787dd8d26e05b8ff678f4eecb0ef8d2be86222b3b9edfb33f6074f157f7489054d493e5841c279ac7dd67e01f46c2b5d SHA512 3f72b5ee31c2a4000e297fcdf21787a84650aedb3d50f6a3c7894a6c3b1699f3ad999f4446ae0a60cb1e3243cb63829a6972d217130237f2b7b6824129b99db1
-EBUILD cabal-install-3.2.0.0.ebuild 2551 BLAKE2B c166cda31d9ff4b49ee0b0777324997b5f8fc99da62d7448eac2f13a6eb7d6dc12b6b0dc9e10c9dacf2df5ee3db700df26900eb4a5df37d2a605b10ed1dc4ae4 SHA512 9e3f52f6b3dfdb843fc8cc42fb29ffc723664d21ec052a6f4ca26911ed0d00f30be906333e2d586644d8ccd1be734e993ca991665a26ad13aace120ce9b1a296
-EBUILD cabal-install-3.4.1.0-r1.ebuild 2608 BLAKE2B 3a69c523bb8489bf67e5b4de16a9c6fa62a26549ad671f142f924cb48601ce736d2447c68ab423c081a0a7b83542281a7fed1d0542e2ec34d255b7294c4eb1d4 SHA512 69bd0b4de8f7ea22eee8bd5a519ebae8af2f80a11c4347f27e0279488d16fd1daacfdaba8723ec0d31d7ae58f1492a44ef55e7ee08de5d43f0ed0cc1463b5272
-EBUILD cabal-install-3.4.1.0-r2.ebuild 2674 BLAKE2B bb4d4d141daf0d6f9235d758670b7da657302c55f10e3fc10660204ec3acb31896ec82bf415ca2402b45ba58e6e471735aced0f764e350125b1d42e5136852c4 SHA512 220dc808bb1477eeb398dcca071728fcd9917339b4c0e8149646a5348ca4cca9e8555f5295a85c0bb98011c03ac16a80138dee4c97b5a32a07a9d158c9493e92
+EBUILD cabal-install-3.4.1.0-r2.ebuild 2693 BLAKE2B d3cfa43ac98976a9f44886a539fdab30c3e1952e43a29a6baf7596bbec58ab0a8641dbdc7e2deab6afbc8dd941a0a17807f505a17b4ed79d9dfeeaec0ec25c7d SHA512 02fc50286c9b705b82600c41a94ff6227a85395c410d86459a207dc128ba00061119a1464ec706426e0a8b49d161966de3161f5f272f43ef2e8df46f8c9b0ab9
 MISC metadata.xml 521 BLAKE2B 70a6d4931fc3d675f4c187feae97577f313d80e153c98944dd5e8036f7fed064c8bc5eeaf7afae7ce5bae78b7a9b958e03551a1c0489a7d6c840e1ed9b3c121a SHA512 f6e3c3afcb77d9c850125d2a9c7cfe2f1b7de1098ff98cb605ab4e5d82959807df3d8ba282ca929e35107f62fe32317bb6cc8a0bfd3c2fdb6ccb8485050f9b38
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild
deleted file mode 100644
index 6665509be188..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.6.5.9999
-# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86"
-IUSE="+native-dns"
-
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
-	>=dev-haskell/base16-bytestring-0.1.1:=
-	>=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.3:=
-	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
-	>=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
-	>=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
-	>=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:=
-	>=dev-haskell/hashable-1.0:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
-	>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
-	>=dev-haskell/network-2.6:= <dev-haskell/network-3.2:=
-	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
-	>=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:=
-	>=dev-haskell/random-1:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
-	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
-	>=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.10.1:=
-	native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.14' 'base       >= 4.8' \
-		'hashable   >= 1.0      && < 1.4' 'hashable >=1.0' \
-		'base16-bytestring >= 0.1.1 && < 0.2' 'base16-bytestring >=0.1.1' \
-		'random     >= 1        && < 1.2' 'random >=1' \
-		'HTTP       >= 4000.1.5 && < 4000.4' 'HTTP       >= 4000.1.5 && < 4000.5'
-	#if use noprefs; then
-	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	#fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-	eapply_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flags=-debug-conflict-sets \
-		--flags=-debug-expensive-assertions \
-		--flags=-debug-tracetree \
-		$(cabal_flag native-dns native-dns)
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
deleted file mode 100644
index f4d9b998fb9d..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
-CABAL_FEATURES=""
-inherit haskell-cabal ghc-package
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86"
-IUSE="+native-dns"
-
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
-	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
-	>=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.3:=
-	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
-	>=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
-	>=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
-	>=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:=
-	>=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:=
-	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
-	>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
-	>=dev-haskell/network-2.6:= <dev-haskell/network-3.2:=
-	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
-	>=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:=
-	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
-	>=dev-haskell/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
-	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
-	>=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.10.1:=
-	native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.14' 'base       >= 4.8'
-	#if use noprefs; then
-	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	#fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-	eapply_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flags=-debug-conflict-sets \
-		--flags=-debug-expensive-assertions \
-		--flags=-debug-tracetree \
-		$(cabal_flag native-dns native-dns)
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild
deleted file mode 100644
index 7d4b0c20b8f0..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.9999
-#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
-
-CABAL_FEATURES=""
-inherit haskell-cabal ghc-package
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +lukko +native-dns"
-
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
-	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:=
-	>=dev-haskell/cabal-3.4.1:= <dev-haskell/cabal-3.4.2:=
-	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
-	>=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
-	>=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
-	>=dev-haskell/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:=
-	>=dev-haskell/hashable-1.0:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
-	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
-	>=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:=
-	>=dev-haskell/random-1.2:= <dev-haskell/random-1.3:=
-	>=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:=
-	>=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
-	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
-	>=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-8.4.3:=
-	lukko? ( >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= )
-	native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-"
-
-src_prepare() {
-	default
-
-	#if use noprefs; then
-	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	#fi
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.15' 'base >= 4.8' \
-		'hashable   >= 1.0      && < 1.4' 'hashable >=1.0'
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-	eapply_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug-conflict-sets) \
-		--flag=-debug-expensive-assertions \
-		--flag=-debug-tracetree \
-		$(cabal_flag lukko lukko) \
-		--flag=-monolithic \
-		$(cabal_flag native-dns native-dns) \
-		--flag=network-uri
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
index ad7ac3748fb1..51030cf0b8da 100644
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 #hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
 
 CABAL_FEATURES=""
-inherit haskell-cabal
+inherit haskell-cabal ghc-package
 
 DESCRIPTION="The command-line interface for Cabal and Hackage"
 HOMEPAGE="https://www.haskell.org/cabal/"
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 #keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="debug +lukko +native-dns"
 
 RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
index befff9eedb50..696769721fa3 100644
--- a/dev-haskell/cassava/Manifest
+++ b/dev-haskell/cassava/Manifest
@@ -1,3 +1,4 @@
+DIST cassava-0.5.2.0-rev7.cabal 6051 BLAKE2B 934cf9b067a8c9503f13676e3ee8f4d3a79a7ab030f39f4b652d460d89e3a739b1bb2bc231ad06e63d0cc5155e4119f91d2ea1d5d01c423c7cca2e689f07fd46 SHA512 4f8105a7298ff3a5f4dc8d579571296902d44084dce57c0136bd089de4575d75fa6a839fb568a87c7ae0b07ea3cee40a6e33ffe35ca2c8b05dd45905aa8713ea
 DIST cassava-0.5.2.0.tar.gz 37411 BLAKE2B 64351820bf75bfef0f29e44d1c3f9177ba41474d3419985b9853893aa4cee1485bbb1dfdd4d11b4c8df2673775fdfa211942b13f11124e8077ac25b91c6fc8d4 SHA512 f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383
-EBUILD cassava-0.5.2.0.ebuild 1796 BLAKE2B 639a16e0b693f73fd479e160b35529f1dd698b3f2ddcf9fd2d12e4a9e8a9e70136a94595b1cf6ba400839f164fb75131d662b90a9f62e2578fb2c195e8928220 SHA512 c5abca5853914356be1e6cf72a9b95b5d4c28baa1b319ec4e7c97bd07d2e9aa6a91fa1264aacfd815110b5d5068718815b5d5b0f9a06c1e11df46a4d4901d692
+EBUILD cassava-0.5.2.0-r1.ebuild 1940 BLAKE2B 1c764995d41f50416db49af25c232dba67fa3d3b34ff95f0e634a46dd77cfb93d747cd4173108dfc8ac52f552321342ba6c4df7e464344271ccfc2e903e7fc30 SHA512 3786c4d6b304f2d01adf10aae5eb8e9e6d780502140d7da00bac98883c16f0f389f39029338b778de8691f9d631bd8152973a39ee5fa93a9e865bfaa29bf0bac
 MISC metadata.xml 328 BLAKE2B 4c208ed9a0d98908226ee05ca1cf035b2b32cb6a25ef3144b31295ef7282201581e2c092e3b858235904613a0d9ad77d5e0140917efb3c9c67609673ea840253 SHA512 9ccd0c72602f132a1135e10dca562e35ba6ba62c12f17a66aba5659a9e951dfa6597e7927c25c4474cbd3063c2fcbcffed68c75997c206d09f6d766d9b6ec14f
diff --git a/dev-haskell/cassava/cassava-0.5.2.0.ebuild b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
index 73aa92acc462..2e18d8474b4d 100644
--- a/dev-haskell/cassava/cassava-0.5.2.0.ebuild
+++ b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
@@ -1,48 +1,54 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="7"
 inherit haskell-cabal
 
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
 DESCRIPTION="A CSV parsing and encoding library"
 HOMEPAGE="https://github.com/hvr/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	<dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	<dev-haskell/hashable-1.5:=[profile?]
 	>=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
 	>=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
 	<dev-haskell/unordered-containers-0.3:=[profile?]
 	>=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
 		>=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
 		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
 "
+BDEPEND="app-text/dos2unix"
 
 src_prepare() {
-	default
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
 
-	cabal_chdeps \
-		'base >= 4.5 && < 4.14' 'base >= 4.5'
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
 }
diff --git a/dev-haskell/chaselev-deque/Manifest b/dev-haskell/chaselev-deque/Manifest
index 7ebf828cd43e..417fb85c58e7 100644
--- a/dev-haskell/chaselev-deque/Manifest
+++ b/dev-haskell/chaselev-deque/Manifest
@@ -1,3 +1,4 @@
+AUX bd458b66e1b28c249628e282ff42e8468646c557.patch 9457 BLAKE2B 2aae3ec4feb1c421152efb7f27f692ae964b5e2c72287b3852e47eb32afda190a9d2256684dd7f357346841a24ecf784a9c21d8e6fd57294a58c5a457c06b558 SHA512 4c94292ceffd1496e79d96c8019d552cb1cb836fe0852c43f60d267d65ef1c9d0a4ff65181aaae3d54e258d7844b2d8674633e54e677af560c65f024762df0cd
 DIST chaselev-deque-0.5.0.5.tar.gz 12451 BLAKE2B 79ee460eb84286bbbe0dcd58431d5ab0b7aef1d0d186c2c919b566c6b169ab4069917a61e8bb800af3857c7e3cca09c6f698c6f9a6b5d8efdbdd5902a7042310 SHA512 1561208ec92d7765b126684677cab02ee71bd1f7d2cdc6f2acac065972c241d085a538e14f51c87555f464aadbac2795c64f9063075acdf29217fb2d70a47dfd
-EBUILD chaselev-deque-0.5.0.5.ebuild 984 BLAKE2B 8202a3aaf229d49d99da2a648481d75446ac09803c100c55877b03b1bad20954d94b85a7f70bf4166763eeb57bb6e9424050377341db7ba9b2121e182168f7ba SHA512 b327c20c82ad3096dd4e2feb52b51d04af2ffd07ff751e589eedd9721de3ac89815fae031aed980b0661b9266f6fa46dc910171b608688ce4ae77df274d5fe0d
+EBUILD chaselev-deque-0.5.0.5.ebuild 1065 BLAKE2B 5fe6c9ab48417fb79efef6351486574c4d5c00d957ae86472a9b280020166a367fa2bee08ea3af5ad28ae9a3f876f935c74191a580bf63bc122d41a322d3fb9b SHA512 2d3cdec87e33e9ee5fedf7a1a7262893de6b7cb7726a4c5d988fd7fa0c99b0b77a02fddd7125c7cc2f29d65ce0e362f42da28396469f8583fa19efaa46cfec68
 MISC metadata.xml 657 BLAKE2B 7acba95edb6e6574d0ee2ab578e355096b2945dc59fffb8544275e09425b4508fe3dc5feff107bf86258f0e65b2efe11aa0c18413b33428cac1121d6fe0f7df9 SHA512 96e06d5b5bd8f96066c5ecb8c0259019e7a0ed32ea345ae3f229e88a6ea13f58f7b1994deba482448f0d94b6e4a60f3faf70a360541b84263247c42f46083626
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
index 6d2416322a90..5777bebfaf85 100644
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
+++ b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,9 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="debug"
 
+PATCHES=( "${FILESDIR}/bd458b66e1b28c249628e282ff42e8468646c557.patch" )
+
 RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?]
 	>=dev-haskell/atomic-primops-0.5.0.2:=[profile?]
 	dev-haskell/vector:=[profile?]
diff --git a/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch b/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch
new file mode 100644
index 000000000000..25b2b732f5dd
--- /dev/null
+++ b/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch
@@ -0,0 +1,281 @@
+From bd458b66e1b28c249628e282ff42e8468646c557 Mon Sep 17 00:00:00 2001
+From: Ryan Scott <ryan.gl.scott@gmail.com>
+Date: Mon, 24 Feb 2020 10:22:38 -0500
+Subject: [PATCH] Import unsafeCoerce# from GHC.Exts, not GHC.Prim
+
+`atomic-primops` and `chaselev-deque` fail to build on GHC HEAD
+(8.11) since `unsafeCoerce#` can no longer be imported from
+`GHC.Prim` (see
+https://gitlab.haskell.org/ghc/ghc/commit/74ad75e87317196c600dfabc61aee1b87d95c214).
+Luckily, `GHC.Exts` provides a backwards-compatible way to import
+`unsafeCoerce#`, so we can simply import it from there instead.
+
+diff --git a/CHANGELOG.md a/CHANGELOG.md
+new file mode 100644
+index 0000000..c0a4b4b
+--- /dev/null
++++ a/CHANGELOG.md
+@@ -0,0 +1,25 @@
++## next [????.??.??]
++* Allow building with `base-4.15`.
++
++## 0.5.0.4
++* bugfix
++
++## 0.5.0.3
++* minor bump to change abstract-deque dep.
++
++## 0.5.0.2
++* bump to go along with MAJOR bugfix in atomic-primops 0.5.0.2
++
++## 0.4
++* bump to go along with atomic-primops 0.4
++
++## 0.3
++* bump to go along with atomic-primops 0.3
++
++## 0.1.3
++* small release to fix version deps before atomic-primops api change
++
++## 0.1.2
++
++## 0.1.1
++* bump for fixing bugs!  First release candidate.
+diff --git a/Data/Concurrent/Deque/ChaseLev.hs a/Data/Concurrent/Deque/ChaseLev.hs
+index 7ec2ff0..baf0843 100644
+--- a/Data/Concurrent/Deque/ChaseLev.hs
++++ a/Data/Concurrent/Deque/ChaseLev.hs
+@@ -39,8 +39,7 @@ import Data.Atomics.Counter
+ import System.IO.Unsafe (unsafePerformIO)
+ import Text.Printf (printf)
+ import System.Mem.StableName (makeStableName, hashStableName)
+-import GHC.Exts (Int(I#))
+-import GHC.Prim (reallyUnsafePtrEquality#, unsafeCoerce#)
++import GHC.Exts (Int(I#), reallyUnsafePtrEquality#, unsafeCoerce#)
+ 
+ --------------------------------------------------------------------------------
+ -- Instances
+diff --git a/Data/Concurrent/Deque/ChaseLevUnboxed.hs a/Data/Concurrent/Deque/ChaseLevUnboxed.hs
+index 2817f7a..e1d2fe5 100644
+--- a/Data/Concurrent/Deque/ChaseLevUnboxed.hs
++++ a/Data/Concurrent/Deque/ChaseLevUnboxed.hs
+@@ -3,7 +3,7 @@
+ -- TEMPORARY: An experiment in duplicating ChaseLev.hs to support unboxed queue contents.
+ 
+ -- | Chase-Lev work stealing Deques
+--- 
++--
+ -- This implementation derives directly from the pseudocode in the 2005 SPAA paper:
+ --
+ --   http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.170.1097&rep=rep1&type=pdf
+@@ -15,7 +15,7 @@ module Data.Concurrent.Deque.ChaseLevUnboxed
+     -- The convention here is to directly provide the concrete
+     -- operations as well as providing the class instances.
+     ChaseLevDeque(), newQ, nullQ, pushL, tryPopL, tryPopR,
+-    approxSize, 
++    approxSize,
+     dbgInspectCLD
+   )
+  where
+@@ -41,14 +41,13 @@ import Data.Atomics.Counter
+ import System.IO.Unsafe (unsafePerformIO)
+ import Text.Printf (printf)
+ import System.Mem.StableName (makeStableName, hashStableName)
+-import GHC.Exts (Int(I#))
+-import GHC.Prim (reallyUnsafePtrEquality#, unsafeCoerce#)
++import GHC.Exts (Int(I#), reallyUnsafePtrEquality#, unsafeCoerce#)
+ 
+ --------------------------------------------------------------------------------
+ -- Instances
+ 
+ {-
+-instance PC.DequeClass ChaseLevDeque where 
++instance PC.DequeClass ChaseLevDeque where
+   newQ  = newQ
+   nullQ = nullQ
+   pushL = pushL
+@@ -57,7 +56,7 @@ instance PC.DequeClass ChaseLevDeque where
+   leftThreadSafe  _ = False
+   rightThreadSafe _ = True
+ 
+-instance PC.PopL ChaseLevDeque where 
++instance PC.PopL ChaseLevDeque where
+   tryPopL = tryPopL
+ -}
+ 
+@@ -93,7 +92,7 @@ dbgInspectCLD CLD{top,bottom,activeArr} = do
+          | isInfixOf "uninitialised element" (show e) -> return "<uninit>"
+          | otherwise -> return$ "<"++ show e ++">"
+        Right val' -> return (show val')
+-     
++
+ 
+ 
+ --------------------------------------------------------------------------------
+@@ -108,7 +107,7 @@ dbgInspectCLD CLD{top,bottom,activeArr} = do
+ {-# INLINE slc #-}
+ #ifndef DEBUGCL
+ dbg = False
+-nu a      = MV.unsafeNew a 
++nu a      = MV.unsafeNew a
+ rd a b    = MV.unsafeRead a b
+ wr a b c  = MV.unsafeWrite a b c
+ slc a b c = MV.unsafeSlice a b c
+@@ -116,13 +115,13 @@ cpy a b   = MV.unsafeCopy a b
+ #else
+ #warning "Activating DEBUGCL!"
+ dbg = True
+-nu a      = MV.new a 
++nu a      = MV.new a
+ rd a b    = MV.read a b
+ wr a b c  = MV.write a b c
+ slc a b c = MV.slice a b c
+ cpy a b   = MV.copy a b
+ -- Temp, debugging: Our own bounds checking, better error:
+--- wr v i x = 
++-- wr v i x =
+ --   if i >= MV.length v
+ --   then error (printf "ERROR: Out of bounds of top of vector index %d, vec length %d\n" i (MV.length v))
+ --   else MV.write v i x
+@@ -131,8 +130,8 @@ cpy a b   = MV.copy a b
+ 
+ #ifdef DEBUGCL
+ -- This simply localizes exceptions better:
+-tryit msg action = Control.Exception.catch action 
+-	                        (\e -> do putStrLn$ "ERROR inside "++msg++" "++ show e 
++tryit msg action = Control.Exception.catch action
++	                        (\e -> do putStrLn$ "ERROR inside "++msg++" "++ show e
+                                           throw (e::SomeException))
+ #else
+ {-# INLINE tryit #-}
+@@ -145,9 +144,9 @@ tryit msg action = action
+ 
+ -- TODO: make a "grow" that uses memcpy.
+ growCirc :: V.Unbox a => Int -> Int -> MV.IOVector a -> IO (MV.IOVector a)
+-growCirc !strt !end !oldarr = do  
++growCirc !strt !end !oldarr = do
+   -- let len = MV.length oldarr
+-  --     strtmod = strt`mod` len 
++  --     strtmod = strt`mod` len
+   --     endmod  = end `mod` len
+   -- newarr <- nu (len + len)
+   -- if endmod < strtmod then do
+@@ -165,7 +164,7 @@ growCirc !strt !end !oldarr = do
+   -- return newarr
+   ----------------------------------------
+   -- Easier version first:
+-  ----------------------------------------  
++  ----------------------------------------
+   let len   = MV.length oldarr
+       elems = end - strt
+   when dbg $ putStrLn$ "Grow to size "++show (len+len)++", copying over "++show elems
+@@ -176,8 +175,8 @@ growCirc !strt !end !oldarr = do
+ 							    ++" had only initialized "++show elems++" elems: "
+ 							    ++show(strt`mod`(len+len),end`mod`(len+len))))
+   -- Strictly matches what's in the paper:
+-  for_ strt end $ \ind -> do 
+-    x <- getCirc oldarr ind 
++  for_ strt end $ \ind -> do
++    x <- getCirc oldarr ind
+     evaluate x
+     putCirc newarr ind x
+   return $! newarr
+@@ -206,7 +205,7 @@ copyOffset !from !to !iFrom !iTo !len =
+ newQ :: V.Unbox elt => IO (ChaseLevDeque elt)
+ newQ = do
+   -- Arbitrary Knob: We start as size 32 and double from there:
+-  v  <- MV.new 32 
++  v  <- MV.new 32
+   r1 <- newCounter 0
+   r2 <- newCounter 0
+   r3 <- newIORef v
+@@ -217,8 +216,8 @@ nullQ :: ChaseLevDeque elt -> IO Bool
+ nullQ CLD{top,bottom} = do
+   -- This should get a LOWER bound on size at some point in logic time, right?
+   b   <- readCounter bottom
+-  t   <- readCounter top  
+-  let size = b - t  
++  t   <- readCounter top
++  let size = b - t
+   return $! size <= 0
+ 
+ {-# INLINE approxSize #-}
+@@ -226,7 +225,7 @@ nullQ CLD{top,bottom} = do
+ approxSize :: ChaseLevDeque elt -> IO Int
+ approxSize CLD{top,bottom} = do
+   b   <- readCounter bottom
+-  t   <- readCounter top  
++  t   <- readCounter top
+   return $! b - t
+ 
+ {-# INLINE pushL #-}
+@@ -237,12 +236,12 @@ pushL CLD{top,bottom,activeArr} obj = tryit "pushL" $ do
+   b   <- readCounter bottom
+   t   <- readCounter top
+   arr <- readIORef activeArr
+-  let len = MV.length arr 
++  let len = MV.length arr
+       size = b - t
+ 
+ --  when (dbg && size < 0) $ error$ "pushL: INVARIANT BREAKAGE - bottom, top: "++ show (b,t)
+ 
+-  arr' <- if (size >= len - 1) then do 
++  arr' <- if (size >= len - 1) then do
+             arr' <- growCirc t b arr -- Double in size, don't change b/t.
+             -- Only a single thread will do this!:
+ 	    writeIORef activeArr arr'
+@@ -268,7 +267,7 @@ pushL CLD{top,bottom,activeArr} obj = tryit "pushL" $ do
+ tryPopR :: V.Unbox elt => ChaseLevDeque elt -> IO (Maybe elt)
+ tryPopR CLD{top,bottom,activeArr} =  tryit "tryPopR" $ do
+   -- NB. these loads must be ordered, otherwise there is a race
+-  -- between steal and pop.  
++  -- between steal and pop.
+   tt  <- readCounterForCAS top
+   loadLoadBarrier
+   b   <- readCounter bottom
+@@ -277,14 +276,14 @@ tryPopR CLD{top,bottom,activeArr} =  tryit "tryPopR" $ do
+ 
+   let t = peekCTicket tt
+       size = b - t
+-  if size <= 0 then 
++  if size <= 0 then
+     return Nothing
+-   else do 
++   else do
+     obj   <- getCirc  arr t
+     (b,_) <- casCounter top tt (t+1)
+-    if b then 
++    if b then
+       return $! Just obj
+-     else 
++     else
+       return Nothing -- Someone beat us, abort
+ 
+ {-# INLINE tryPopL #-}
+@@ -298,14 +297,14 @@ tryPopL CLD{top,bottom,activeArr} = tryit "tryPopL" $ do
+   -- very important that the following read of q->top does not occur
+   -- before the earlier write to q->bottom.
+   storeLoadBarrier
+-  
++
+   tt   <- readCounterForCAS top
+ --  when (dbg && b < t) $ error$ "tryPopL: INVARIANT BREAKAGE - bottom < top: "++ show (b,t)
+ 
+   let t = peekCTicket tt
+-      size = b - t 
++      size = b - t
+   if size < 0 then do
+-    writeCounter bottom t 
++    writeCounter bottom t
+     return Nothing
+    else do
+     obj <- getCirc arr b
+@@ -315,7 +314,7 @@ tryPopL CLD{top,bottom,activeArr} = tryit "tryPopL" $ do
+       (b,ol) <- casCounter top tt (t+1)
+       writeCounter bottom (t+1)
+       if b then return $! Just obj
+-           else return $  Nothing 
++           else return $  Nothing
+ 
+ ------------------------------------------------------------
+ 
diff --git a/dev-haskell/chell/Manifest b/dev-haskell/chell/Manifest
index 2b9c4f40f88e..71d71a2c5397 100644
--- a/dev-haskell/chell/Manifest
+++ b/dev-haskell/chell/Manifest
@@ -1,3 +1,3 @@
 DIST chell-0.4.0.2.tar.gz 12424 BLAKE2B 2e525ecacd0f703a873b89afce7c62937634021e65a54ce901b4b50e535131e1fb831173e4d2b3d52ff351df09eaa386377052b35c7e70c75028b59c87ee21ab SHA512 050c5818ad2cd954ef79b230de2f03fdfb19e99c8624a24bb7845bb20e3b5d5d427a9623491ffc706c5635f545eb99466bde7a851c4344d11df1a70bfb2bbe22
-EBUILD chell-0.4.0.2.ebuild 1055 BLAKE2B bc98b82885c63df0de8c0eb9ee7c5f6687305b0588026f4a2c705c24caac160ccf37353354baac4affdd9f370da7d82fbaa3af71d9bb9143b82417463cfdeac9 SHA512 b284940ec3c66d6287ce0daed53067cb345e57b2f282a78d104f914ae3b1bc9220c7b3684e31bf4434527227ea29ad7445120b9180a269f58f3ae1b0f2817bf6
+EBUILD chell-0.4.0.2.ebuild 1062 BLAKE2B 3f26ccfc1e5bf0483a66f81a5c02fc7b8866a44e2d280518c1481e751cab9d837f813a1c46a87072e33eb00babef1db38bce85bd243fd5d1013b8cbc9f22e7b8 SHA512 b4b6d0123361672a8a666fd665444a9f28d347ad1c3e2dee636d010943e6b4da1a050f86d0cbfa112979bab456d722f20739d29352e746b1f85d455bc23888d4
 MISC metadata.xml 1349 BLAKE2B d1570863f1780eab05702dcdc650511d6dd8f166ae7ad0721b62ad0cfe58bcb3890c383b6172546f38f7cda96fae4afe7b1062f8857b8bfc9caa80d5542b887e SHA512 99f67e799134b2eb0943bd4b0c5eda392d3c1729999b1b805f8246e1d885a0936413a356c1308c57cd200755883229b964806528bce05c7831320e28a740bdb5
diff --git a/dev-haskell/chell/chell-0.4.0.2.ebuild b/dev-haskell/chell/chell-0.4.0.2.ebuild
index 774e610c9b1d..46414c05d417 100644
--- a/dev-haskell/chell/chell-0.4.0.2.ebuild
+++ b/dev-haskell/chell/chell-0.4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+color-output"
 
 RDEPEND=">=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?]
diff --git a/dev-haskell/cipher-aes/Manifest b/dev-haskell/cipher-aes/Manifest
index 280ec3f826d4..18478cb63808 100644
--- a/dev-haskell/cipher-aes/Manifest
+++ b/dev-haskell/cipher-aes/Manifest
@@ -1,3 +1,3 @@
 DIST cipher-aes-0.2.11.tar.gz 33939 BLAKE2B 98f065baeea41684fe3a59366dba70ffac2f7539710e67648952820e38affb12588b471070def1b4f2bc0c9a6f9ad1155bd22c6182db384cc0349ddb8945a854 SHA512 d0c9b94e93903d0a3ea5587a4ac4ee5124b5189842070dd11c99182ba7396c982aa8c3eae2f8a1fd5b906f8ab3306e4b49ae9276a837e871278d6fe591bbd816
-EBUILD cipher-aes-0.2.11.ebuild 1194 BLAKE2B 4616906639ce581125854f4b803be18240002704fc6bf9c79dc1eca97cdb98899a0aa5f05ed28c481cffc483398deb30ac7a4faeca1a1477d8235fc4d506724f SHA512 9b2d32a913ed3036b7933367afa431258fdc26d608f69ad97067ba675a0981b636db9d274cac8a4798c1b399c693d5faf2ba1237beb0a88b7e71a9a73241ef8d
+EBUILD cipher-aes-0.2.11.ebuild 1201 BLAKE2B 94f70b6c84caab62a29f58d2249b82b9862c2953a776975198e103479e9a3d1aeae2040ee84aeec33fe816b3a0f658b4a79857df2499d290d0be0cb0c5f9dc1b SHA512 c4d0ad639b2a0d01817dfbc1c9c803f9ee2a858c1db310e0093edf726072935512ea60f3c21bf2cfa18a05130071b3f5a86a81a0deee733466c75384eca6e451
 MISC metadata.xml 338 BLAKE2B 2ff556f5b029d834be899840c3e3008f91a49a1b3fd147a93ae05ee4e3853ea9a037b18cd1736d6e0ad06a7f094461ad57aecd570a8960040afafbef78215220 SHA512 3a7ae2f94f3e4736fb77903f0dadadd826e79d6cb8175ba75936536c6273ea48078a8a81694d32ba6f527028eb80040a22b4f9cdd07d125bfc42d490c0bb1b9f
diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
index a529161857d7..002531a02e71 100644
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
+++ b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_aes cpu_flags_x86_ssse3"
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/clientsession/Manifest b/dev-haskell/clientsession/Manifest
index 00d2a866102f..946316089387 100644
--- a/dev-haskell/clientsession/Manifest
+++ b/dev-haskell/clientsession/Manifest
@@ -1,3 +1,3 @@
 DIST clientsession-0.9.1.2.tar.gz 7991 BLAKE2B 368276fbb8356dbb3aefa4705401e1d621bff7c5647be312cff0e6366de0c34478d7a558be1001a5a86d88c0821bb715a414d1bf2c0996426fc3bcedc825c2c5 SHA512 27b44924843363f86b7c27aec1a73e8d74fcf42075cbe45ded4f26d690eb086bac0a4091e66bbdcb431c090aed0ddb64384ca6c555b8ba4c7372f1c42117587a
-EBUILD clientsession-0.9.1.2.ebuild 1187 BLAKE2B 38856a7cbe5bd5cc2df95eb42af1c97ec88e6705119b71ae628aaadeb0ae1818e8f2dafc8ba1a3410decb9926512885c96b402a03875cd975cd16b7730b3aa8e SHA512 cde501f2525ec35d266a8d2978fb194c1951771ea23734ef372852d19b91c91cf6662026060d5e60a46e3102fab12eb0b98b028a86ae6fc224d7ab5f1222f103
+EBUILD clientsession-0.9.1.2.ebuild 1194 BLAKE2B 5623222d4bf995a099c3307d14d96f65a9df54f9128df08fed91f58f0c899eb9616130d66e2d66e62a85082c7e7ac24d0c890e1bb5e6cbb6adfe20af6f72966a SHA512 98ba08259e1bd2a3ace4d65212e5e3dd24fdff43f70ba2a39c07590716d19718ca0c39f30ae937a137f8449bc8cf02ce59ed1c7fdfd79acd5ac442d260cfe65b
 MISC metadata.xml 337 BLAKE2B 2e84860ac64c40a6f18ba5fd47188dd351f701b02292c705173ea49b3a9a28b8aa45786ded75c0676ce8d6afb87dc329b77051d5a520c23d71bbac24e7065f93 SHA512 822c891782c99df45b94c9dddfa8e6dc82c3c9268527726d41ad9669afca62c4f369c2579e678e9649184906642972ac85892debee32a5f05e32b7c1e15b41aa
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
index d7eda1465937..1ef70f17fb8c 100644
--- a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
+++ b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
diff --git a/dev-haskell/conduit-combinators/Manifest b/dev-haskell/conduit-combinators/Manifest
index ab9ca2e64d17..15673ddc867f 100644
--- a/dev-haskell/conduit-combinators/Manifest
+++ b/dev-haskell/conduit-combinators/Manifest
@@ -1,3 +1,3 @@
 DIST conduit-combinators-1.3.0.tar.gz 2204 BLAKE2B 4d3c7783f00a90a45e2e5947c523792a67cf234d12232c3abcf865df4647d0767b27516430704792f2f6393e61fc4c4513346d390774b8b3eeb2d05b494a4d3e SHA512 b994c73f0a9c0d017831125f2dbde406d6ff1b51b0f37079e8292ff1747c9718c28cceba708b3451136a384504db1d1275e01ce0335cf1e726edd69d90a206b7
-EBUILD conduit-combinators-1.3.0.ebuild 688 BLAKE2B d38f3c3e781a50da790b7c654eb3a36c158e6ef6c1a276cab8759ac9535fee736a1f739f95b939c744c268bbeccf9e7e83039c777349d10fa8dd50aa9f575441 SHA512 a2b7d465fa53b09e78bd45cea379c9b53ef185c747dab3f70a4fef255d60349d5354c7e1c1b9cbee9e3ebfd4da61b7bffde17e668910953d9e00cfbb0e1b8fbd
+EBUILD conduit-combinators-1.3.0.ebuild 695 BLAKE2B 5f240abd352c3d9f27293bddab7b375d1b122fd48ad93512ef74867b62c1aea33d9e6e9c6bb4b3726388b2021d141039cb929479a646130b07d36e7710ad1327 SHA512 b6813818a187cbc38f829d42b4b0ca70ded7db4e112b900e4854e6ccc0bde11440ca8cfef99faa19b93aee3d69401d3d8f940573d71dc3d2c4d9c00e844c725a
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
index d0673fa1d0ee..0c07c7981ea3 100644
--- a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
+++ b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-8.0.1:=
diff --git a/dev-haskell/constraints/Manifest b/dev-haskell/constraints/Manifest
index bde1effc0381..7ed286567239 100644
--- a/dev-haskell/constraints/Manifest
+++ b/dev-haskell/constraints/Manifest
@@ -1,5 +1,3 @@
-DIST constraints-0.11.2.tar.gz 20611 BLAKE2B f87bd7dc91162e4fda24f6676c1ebf9d152364a2b547a8edc968413e0e986ce3c0d392f0794d7fe7d54cad05e3dad68b3eae1764556b0d3cc5c67700008b2ad0 SHA512 ebca93d8ded8ea6ef75ad17906cc4d1bd8629c2b38691caf6bfc01f5d041db2b8ebe1436ad97ddfc7f3fd1b0067e0b3530125d58a5aeb3e395c5acf8f5741fed
 DIST constraints-0.13.3.tar.gz 21574 BLAKE2B 444015cbf61b6e017b08339558c2c0a0ed26157b15d64621deec0e564fb97cff5e246acafc8e75917d21c0865805c96adc5c4f8f8aea3978cd6f6707a3fda62c SHA512 c592d1b60c5606c6dbd883b8acc9e2b68addfc71d28a6df184fb3739791759fdf1d8f0ed243acd694d54a6d9bfac8271ddac2e72e4dbfcb9a8622c2178999472
-EBUILD constraints-0.11.2.ebuild 985 BLAKE2B 37ecf837e07b0beddc6b988853e78d01eb7394593a42f0c70c49f4bbbddeafe1d51fe756f0ddb9695a07ec8894cc9bbcc3c41bb52e5a941a8782e52ad5ba91f6 SHA512 5cfd130337fd58d874ef6e77b70888335292e4c61db4f6d513e27e098833965f3e8594707a4f46f097212f959f96e58de9eeb6edd6c29b4a271803071b655511
 EBUILD constraints-0.13.3.ebuild 836 BLAKE2B 7bf9cf676cdce9dfbd170d84893e0f3afec2bb43749fae0f957fb944b1cdc79a0178ff366c6f9d5b50835a2131fb29dc6ba1d738df57ad0afc3905f7310d7306 SHA512 fd3bff8cd0f067cb6338fa5fdbb02d4d2960526c37c5fd6091915d85a36f49478e2d3082bd307320afc6184d406928e888e9b2e21579fde22b4479d63596364b
 MISC metadata.xml 333 BLAKE2B 1bf8780abb7d2ddbcfffa247770dbd25b67b0471bc127c174b23bd8e7b662f02973c1bc3adbc47304da8b94f56414defab2b9ec6c4e20e7cc87f83037abef57c SHA512 b9ce2af3ce78525ef434ba093244c31a935ea2be5f0652e7564a4e2b991bf406dfaff97db546a1eaba3e416011099d8bb396c1eeeac6d3cd498680e72aa95709
diff --git a/dev-haskell/constraints/constraints-0.11.2.ebuild b/dev-haskell/constraints/constraints-0.11.2.ebuild
deleted file mode 100644
index 3f327d93f4a9..000000000000
--- a/dev-haskell/constraints/constraints-0.11.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Constraint manipulation"
-HOMEPAGE="https://github.com/ekmett/constraints/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2 )
-"
diff --git a/dev-haskell/contravariant-extras/Manifest b/dev-haskell/contravariant-extras/Manifest
index 19ec7a037b4f..9686ddc36820 100644
--- a/dev-haskell/contravariant-extras/Manifest
+++ b/dev-haskell/contravariant-extras/Manifest
@@ -1,3 +1,3 @@
 DIST contravariant-extras-0.3.5.2.tar.gz 5426 BLAKE2B 152271da74a36054c641a31e49ddad866b2eeab0bf732d0ba94a1af2fa98e59f8cdfa8f5c6c280ede7bc222934c61efca44f7e97a9f3c585e1bfdc12f3941a29 SHA512 79b9be33cd173320f0aee1e764bd667a97e104a03653ec671d9a5fb767deb49163baa40fb331e79324a2ac1cdc5eb1aa565ac1f7d7414dbc1424b0778d34efca
-EBUILD contravariant-extras-0.3.5.2.ebuild 767 BLAKE2B c1c0aaa7fec9d92f88925c84ad721802fa9c03568360bc9bf6bf147ff148e8a088b1b29645d4521b991a1729f350638da6b4f6e724e6d731fc6bab24b70e2ebe SHA512 59551b43495a5ca5132476b851c464f4575441b66ef3b7ed55e9a41c442f1c90413a46e6394382ceb07e3363c9ab5c327499a4017e42e7da83d4e6537f7309f9
+EBUILD contravariant-extras-0.3.5.2.ebuild 774 BLAKE2B 4dc12f9ed1b32dff4407138f931fa7f09719b0d41d9f85d20232109cb4d925f6eb41803277843b499f856ac32fbbb0233707fd724fbac5d91e80fae7a9864a4a SHA512 715be820a3f435a2fddbc7500b5a1405862a05f3207e0f0c499addaa60acc52f9337d8bfc5e0d8d7bfa05226a9c7af73ffcbe7552a848540f447dbc06c79f215
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
index 7e81e8fd31d3..4a3d4eaa7523 100644
--- a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
+++ b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
diff --git a/dev-haskell/cprng-aes/Manifest b/dev-haskell/cprng-aes/Manifest
index 2be6d111e4b8..dc4ef7fa2f3b 100644
--- a/dev-haskell/cprng-aes/Manifest
+++ b/dev-haskell/cprng-aes/Manifest
@@ -1,3 +1,3 @@
 DIST cprng-aes-0.6.1.tar.gz 4396 BLAKE2B 813773cb6185974e6c3250ce744abbe4ea5dbfa4725320736563fdea6446f246b704e2825e2f8612d35dddb01424cea93ad24a05764713d09d25cfe5afcaeaa7 SHA512 839a3a449edf996b0061a989058ed59625d8a849e852217c047b9d9b59b58504c0efaca699f75beea3ebcad8284f55c1f53b523dbebb10f56e705506bfccb5f5
-EBUILD cprng-aes-0.6.1.ebuild 776 BLAKE2B b33706da22a498e946bbb2ed2471601a61041d232dabe2265b65a4ef99c1d6c3fad1a8a046a7e74f8d2e05506f9539cd14fec1475df1520f58f755171c2df479 SHA512 88f9fa82dd247e628f4dbafa28f35d2916965918ae7d493ba9c4692ef31e33a7a9a48c2c3d4cb144190ed07f57ca8ff6066389eaf02cc1128fe256897f2212e0
+EBUILD cprng-aes-0.6.1.ebuild 783 BLAKE2B 9adc185ac09eb532ee48199b4556b5750101f77e9fce9570756b0b87b2fd6eb70d2d377a3ea0391aade0a7edc12a519c642f990c90c627446306cf8d97d17e55 SHA512 0946d987bdd7d209b5ba9fce6868975f1a63b7cf895e27193b11f39dbf07c0795a072eecd2f0f3c92fc42c09e691eae30c8a0df27b326f4ded4107dbb5d8490f
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
index 4d824d9ab9a5..d49fb2021587 100644
--- a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
+++ b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/criterion-measurement/Manifest b/dev-haskell/criterion-measurement/Manifest
index fa0eb08daf39..18380a6ed432 100644
--- a/dev-haskell/criterion-measurement/Manifest
+++ b/dev-haskell/criterion-measurement/Manifest
@@ -1,3 +1,3 @@
 DIST criterion-measurement-0.1.2.0.tar.gz 16650 BLAKE2B ec4379e6ea016d23e5ee4b0c61404421bf3ba207ecc29063e426f136e1a56ef93a5c5e6f404f17796088e773ab9c4a0e971a587977c57d8ecd3edf33ba72b23d SHA512 d82196d0b4a501795e8f3498b17db89c5febf6cfd2131da262aacc7b268248bb21c7d4e6530789a40a47c4e74e28e34ab5ff3477b2e28f54ddafd01e7cd5993a
-EBUILD criterion-measurement-0.1.2.0.ebuild 762 BLAKE2B 1a96d0b61c2ab9e31259ead654ae766aae8812755c0869631d6d7c2010c1fbd3ae8d5b985ac2be7d37cf52cf80642cf5584d3b5394a99de3e8089a1b6dbd8da0 SHA512 a2b0b61f5a4e13722a6d2d2500514bacffbcea9043aecb351f8a87dba100007cf333c1627a9e55ac4ae4a76ed5301781122e51fef9db471a547820971690be1b
+EBUILD criterion-measurement-0.1.2.0.ebuild 769 BLAKE2B ba2e08e9b9d8a331af0a88f41d1a80e5c7f5b18be2afef49de15a758460b5c561a220782f692c8ea9d6cea0b47c2b0de82ba405779c04d04f5daff0cc0292c2c SHA512 c759803427370fb9626b65088c4dce07d7d90dc473d5e1724d544f5e24c7225e4dac193ebef3bcddf0da9aa20e0fa07547e3ccc98418fed378ef3c33ee5d8884
 MISC metadata.xml 447 BLAKE2B 350f7a8c301c4c052c64f9d73716b850eb451196b5c19808752b7253c09c599d9ab2b4a6bd90c14e089132e75c886f5fdc74b8341e9d17fb64b84e03dc35f15f SHA512 b4c54525cc7449ffc66f1975896dcf79fc87486e20d73348e2479313af31fe5f5c2362f7ba5745e5177bc69045b0d8cc9741cf1587a178fc26116e6e3ed3949b
diff --git a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
index 3c10a5145290..517e3c659fd6 100644
--- a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
+++ b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
diff --git a/dev-haskell/criterion/Manifest b/dev-haskell/criterion/Manifest
index 3460ddbb1109..26eba79e29ea 100644
--- a/dev-haskell/criterion/Manifest
+++ b/dev-haskell/criterion/Manifest
@@ -1,3 +1,3 @@
-DIST criterion-1.5.6.2.tar.gz 120212 BLAKE2B cd21eb95013eb4eb80ecbf13cdd599efc6f08e26522ed876fda54b97744a75330fbf2bfff8b626feadb2627d0445749aea0d6412ff5d901a922433a88b952ee8 SHA512 48e4c0803480fa21830342ff7fd016e15de1b598fb8c4541710c6a9d81e4919bfcb22bc5fbd1ac417e79df902f1154f20aa3e3081efcf6a9af872f00142c3af0
-EBUILD criterion-1.5.6.2.ebuild 2238 BLAKE2B adc4b745f8abf0aaed7ac65384a3eb097cc7d800c2642b39860bb8322ced6a9b118fdb46e860a7239a4b1b3a210d51f82ed2661075710dbed034ce79666c612c SHA512 943e3a5bd1a2e2436ab998a6a84b5fad13647216ef52315d00bf7567ff23c50bab9b771ec8d282046e1fb7b21ae632eb39412123415ccedddac2b12f9b7eaf50
+DIST criterion-1.5.11.0.tar.gz 46082 BLAKE2B 8cca7ce2d7257cbf471efc1a5c00dcacfb26fe1ff1d5badf1544b2018a33aca43585f7c3afd3e661b67ee443ee424a897a5aa9ac0f653ae37ed2682eb784e558 SHA512 6efc1c59ebe2ca1c03e83174aa6cb742d8070c3c69d4a071187ff6a3abe09b42ba329dba09283fd483b75a6b4e61840af3596d0ab14648f86887cdd44e1480ce
+EBUILD criterion-1.5.11.0.ebuild 2184 BLAKE2B 19b3ee732e15fd3c7aa345f3245b5a662c6c0b7d77adc248fa64fa9f69959e02566e41e82b544121f3781c02fdd471948ab72b67b878a521f7c4c205d4927736 SHA512 1fdeabe334953d84a8fb4e9bdf82024137fd1853fa6a43067fc288daf2cb0e9efcf5a25ff5b9d7010547925dbe76e7f496d4306a3d1d736ce426eedca31bae63
 MISC metadata.xml 874 BLAKE2B 2d032f0236b0d7f51282a48aceed14bce0ce9e7446872900580de9c50872c90e18a893586edb3b6e3d431fd7759911647025c1337dcec54d1ea0d587b6dfaa68 SHA512 dc3eed01be3a80bc0ebb8d3237df410c0009e83f55be1ba2e807ee2db9e85c4395beffc5888228357b88d22085a62ec6487ed51f26ec45dfab2264bc75f1a62f
diff --git a/dev-haskell/criterion/criterion-1.5.6.2.ebuild b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
index 23f8a110dba2..cb757d41cd02 100644
--- a/dev-haskell/criterion/criterion-1.5.6.2.ebuild
+++ b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
@@ -1,51 +1,48 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.9999
 #hackport: flags: -fast
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
+HOMEPAGE="https://www.serpentine.com/criterion"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="embed-data-files"
 
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+RDEPEND=">=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
 	>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
-	>=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
+	>=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?]
 	>=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
 	>=dev-haskell/cassava-0.3.0.0:=[profile?]
 	dev-haskell/code-page:=[profile?]
 	>=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?]
 	>=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/glob-0.7.2:=[profile?]
-	dev-haskell/js-flot:=[profile?]
-	dev-haskell/js-jquery:=[profile?]
+	>=dev-haskell/js-chart-2.9.4:=[profile?] <dev-haskell/js-chart-3:=[profile?]
 	>=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?]
 	>=dev-haskell/mtl-2:=[profile?]
 	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
 	>=dev-haskell/optparse-applicative-0.13:=[profile?]
 	>=dev-haskell/parsec-3.1.0:=[profile?]
-	dev-haskell/semigroups:=[profile?]
 	>=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?]
 	>=dev-haskell/text-0.11:=[profile?]
 	>=dev-haskell/transformers-compat-0.6.4:=[profile?]
 	>=dev-haskell/vector-0.7.1:=[profile?]
 	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 	embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( dev-haskell/base-compat
 		dev-haskell/hunit
 		>=dev-haskell/quickcheck-2.4
diff --git a/dev-haskell/crypto-api-tests/Manifest b/dev-haskell/crypto-api-tests/Manifest
index 145a7247a47d..e80ed6ddfafe 100644
--- a/dev-haskell/crypto-api-tests/Manifest
+++ b/dev-haskell/crypto-api-tests/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-api-tests-0.3.tar.gz 3635597 BLAKE2B 0b13730ef105217068e8ffbe237dbe727e3ae09aefa4d0c021877010371024c5796e6959ad788edc5c213faf55e69cd5eea9d55023f48cb96f263ceeeb6e4500 SHA512 4d9dfd52dc67279a712bd444972faa6650d987c8f65fb41178e5c6523a7260c0e2df8f44bc511ffa217b6d71c5ec41ab11a0466a326c9133f7e20c01c37404d5
-EBUILD crypto-api-tests-0.3-r1.ebuild 862 BLAKE2B 2954986b4ebdb59c089458ccca4e9da599129d4357791cb663b18b9f3a9f6372299f3016cfebcdd7e3401c3422fd0db7bf4f1c3d7d9437b9d92d9ebbc6dd16e2 SHA512 35b815aca00b4d718a102e55a42b0bda0a7e64377a3aed804f6796ff85ec8504967d936fcf6623aa086cde3b70b34de911b21dce45e64db8715d837df0ece7cf
+EBUILD crypto-api-tests-0.3-r1.ebuild 869 BLAKE2B 1b86297e55c56254001bd0b2f4ef1e0bd1c9137d751d8a4119bb978e523cccd7849c1665ae7972fd96fe0333156eb56bc20e6d672d621c76d21a64036341a6d3 SHA512 3d40a110d1186750e4f5e6b761f3257c516decdb38d350d7dca985d9e51f1fb8b408fa7597065b7572c363cdd941bc64891aa987c1c7ec9e2f2a9a1d0f2ed1bc
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild b/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
index 3a97aada6a03..affc29759323 100644
--- a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
+++ b/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/cereal:=[profile?]
diff --git a/dev-haskell/crypto-api/Manifest b/dev-haskell/crypto-api/Manifest
index 7c521e6eacb9..bf3ca1a0f2c8 100644
--- a/dev-haskell/crypto-api/Manifest
+++ b/dev-haskell/crypto-api/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-api-0.13.3.tar.gz 48346 BLAKE2B eeec2644fe43218c8e647bd84e3fad31079cb560cb25a078853ae40cb8be617a05fcc55ca844811f1356d8f5a8088583497d79e38f808d12af4695bc05bba7d0 SHA512 1228fe857e235a0d5692916507a42e622f9769325ae9a6a7828270dcb64fe38cc094eec3fc8cad2f28b01bd8de98b1dc637a17aab1db1568a82cb91ebc65c382
-EBUILD crypto-api-0.13.3.ebuild 761 BLAKE2B 678ff18995ec520858ff94ff54c7a8cb3aed354b45bde7345d240486a83d598f089544c68b059b6165817d6780a544c73d7fdd58dd29e7f82bc10c1681c665ac SHA512 abc25848ae24e8e6dd208771ac1144955ab22ab6a452ea0c2fb273c397ed884a96249988d752ab961a6d6ba57601b171661e3b57ff54f2fcd0c8c9cb29c5b287
+EBUILD crypto-api-0.13.3.ebuild 768 BLAKE2B 788ac26a5901784d1c5d7637a9b10a9331ac52eab0e5b18acb2a6e5cc5b0d0853e0cae5081f5bf74f40b8162c58badc7effba06a34123acf2c0eeba3d3efe83c SHA512 31a98d9ed7a1bd52c570c87a5960c38e1c1156e31073f65c8044f8c2123a5442f121e5d99727ef6f1e188e7e8704e5ee8507b330d060a2153089c13545574e58
 MISC metadata.xml 855 BLAKE2B 3ba03ed1ab2ee220afbe3521c047761a160c82a8c78cda01d24d93a88ebc1e5836945564fe9cc5030a13b9ee4e110c8667cdc2e3075274389fd62d5c00f9f20c SHA512 d2c1fda37ec84c96c849caae75d627e9b8db2d671844467269d4f9cbb81149dd240645a6694ca544a5d1ffd6edf2490e9a96623cab6e3b574638d63bcc35decc
diff --git a/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
index 4b61011d2c68..43794ddac914 100644
--- a/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
+++ b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="all-cpolys"
 
 RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
diff --git a/dev-haskell/crypto-cipher-tests/Manifest b/dev-haskell/crypto-cipher-tests/Manifest
index a9dce81955c5..f2da035101f5 100644
--- a/dev-haskell/crypto-cipher-tests/Manifest
+++ b/dev-haskell/crypto-cipher-tests/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-cipher-tests-0.0.11.tar.gz 6183 BLAKE2B 6899bfff8cc9654656becb1ec21a7c3792a9b50141858ccc5678050daaec1f195ea5b9826cbb85e127f0e0c3236bb9dad94280a2c49732966453b1c0832b2d33 SHA512 cc8361517e6c2afed1585e7648ed1143e8b4224918fbd8191a970d0afe2a162b759e8e6aee49308a93bdfe0d4d15e2bfb587d4e9f6891766f8e834822553b853
-EBUILD crypto-cipher-tests-0.0.11-r1.ebuild 1056 BLAKE2B 6d2b3554d5942726fa88a2fabce6bf04ce08d2411672646ddf9b05cb5102b89ed0622f09901fd03bb04940e1dec0ea7692b1fa2349de3553a1bc185328c21e98 SHA512 e6b6ed4da1f504be22631b767ee8faaf0b992e6dec80be6d572788d8c389448ceacabfdb66b566eb782d68afaf5bbd42d10884c91925ad01bbe512e110f0fec3
+EBUILD crypto-cipher-tests-0.0.11-r1.ebuild 1063 BLAKE2B 6cd29593c4ff43e33ddcdc02b7e27d1d187b2d0de3166564d61ace9273fcbcf7ef0ae669f95b850142db46c242f8dc804a03fe28b88f9e59e440206823176e1c SHA512 ada11af3696f82985b39b028a53419c0568ddcf2334eda1ef98427583854b7b1bf03a9d89938e601933063b4ffb31da6659943a4c7c51dca15e608422bce9bed
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
index d693d59019f7..c1a0531637b4 100644
--- a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
+++ b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
diff --git a/dev-haskell/crypto-cipher-types/Manifest b/dev-haskell/crypto-cipher-types/Manifest
index 28d4842fbf08..a9227d89a041 100644
--- a/dev-haskell/crypto-cipher-types/Manifest
+++ b/dev-haskell/crypto-cipher-types/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-cipher-types-0.0.9.tar.gz 8073 BLAKE2B 80f5349e31f04b591509382b6c475f0f65095b50646dd5cd785c037eb9be8193a011f060beeee42a37586ccaf69122804124fbb77ef46f894ed985d573481c93 SHA512 9b369dfbe1baa918f8b72dca0a6637634582629ccd46226a3a89813f42cca1e11ee738e1053503a6bc2863c04dd885083e6a09a5bda5a52dbf381e9f133e24cc
-EBUILD crypto-cipher-types-0.0.9.ebuild 627 BLAKE2B 29d7a5b93d44f0b3dfbd3bc7572f18cf6014a97d311fe712cc0809a55ff71a4bf129701348b3a50f7f908cfa82a51aa321d44042004a0ca5e267e2810c448116 SHA512 724240082e0dac08d62c98267e935d8664b522746f552d96595cbe2ab7b0e1403399770475a1f323079a49fa8bf821279eccbcda32792fdc7dda647c3ab4afc4
+EBUILD crypto-cipher-types-0.0.9.ebuild 634 BLAKE2B c681f7fdfd86973a4ed23bbfa70fb4afa9b95aeae37fb3d59ef463e43c12b58b4a2c861b0759532fd816ec2a60f71b8c805a2f3d9e141352853765409a3a7a46 SHA512 d396308eda26696a9f6d8378d83b53acf13b2c810468f2188691aa02f643a13638ee15af62b7cb5e91a18663f4314bb3d834e244a07e514d16a92cc4a34e901b
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
index c1aa468bbc5c..c3896581b898 100644
--- a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
+++ b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/crypto-random/Manifest b/dev-haskell/crypto-random/Manifest
index f7f5a2556c55..e402b3f68d8b 100644
--- a/dev-haskell/crypto-random/Manifest
+++ b/dev-haskell/crypto-random/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-random-0.0.9.tar.gz 9256 BLAKE2B f9433a75c7285e92feda4f5d3db165c0f530d59ab95f733755c138bfaa162b0948b84ca912dbf26fc80b06d5cee7670361defa308d1ea5926a0e1cd385d39976 SHA512 07e298e2e3846b48330af92a46ab8550982ad74f6154c59a531762d9282f6712c1e867a48ed6cf4d967f463f52c1af4287a74552aeff0635480ea21cd54a7a24
-EBUILD crypto-random-0.0.9.ebuild 623 BLAKE2B 88dcb3f80fd6153ccdc8df3d5b89aebcba11289e252d9a0c392a06196e59d31ed8a5e12a117b395b8c31e0b4dd8afb92fc936b9aeded6aa42908ca8645068960 SHA512 1f38cc0a02b6d9e8eb88efd67117c3de02f243c9ce566d86223c3843c43637b1ee3c8dbdd0841b0c974c86f3c1513bacb8075f4fff6c6f7f636ee71111a24b42
+EBUILD crypto-random-0.0.9.ebuild 630 BLAKE2B 9beeb5b338bf7142210eba9bcd9566b6060295460f24f9e2d4a0be9da2294ea39050fe687bd8cf4f837296a8176dbaf2150a8c67b650cc2b662fc7a644b9cb2c SHA512 bf73f05a0688c5d6c627fac27174af6b8b4349011ba4118b9562709eb6cf9ba6439f02743daa031cf675e8f0a0b72787c52a649de123e66bfcdbf4a5231035d0
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
index 2e6583961759..5903c4b128c8 100644
--- a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
+++ b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/securemem:=[profile?]
diff --git a/dev-haskell/cryptohash-md5/Manifest b/dev-haskell/cryptohash-md5/Manifest
index fa244db9d289..2b205c9c6d58 100644
--- a/dev-haskell/cryptohash-md5/Manifest
+++ b/dev-haskell/cryptohash-md5/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-md5-0.11.100.1.tar.gz 10472 BLAKE2B cc7c99922b05c8df11a7253e6c0dd3ab1399ff739548280fa762b01c507e6d620ab51ccf6c6e791572ae432448118356d1b8879767f4ca245ae59e0daaed2058 SHA512 f2efb197005ed5f12a7c2be490a64a83186cacb34eaedec6cbd76e52c30221733da1d31201c5209538226508db760fd9eed0afc8d72643e1509b32c7287cb12e
-EBUILD cryptohash-md5-0.11.100.1.ebuild 1083 BLAKE2B 918253c70fc30f6c06f7bdd279587d4446867e993fa9521eb0150b7351bc6e87d5f89065db753560d6d94b267a094e766f6f2abf59f6b9646203398195f9ee0e SHA512 cec01f14c043af5af8bfe76ff48e9dacea537bef6427a9c32eeacb93d16599a9711417d45840fff906cd4d0905e1e93644d2213d6d4d1264d53ccf7fd5e33505
+EBUILD cryptohash-md5-0.11.100.1.ebuild 1090 BLAKE2B 8e1ec6fbf964988b477c7450af4bf2ece53dd76c69b1e89b41ee8b3d6207fa19c6df510dcfa7492cfc6e34f03fb0307909b9dd7acd24ee1358f409dbbeb7f954 SHA512 df0fa19470fa3eecd960b0339315a24ec7d4132657dba53d09c88f43af401ed61786eb7cf25fc86269d7a2f1184060eb4760285c793405de6e29f710dac6ab01
 MISC metadata.xml 1123 BLAKE2B ea559990eb17116faeb48fe0653519788871ff41cd07c58da000e5fb19467e31ce57af534128e5076c9f86ae086df8ba5ccb6f3da31121aa9b3f55947cc03b5f SHA512 3cef982837f754c6a999397ddad14e3be744cb7f9ae0cc0ff2224fca87f7b3054d9252bf8d9382e2d299dad054a3c6d487920e2ddbb4b246a57015b4f8d29517
diff --git a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
index dec386faa85a..f17fd537dfdb 100644
--- a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
+++ b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cryptohash-sha1/Manifest b/dev-haskell/cryptohash-sha1/Manifest
index 2df491694678..dee0cc3b70f3 100644
--- a/dev-haskell/cryptohash-sha1/Manifest
+++ b/dev-haskell/cryptohash-sha1/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-sha1-0.11.100.1.tar.gz 10198 BLAKE2B 5d9835feeb43a80c83de0e390d59efc908fd538ed4146ace4eb0cd67392503cf414a2324968e8249f2b506978348caa6e92c70e82c52eaa7ac14e3956388f05e SHA512 e3528c70501ffaf4649adc0fe120a0b333329761fa66505083269afa67828c16695fd91567035adef0b77915df47a6bcc99d2d90f0ecb26eda583829261cb1bc
-EBUILD cryptohash-sha1-0.11.100.1.ebuild 1078 BLAKE2B 8082e01c6f14c520b8eb81ae6da521c36bb4e3870407a969cb9499859147c94f97d6891317c2d1ba70223bf77b06853234a679ed265cdadf9223ed9264bc77c1 SHA512 fced01e037f78f45ad80f98e71dd147f03ac68363b919cc0d48341ba91d316ebb48d5cc7944a39cbc0db898c494c5d499e155e45dfc4a94f859434d11dc70f68
+EBUILD cryptohash-sha1-0.11.100.1.ebuild 1085 BLAKE2B 3934a6183e46d60404bc6f05f283616f96007ea004f249b5a0d6468e9962d46649a4d29c06131a7099e92a319508351a051eb34049615c373766f9273480e542 SHA512 e82146a223e215995fcf0e9d83fc3728e2b21ecb32a223ef27994312cf4712ba520a21501a99b6e16d2b81e37035c736af99e3087e340387883602af62ff7a58
 MISC metadata.xml 1129 BLAKE2B 9c1e7012aeda8c9fdc260d5f58164e1e946d00cbe557d059a14485f716fe22a46d4287bbae7eeb16eeab19e3c814104ac5b791fba7eb0404d50fcf5b3543380c SHA512 f61055b57f89cd65aa6965096f2821e9c7b3d4fbb1273598b03b08fafecccee08b951c2776d7588009dc25ea1b396b34e90119ca48dfdfc35532e8d591f890eb
diff --git a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
index 52cc584727a8..e4f329426a04 100644
--- a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
+++ b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cryptohash-sha256/Manifest b/dev-haskell/cryptohash-sha256/Manifest
index 3a526798ce44..1ec1bf4a0551 100644
--- a/dev-haskell/cryptohash-sha256/Manifest
+++ b/dev-haskell/cryptohash-sha256/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-sha256-0.11.101.0.tar.gz 14996 BLAKE2B 9caccc3eea4ad25c6ebbdd507771d86264a853f282d03399917b42a5311dcad0501bd0b4ea6fa00d039f67bcea3f81c116b9ec016d65cb2ed6f086b0448894c0 SHA512 c755f1354fb5f1d6cfb54f73e39692392517954118d98b39ac4be7460e75a9ddc91ad641fed0f17e5fa33b62b7b0734af66526ea757e00716832572bb383c612
-EBUILD cryptohash-sha256-0.11.101.0.ebuild 1171 BLAKE2B 9e14d302c996411153cb8f08481f9e9353636a1ac2360055d4108693549100457796c217dbeedfb38a5b63b0bee65f3f3e90152061c425bb738c9567550f288a SHA512 9bcd79d2dd30a8cf9ab2f5c75bc54084457605879db3b2e14da785ffafe1adedafea8909922c4bd51d1c94f4f7910f3b650341cd7f172182ec29605aa67bc877
+EBUILD cryptohash-sha256-0.11.101.0.ebuild 1178 BLAKE2B 23bf90cc2068ca26656c9be05cf7bfdd72ffc06dddc6530163677b5db07698dca21b728b516e00df568cf3acdfe821e1ad04e2abcceeaae4dd7430b415239577 SHA512 85558640f6c47c29a0bca8878e6d49cea6ad801865a63177c310e23c8b4a792aa7655d834d0610a601d86914192d0a8da7f39289be7d887045f7a2d63c9a313c
 MISC metadata.xml 1143 BLAKE2B f5ab4eab042b822fad8da67002f89848d0f808f41f6837f0f0c678e8733e1c8d8d268933bec154a5aa3af3326ad5b7f40084dbf2c9113eb0f30f31cf972043da SHA512 79adea74eeceb7d7be48f8c002edf3b056c23a2ab01121decd48559b09e4eea4d8324021a313bc35f7919db2b36deda2d8e7fbed01243ef452f48f5059d208f9
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
index f509f41b5d4e..5e9200585fda 100644
--- a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
+++ b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cryptonite-conduit/Manifest b/dev-haskell/cryptonite-conduit/Manifest
index dc1cdf08ab02..197af5a67a7c 100644
--- a/dev-haskell/cryptonite-conduit/Manifest
+++ b/dev-haskell/cryptonite-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST cryptonite-conduit-0.2.2.tar.gz 5405 BLAKE2B a2565d0d15863159dbb001584ec9e87eebe69b617efd6d18ab9c8d2ff81ae9e1fa26488f6e0bdeb07c3247aed8c63d0d4fa1376240b0ddcb54cd4a619d053a4e SHA512 5a313d1ff64992fc8f45ebf06f5f439aa5dfe745ce6f2bfc31b3ee06b489b0a145a9e6b5cf00fb557ddbebf1aa5c226dc0add9c591f62a06bd6f8776cf52dbdf
-EBUILD cryptonite-conduit-0.2.2.ebuild 919 BLAKE2B 320172632aa8a556ce023e9e016146d3b21d629a37f0663b344b7714fdb9f4ea2c974418fa6be588dc16d7f2b297be905e176ee434a461af7688ed5cbfcafa9d SHA512 244e2cb2a4aee9876ed433046b99538e5b37e2ae409f93d85b3ebf29c1bbb0c7394572073fca3487250642952518e8909620f0afa9aaebe352b122d260845630
+EBUILD cryptonite-conduit-0.2.2.ebuild 926 BLAKE2B 3008e57e951560e3d4b51c1409cf621a30f5ac2190c9706e24a823d2aa3a7ed772fd63320e320b881468848d9bcd5c0e8b52da6cf527062ee451661c2cdb152c SHA512 bdae830db449ef5331902511c8d3872c944e145be548c8d0495f35a19b299b7f2f88898f6f18f99c6342725021208301eca6f5c4be46f20aacffb900eff7df60
 MISC metadata.xml 478 BLAKE2B f4118ad76a667b298669f5d325b03142e0a48e66de1839606f87557693c14ae0c085bbcba50615566068aeeedc59bc3be822aabac1f5d0c1daa509030859bb70 SHA512 8a5944dc50772611752cc3baae87ebee6db7c33a2ccf23ff0cab99ff04de97c6485f485490fb71189e273684daf525680a828e5daf39de0affa877f6aed6f008
diff --git a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
index 049b3930c32f..f7ad993fe5ce 100644
--- a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
+++ b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # test suite fails to build
diff --git a/dev-haskell/css-text/Manifest b/dev-haskell/css-text/Manifest
index 20688e4852ba..2e2d2551e666 100644
--- a/dev-haskell/css-text/Manifest
+++ b/dev-haskell/css-text/Manifest
@@ -1,3 +1,3 @@
 DIST css-text-0.1.3.0.tar.gz 4594 BLAKE2B 0ea86030b7e2a8f015bcc1a122e325948570baa3f72b961ca13d731c8a464ab06360eb451ca826175c73288d2eb4b51715c674151f2f3aaf1750ac2155e451ee SHA512 2f7b4fc758e3e6da7dadbaf48c9174770de8230ef4578d9fda610ca9b7a4ad497284623e382bf55111ddc852550275415f58311a2e726721f050d9f704050628
-EBUILD css-text-0.1.3.0.ebuild 788 BLAKE2B 907072cef80e31c34d3c48a9cd9b2cb113cc61e05d90517ffa33191ff3ec08cb74bf1e4423fcfa4dde920170441d924ca414057f82235338ff78affea45ce851 SHA512 848529409c244d491a28c1bc02a18f83afd7844e64dd3e8bf4a9ab81b20538a056a1d319014e8efbec4c44a9ea1ca41a55fc85b7a71ab1aa4af0b99d27719360
+EBUILD css-text-0.1.3.0.ebuild 795 BLAKE2B b9c6b14dd0d2ab445a2582b0814b6b2c20c6f84853812edf0ea88f4d7930d2b3b0aa57f272d7e6a38c2d08eedfcb10498b1418ec34f6258bfb6186edac60c6e9 SHA512 dc6f8f4fc096d8c5e8302ad3ac04a7b53ce8805328a329890760ac004c5d9a7eb359f4da8ccaba42453718193211353c115dadbd5b4d21229d9f61710a49bb35
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/css-text/css-text-0.1.3.0.ebuild b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
index e521e1877908..877401d2811d 100644
--- a/dev-haskell/css-text/css-text-0.1.3.0.ebuild
+++ b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # fails test, not sure if it's severe
diff --git a/dev-haskell/dav/Manifest b/dev-haskell/dav/Manifest
index 643cc9c0e967..7169f7cfa680 100644
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@@ -1,3 +1,3 @@
 DIST DAV-1.3.4.tar.gz 19884 BLAKE2B 84993b24cb4db897c76c964e8600bb3f882523792545e8d22468a7e435d53a2a2f05716595d73df3ec3f05f3e30a9d56c31bb446fc28e00126b5a853486c9206 SHA512 95bb567488bed2fef3813597ea9c080781bbc25117995901ff7264c0f04bf4db1bad6c9c94c4d1fbea968245041752b2b720d4c42b4c23191eda5e3dc0c292b6
-EBUILD dav-1.3.4.ebuild 1407 BLAKE2B a33507ec5994d7bdfeff11072fc14f8cd07b250d446de4f557f316779bc3e0bec79f5ade0bbc7d029ce7f6981d6f8fe2519830ddd0ac9404a866f94b1d8782d1 SHA512 63932672f1e5d77bdb5bdc3ea5ae705b2b2d151f1467c638b2c37bf3f0945af58fb3f6309c9a53e4793998cc37778fb55a9662c025e1827bcf4b4045b2203cfb
+EBUILD dav-1.3.4.ebuild 1414 BLAKE2B a290d56814d4fe4bd1cb8116618ff98b7994208597a3868c8fdc3a940ee75451b13d40d7db9667aea95648c994221ef460160761395083b2a67670f54689ce1e SHA512 6ddb25b0b012ef918ce8bb8e99e059f0f10203b43212d027c4a750f819a52f02d9516423f5bc6d188f1c36556bc27f447ba823c8fdceac7406340ddfaa1a34e0
 MISC metadata.xml 556 BLAKE2B c035de85bed3b306fc92bc1c5e4072ffc0cbae7fae160403f8be766077c244382c7fa15abf278645ff73625c979f08a0fd6621207428cc88e6ab2999971eb23a SHA512 2ec18be605adeb0780c66cb66ded766712677b6f84a38ed4ed9f019dafbb2e308b840285f3c2d129787a8aa3b85a49543a8f136d5043afc2a6270abbaececba2
diff --git a/dev-haskell/dav/dav-1.3.4.ebuild b/dev-haskell/dav/dav-1.3.4.ebuild
index 9faf65b3f594..2003ee0111c4 100644
--- a/dev-haskell/dav/dav-1.3.4.ebuild
+++ b/dev-haskell/dav/dav-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index 2b710477aea1..9d1110b69ea1 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1,3 +1,3 @@
-DIST dbus-1.2.16.tar.gz 78086 BLAKE2B b0909a8679f746e9f7ab4f949f44d44246271441e23c9baac41514a478d7cf2a6e58a2c697b2e7f005341b544d4533efb6f0065eec40f178303aaea7b1f5014d SHA512 fbcddba41d5a6ea3c93841f56b80c43e968758eb8979412cd15a3e6f384bb042a025dc4850dc2e584b459b0c7b99db791d1a9b17090108c004f657f7e125e441
-EBUILD dbus-1.2.16.ebuild 1429 BLAKE2B e1a77a159060586c971bd3e89d5fa1024de1a494fa50afa2e36f16782f0cf965e20a5937ccf4fac93010e1c23ed2462e0f64c4ff391888cf54439cc7411cb36c SHA512 5a07bfec67ef2ed706c53fb93ee9c3186f8ccfec7997db6015852e5d811f5e426b27a2f6f3ea3aa3c2bb83da8c2d420692b5fb5b23ec049cc9ab79c37115b90a
+DIST dbus-1.2.22.tar.gz 78010 BLAKE2B c7189e15e0a9622e707bb50064584bd43141857257baec8e6d59d0cf39428b3b5efa82668ef70fbff218738ba5822b1aaad0c85b5e14bfa3ae4ef237e2458a9d SHA512 81f9fe1420939ebb5b03602ba59dd86656e4443690d8be460684dcb461ff7df1ff4cdf846a5a15ea6193b6f64b08526b27d3e12825a375eecbded3d0a99a59b9
+EBUILD dbus-1.2.22.ebuild 1274 BLAKE2B 0670669586cf7d0df0024b2d3e08efe0884ce6add0c0d1e19985c0b2b394d5f205266f754dcce9fe8121ba74dd7c5bb684e12bdf7ef10d1c04690d29d7013afc SHA512 17636cfab10d083f5ee1b48ca27dee37cc26b7b7d9cc352c8b4c2c7a5733cdeaa03344fed074c32a074416636716e991b15c0fe10430fdbbd9efe3a9666c8cf6
 MISC metadata.xml 2060 BLAKE2B e0fa39e05ec8f6cb8def9e78735e7f4e062b3d294b506e08df5d0592d1a480490ae4cda8a00fc2af7211a3981ac983326908cca24877d2908af0c0a1b2457c53 SHA512 eff83d2ba57a618d6dd22761f64152c53d1be6ce7a22505c8e9553628df38171d6688503703cee1c55c1e4c949728a5882c9293faed77cf3885c42ca98a7e755
diff --git a/dev-haskell/dbus/dbus-1.2.16.ebuild b/dev-haskell/dbus/dbus-1.2.22.ebuild
index 978131cedba6..58157ba088dc 100644
--- a/dev-haskell/dbus/dbus-1.2.16.ebuild
+++ b/dev-haskell/dbus/dbus-1.2.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,32 +14,26 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires access to dbus
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="<dev-haskell/cereal-0.6:=[profile?]
 	>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
-	<dev-haskell/exceptions-0.11:=[profile?]
-	<dev-haskell/lens-4.20:=[profile?]
-	>=dev-haskell/network-3.0.1.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	<dev-haskell/parsec-3.2:=[profile?]
+	<dev-haskell/lens-5.2:=[profile?]
+	>=dev-haskell/network-3.1.2.1:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	<dev-haskell/random-1.3:=[profile?]
 	<dev-haskell/split-0.3:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
 	<dev-haskell/th-lift-0.9:=[profile?]
 	<dev-haskell/vector-0.13:=[profile?]
 	>=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?]
 	<dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.10.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-3.2.0.0
 	test? ( <dev-haskell/extra-1.8
 		<dev-haskell/quickcheck-2.15
 		<dev-haskell/resourcet-1.3
-		<dev-haskell/tasty-1.4
+		<dev-haskell/tasty-1.5
 		<dev-haskell/tasty-hunit-0.11
 		<dev-haskell/tasty-quickcheck-0.11 )
 "
diff --git a/dev-haskell/dense-linear-algebra/Manifest b/dev-haskell/dense-linear-algebra/Manifest
index 1e16a7fbd4b9..83079a9425c6 100644
--- a/dev-haskell/dense-linear-algebra/Manifest
+++ b/dev-haskell/dense-linear-algebra/Manifest
@@ -1,3 +1,3 @@
 DIST dense-linear-algebra-0.1.0.0.tar.gz 6285 BLAKE2B 22cfbc68a2511ae4ed946c7b3c99dc171b515f0fa929ee5b4a8b01a6c6a707b3a66e0168104b37a49882880658119ea0d9fc5c1bc9d562eecd2f9349eadd90b0 SHA512 bcc70b42c3ea59aa3a739e2b189b9a1018d3dc27e65f5016502a2068005f480c296960ba7758a810cb22bfde53b5a597a66a3e1dd7bb732e54fe5daa1be08aa0
-EBUILD dense-linear-algebra-0.1.0.0.ebuild 925 BLAKE2B 7a82f4eeda83a9ef57509480c4daae9321cf4c702df458a63331829fd6876e04a7bccdc726ceaaf4ea58da758480b53918715ac26024876ec4609c842bcf3dd8 SHA512 f7df0b8f164c6d26f9af5d64a771a5e66629ebc0608da09b5ce28f0a167fa7d745d393e9bb1499850e593949b1d7d2293db411f3ac32e921bbc3abd8465a3d1a
+EBUILD dense-linear-algebra-0.1.0.0.ebuild 932 BLAKE2B f7171ce4cb79433a9eedb1fa16f7dc425cc1ecfd858b68f37a99399f0e7377b5824ec315f902e1295cb5c05c47dcbef4fe76ad462cb033c6e778b1d136685480 SHA512 fdc5f32ad50af5d871cebd77ca7a66ac2c7e4a10ed8d295cca7a5f1d179549f1d84815c159e05bc67228587f1bb29b2815cc43be14f54e3a13cfb2da62d93543
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
index 0a6a6c4d3fe3..b5bf07e11bd2 100644
--- a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
+++ b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/math-functions-0.1.7:=[profile?]
diff --git a/dev-haskell/disk-free-space/Manifest b/dev-haskell/disk-free-space/Manifest
index d339748437f2..bd351b099579 100644
--- a/dev-haskell/disk-free-space/Manifest
+++ b/dev-haskell/disk-free-space/Manifest
@@ -1,3 +1,3 @@
 DIST disk-free-space-0.1.0.1.tar.gz 2771 BLAKE2B 29c769acf9e60a88196197beb318cdab5b53583d979f7ab7fd9eda4e6252e991008b31f3f8d8cfcfd5f3ad46f7ebe90f55b8453d0666799dc04b31ba735783e2 SHA512 7e798e5428a8ee1a226c28172aca93940dae7aeec5f6fc0a7500da0299074a007f3b5a1d53d7282def245e4b829f86ff9f18ee1f8e824fa259052d5f2434729a
-EBUILD disk-free-space-0.1.0.1.ebuild 549 BLAKE2B 6899e47e9df03bd683d804b1da7dc3e6bff75330937f7b559c99e7a89f8b3fa4a542eb8f1d1ab1c10689160df09aabd6ae9e68102d86b37ce846b04ec6ea42fe SHA512 f1f4eeb4156335a22696661fc0c0fc21d624c9c016cdd0755725e6b3b22351b367f5ca845084a5b018e0f56fce40a638a9bc223b191879fe38e1b3910c4a9b9a
+EBUILD disk-free-space-0.1.0.1.ebuild 556 BLAKE2B 0bc8e702ac76a012e444e8bfc146064b8e124d711a35eefb3eb922d7fe406957052101728126dd95f8666bce771bb66401df8b564c97050f7110f5e4350718d9 SHA512 2866f0828040e55a7efc888827bf07f0b6b368ab47cfd89f5de20857790e50f8585b05223c95b800d4e9a5c4fef1f59372ed42f543807d7d1c93a3e1c3fab8c3
 MISC metadata.xml 337 BLAKE2B 94c83710c955fd30d9c4c2ade913bb21e650a5ff81f00677d4a5d21d7d2610fa7ae4e108ffc9869f059e4d3906da54279df221eb6e1faa7e1bd85abdc36da67a SHA512 7e43f0c4cb2a691621fdd3e8b9db870d1459cb7bdb54e1d4c6a8f5125fc9120e43734bc479656b25dd507975001b02800069bbdc3fc4a3d19fbb522b36aa6cee
diff --git a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
index 1d0e064b63b4..5e41ecfbf1bf 100644
--- a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
+++ b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/dlist/Manifest b/dev-haskell/dlist/Manifest
index 6b260118adc3..4db00126360d 100644
--- a/dev-haskell/dlist/Manifest
+++ b/dev-haskell/dlist/Manifest
@@ -1,3 +1,3 @@
-DIST dlist-0.8.0.7.tar.gz 9228 BLAKE2B 11d32271f9a4254eef04cf2b4de2cb68471a3194add8bd8ba87995c7098a5c80e54a62e2637ec6482ce671e7674b33ed2339a7bb2b52b4f302a41aab89b86c6b SHA512 e98ce96819bc8c7a86f1eb402ba7c6aea95fc87502afbb40a4b61ac6dc9a9793ca6f6042f633733c9e0e7c7f3f77711809767ecd213639bfa3b77e71bd6bd806
-EBUILD dlist-0.8.0.7.ebuild 631 BLAKE2B 8190578e5a0f5d3f7f25f217c05d6ba9c4b7f5876e7f1d798f77788bfc22863bad57229e4dacf05fdc63ba03690f52442fa3299e42d7bf26cbd274ed8681ac2e SHA512 f5629461f4ac1da7e0c9e991d9def51d1e7527c826d41417990b83e954906875d0b1592a3542dd8de5508a5824e3bd27ed96c6774f6822d3468c3418d3ec13de
-MISC metadata.xml 581 BLAKE2B a094a568611946827265ebd03328d998b3f87809b50d609fb35ef7e7bd8cd8d8cd29ff89fbadc063785c82f096328a1a0379d3fdecf4b2463d3fca01a1e22e95 SHA512 e3c27f9147bb6d1fd27f1bf9e1de60f56b6a4b885e6cd9eca96463cb8840d091d8d8d7be0464715a16614e844be531fd4f7370f0ecc2fc9940622c4bcc12ce74
+DIST dlist-1.0.tar.gz 18667 BLAKE2B 7ed951b866463c55b7f59d8224096528ee7a1c6a055a6b31e9d2a095409dc68bb3fb9e683922479c7cffe687796ebaf029f51a2da4469beec68b29b2c98ad2f0 SHA512 8985b9e775e8d99c3d8cf59eabfb7ed13c395482186b086831a79afea9b980ee59e386856df82dcc030f430be55cc95fa057e962776fe37a371e8be5ae19abef
+EBUILD dlist-1.0.ebuild 720 BLAKE2B 2f7e9dd499dbcccd3c28669d1dae2c8fe89a21e45dea8f2384860a8369b6fc6eedec4e338d166885d7edf547035a3c0ec2ccd7ef001e00a77b58c391a57144af SHA512 1fecb14c2dd878c089b9ce6b7135ae7ea9b7c29c5b5401e2c489d15f68b5ac426bec1de0dee40ca61b4001a9ed72b530fb435714469320fa0b190ecda7f2daca
+MISC metadata.xml 309 BLAKE2B 4205600860bde8f7f4d57e79640616fe46459837814f2c709cfc87839465fdde45a8a27b89214b22989ccdb2c7976736abf98bafe907ef669b0808c427f706b0 SHA512 7f014123a8ec7b406192c4973b765560973ebdd653cfc78296960d91cbed049d2377306afb23f054dd0d88caa0f7ed6f4b9719d8a6db6467f6fc6a36fd755ca1
diff --git a/dev-haskell/dlist/dlist-0.8.0.7.ebuild b/dev-haskell/dlist/dlist-1.0.ebuild
index 922232aaab30..15daed49f8ee 100644
--- a/dev-haskell/dlist/dlist-0.8.0.7.ebuild
+++ b/dev-haskell/dlist/dlist-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,11 +15,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+IUSE="werror"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.14 )
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.15 )
 "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag werror werror)
+}
diff --git a/dev-haskell/dlist/metadata.xml b/dev-haskell/dlist/metadata.xml
index f326386e7cea..b47c460c73a6 100644
--- a/dev-haskell/dlist/metadata.xml
+++ b/dev-haskell/dlist/metadata.xml
@@ -5,13 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Differences lists: a list-like type supporting O(1) append.
-		This is particularly useful for efficient logging and pretty
-		printing, (e.g. with the Writer monad), where list append
-		quickly becomes too expensive.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">spl/dlist</remote-id>
-	</upstream>
+	<use>
+		<flag name="werror">Enable -Werror</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/doctest-parallel/Manifest b/dev-haskell/doctest-parallel/Manifest
index cc2cc5381983..2f321527a83f 100644
--- a/dev-haskell/doctest-parallel/Manifest
+++ b/dev-haskell/doctest-parallel/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-parallel-0.2.3.tar.gz 45698 BLAKE2B 1650965be43357d86d497c4545c4673b21add0de3bccb52146519dd109bf34532973ca58285486f8311b4bd0e8b0acc443610a9f4d16d4326fa5a74926c3d6c6 SHA512 7a39b379a4be0bab4e6d360c572d81d4bfd7197d4e2a068ec2b00924ab8866406165eb9aef62a0612619c524f16302fe398edccfbcd117a97891d48fd00b5786
 EBUILD doctest-parallel-0.2.3.ebuild 1300 BLAKE2B 68ab672c2346074830f41bdd384946d53cc64404d4ebcfa38f5e6dd1a5fda287505487393e0bf5866ad7c1df1726dc1fbc41c4ecbfa7f8547ccdac5327081aa7 SHA512 ec3cc3c76aa60ef6f3e07ab6bc821bfc03f2ee29ad41a2b4168a4e5976ab36f0ac0a1aa356ab782178c5feafda52d072dbe1e3d952c8ee4c46a68e48390e7d46
-MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/doctest-parallel/metadata.xml b/dev-haskell/doctest-parallel/metadata.xml
index b7878815d80d..937381521944 100644
--- a/dev-haskell/doctest-parallel/metadata.xml
+++ b/dev-haskell/doctest-parallel/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/echo/Manifest b/dev-haskell/echo/Manifest
index 964f5ce78ab4..f8fffd02100a 100644
--- a/dev-haskell/echo/Manifest
+++ b/dev-haskell/echo/Manifest
@@ -1,3 +1,3 @@
 DIST echo-0.1.3.tar.gz 5373 BLAKE2B 3710de35b42e39f7ff9d2e5c2e32ae4c1e863f9ae844ada25dbb653aafd6ed261357c3b5046e9e0cabb03dd4de4f6252272a2b643087a61d1df5f26de329e588 SHA512 26a2398af231a8805b6b0a866348f848b8b8f21fe95a2fa3c781aaeae150df978335df573d46d5b07d7e4df19d6377d997f85c77049abaf0c5cb3e9998439c6f
-EBUILD echo-0.1.3.ebuild 794 BLAKE2B e5b5bf6d5fea2fac6ade70b4ee51a93c15ee15cd3a62ad4a05f6e61e27e439cdfb1257cad0aec828e90ffce62c48cc0d261f8d0ef0b10f9e5163c0b22977df55 SHA512 9ee37489ec0a6226a1a09fd2d87677b9c6ec669426ee0f3c09f56fd33ef9a4405f9334a32f899389b5264db1f277ae589da0f110b1205e393e9599e3ce6ea6ac
+EBUILD echo-0.1.3.ebuild 801 BLAKE2B 6cbbd439546090dc099aee3f4591ed55c8790528ffbb645440c87fbad7aad215f709c2f29f5bc87242e6a69da198ae89233d78ba95aa244354a065a1ed4f3797 SHA512 33f85d58ac2d2d4649b94178305ab5e7e777f9241daebcf72814ad362efdff79fdf99b1396642c90e84fd7f6d42091607d3d38187f34bdc44f01f46d68f749d6
 MISC metadata.xml 956 BLAKE2B 096a9c7e837fd886906acaa685785b31371a82be3506de2c2325bd5d7d3b3cc623cbb23eed3d3050c3a5e7ec5b0968993b46fb232e2a3ddf6901e5dce7324b92 SHA512 1232862b850e355213649d98d6f2cf278610c5dec9ae62ae115f568e1326a5a5d3db876e5190b8cd34b156a60ec991ccba0de05f9c9afc06cc7d840ac7340ce2
diff --git a/dev-haskell/echo/echo-0.1.3.ebuild b/dev-haskell/echo/echo-0.1.3.ebuild
index 4f0b6db6d698..969e0802dd5b 100644
--- a/dev-haskell/echo/echo-0.1.3.ebuild
+++ b/dev-haskell/echo/echo-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="examples"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ed25519/Manifest b/dev-haskell/ed25519/Manifest
index 3b20a4e30792..5aeb3f482e5d 100644
--- a/dev-haskell/ed25519/Manifest
+++ b/dev-haskell/ed25519/Manifest
@@ -1,3 +1,3 @@
 DIST ed25519-0.0.5.0.tar.gz 80034 BLAKE2B 4de73a76576bc63a7c5e4e8c0d195d48c65901ad417a306ca0001856a3a37975cfbb527dd466c2a737006e44e8d440e9831c360c8c3063b45a704af79c165cbb SHA512 cd2bb28de905c6d659f80f15e82970a9634c959432c73b6fd3b10ebca42a1ce734429e7ac861d0ab328904d99651a6d2fcaaf4d74ab75a3c0be68607e8f54ce9
-EBUILD ed25519-0.0.5.0.ebuild 1165 BLAKE2B 27f8b1341b0db55037eb7eacde34090a302bf99cd8cba4261f507ffe74ee02835269a6f79ab216cf17012bf64a72caf6b2734e6401e06274cefa14ce93539aec SHA512 d24e22b59ce09b72b5c89d83913ffba9f6846892c82df9a8d66de02a903d1793effd815a2afbb61484bf1e0c39b90af31c4c014b60aad1349660ee94027f6145
+EBUILD ed25519-0.0.5.0.ebuild 1172 BLAKE2B 18c1e58c7c867adefb241ac14cd59ab152086945e2236b4ca7c7340b16db2549a75c80fbf9bbd6aacb36b6d88c78a7ec4dfa9ec61983ca5a62240fa21f72ffec SHA512 364af4fe9f4c9de130d1dc2fcc5305ad964d2c4afff3a1ee2aca77e4901e57d9ad3cadc6a3ab85e10e52956d80fe7a223784767b8010319790ad6040c854a4f6
 MISC metadata.xml 561 BLAKE2B c92550d01465adacb395aa60421a03b89d34a164f35c5008d74ed64c33f922825420f1507bc38eb5a7121973389d8f40d2ac7da5019c96063618e1859a86925f SHA512 c79685d80aeac2440a3c935684e1007ed8d0cb5d58485506429c0ce3b83a718dfd57ce91fa7e7032c39e43a45358e29eea7b060d94a4dd15a01211cb7840dbd8
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
index 67ab4bd32f93..801e78a5e6c5 100644
--- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+++ b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # fails on QC-2.10 as: The constructor ‘Failure’ should have 11 arguments, but has been given 10
diff --git a/dev-haskell/edit-distance/Manifest b/dev-haskell/edit-distance/Manifest
index 12d3f3adf005..b5ec0781283f 100644
--- a/dev-haskell/edit-distance/Manifest
+++ b/dev-haskell/edit-distance/Manifest
@@ -1,3 +1,3 @@
 DIST edit-distance-0.2.2.1.tar.gz 13228 BLAKE2B a7e57e19f61497cfa24c1a038e860d2b0d616f4a3528db3c315c12f3bd04554e003009f1b07b2fdd6be7a8387b0205dde4d00da8b0a05f5c4b7ab0c17fca159f SHA512 67d19c9f5712191f88641d32ff0b84aaf05c2acd71cfa81a17675690ac9076b34aff687afa8501f8b22ddcece12a439e053265d14b70dc155b0e08406050fdd7
-EBUILD edit-distance-0.2.2.1-r1.ebuild 840 BLAKE2B 2740a3527a971bc273d4d524d1a1b1eb22981e99817b22e113fc7fac5057eb891921906cb62941960a336d1d3f98082a8ff7bc7acbdd0d13ace5bf7515e9ed4c SHA512 5d4caa4cd2591a18939b883e384118f5ad61238e6f5f833601f627266a7f4ffde2de793945169dbb1a29d84178c829eebdd14dda4329170b8978986e798d65f1
+EBUILD edit-distance-0.2.2.1-r1.ebuild 847 BLAKE2B 817231e2454de7a68b3d73d972859280671759a7e3071a4de55b9a330a912e3a70e1349dd233372b7f121fbd8863b2c6b32a828db17954411eb7a8bdd8b3c62e SHA512 9765a7e4a561c9e6760b306fb2d7909bd0a053efab503b5d54271b23db52f1518e2cf40aec4e05e7a8fd13cecda16af1ea253bcec6e599bf54c9838184da30f5
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
index 30e1b8aee32d..b37428643b83 100644
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+++ b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/random-1.0:=[profile?]
diff --git a/dev-haskell/either/Manifest b/dev-haskell/either/Manifest
index 3004bcf47b4d..fb1be32b6f02 100644
--- a/dev-haskell/either/Manifest
+++ b/dev-haskell/either/Manifest
@@ -1,3 +1,3 @@
 DIST either-5.0.1.1.tar.gz 10162 BLAKE2B c3489b2957a8c0081cfeecbf5ed247417c0e1f52fdaeaedcc4eb757d31574f17cdcb02a2c1808aa4aeea7a2f8b177f959f58b799039cbcef0b6ec875a620ee06 SHA512 96b23a9d5f1d2d4dd256251c488e06fa0e8642d849cf61c9de2a4089d2cbe86763062e69f83344eba2f75b30992f3e90ec195bd054f8de386c4c6b477a025c01
-EBUILD either-5.0.1.1.ebuild 1163 BLAKE2B b8a0b645620fd8a8fabb74367be8a7e0e31a250abf46c5579cb779a288a74ef6ddfd6a89b68bf4e008cac3515b70e501ea2359a2f059ee0c9933430668d30258 SHA512 7fa7f667b1b19948f3413e7e1e396a264ff162de6777ff9b861c65b17e86e2b19f8223b154f11837e1a086a227a29b8bc86b950dd8b7e3843848f403a4be684a
+EBUILD either-5.0.1.1-r1.ebuild 1257 BLAKE2B 5b30b6b349a4d515a55fa18a44f46a7977e25897b78f23c1496819e9f6ee1009be689b264f92d28f3293c77b73fe27d311c38661195e23a856b5292888ba9c32 SHA512 385afff741459d5ddfdf3b6ab14db044dee71a8567171e2879038d54097bcebb21eec4b8557f56a40a9115368ec86f4bbac3af2d01c34e986d0af5586a70eae6
 MISC metadata.xml 328 BLAKE2B c8469a03dd8ec41665b9a9872ea3c028547ca2193b5cb4df1bf7d7c4dfc44ff3b88a5dfb0885b5c8e15bae6ed82323f6896d314f0de302be33f41b233d918821 SHA512 dabab5ea3a9049b3d383a0ad290a645334e46fa2b6aad2b9c90905f9ab3b0635e71dba6a7d8495a64f429ab31cfa9f69a575b47d2ef5903cfb6cab4976cca29f
diff --git a/dev-haskell/either/either-5.0.1.1.ebuild b/dev-haskell/either/either-5.0.1.1-r1.ebuild
index 0918386df358..eb6932c6106d 100644
--- a/dev-haskell/either/either-5.0.1.1.ebuild
+++ b/dev-haskell/either/either-5.0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
@@ -26,7 +26,14 @@ RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[prof
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14
+	test? ( >=dev-haskell/quickcheck-2.9
 		>=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
 "
+
+src_prepare(){
+	default
+
+	cabal_chdeps \
+		'QuickCheck                 >= 2.9     && < 2.14' 'QuickCheck >= 2.9'
+}
diff --git a/dev-haskell/email-validate/Manifest b/dev-haskell/email-validate/Manifest
index 27f667501815..502f496049ef 100644
--- a/dev-haskell/email-validate/Manifest
+++ b/dev-haskell/email-validate/Manifest
@@ -1,4 +1,4 @@
 AUX email-validate-2.3.2.15-fix-doctest.patch 941 BLAKE2B 2ec4d7a23f9217ed536f7e709d63fd36b3e3abab8d4841fa4e54dcc69ff912a95094511bf9c4182c4cc2a22f5f83911449189ad5bb5eb3b30fa97563ca2c807c SHA512 c37cba04a1d12a1a3f071554d76bd6cee678a0dd5f7fd5ba7a01a17ff587ac0f29a6e51b5c4d3a39de47916f0bfb1dd222411d590eea06665fca13c9f6134a8c
 DIST email-validate-2.3.2.15.tar.gz 9568 BLAKE2B 1ff8c3e5ce71f3ff39dec02e0cbc211ffea3386646a77b2c176cc0af47a61d13996b2bb68d36e77ccf3114c53facc9b121202cc5d70916a4aa2992fa3956a60e SHA512 0b852771cdf0851bc7024fbb612488bd7721cbce25b551f52932b234e57bc70ded2e5904853f2ca0f68cfb9da02057d4a1903d081ce81a382cf90d0d3ba25001
-EBUILD email-validate-2.3.2.15.ebuild 944 BLAKE2B b1822838f6a091a11f8a1c4cafb5bd2d61488b74d966ed673771974f07f23fd97199fd293a4a6cc224b80b7bd17da734cc3bc9cb8d053f3804c598d5e9bd3476 SHA512 1d13d8e8c9c030469bc05c94c94b2bcca5d2fc4b9ea16a26d8fd6d413703882220b8c462db548d58b871765a7cf856de4c996a98e7dd07f9c5c4820287cb8e4f
+EBUILD email-validate-2.3.2.15.ebuild 951 BLAKE2B 9eeabad24acfd781b57e067b407e9af0d8728426f95c0c40bd1afbc7e272343621cdb1462a201214208f3f37176f19d171c390ecffd8f8af3fbdefe429b98eb4 SHA512 37ccf45f394c95f0219f9a7aec0a23db27a4851081208d5cfa87ff9326d991067389fa96204adb6263e50a3bc4c1928ab340cec0729a5bf4b8957d15a28fe5a5
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
index df433182c88b..1ae0376f01fd 100644
--- a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
+++ b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 PATCHES=( "${FILESDIR}/${PN}-2.3.2.15-fix-doctest.patch" )
 
diff --git a/dev-haskell/entropy/Manifest b/dev-haskell/entropy/Manifest
index ed467da71098..1b0528da4371 100644
--- a/dev-haskell/entropy/Manifest
+++ b/dev-haskell/entropy/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-0.4.1.6.tar.gz 9464 BLAKE2B 484e72ba8b6413b6205db4660f52d183dcd075bce836de6b339e2019d584a90b9f650d6b808b46855c9a423e41f21d814e10026efec050f507edc68106568893 SHA512 201a75efe210be5728a1c94ba9ec62514b96c388b6791d9301b34d2fce0208a9fa4ef25965c7840d052fd6221f15a1bec196a6eb209e6d03c3e1f971161df1b1
-EBUILD entropy-0.4.1.6-r1.ebuild 712 BLAKE2B afd5a3b1bf9aae3cf4885f901f5fb74f926e889b5a8adb59112a904c9ad3fec43960f1ee14e5078e1ce495dd3708800602b3e35d162f27f4dbcf9980a8bf2516 SHA512 2f75a77e2fec00acb99b16eacd928fe970cfaf1dfb345b7cfb5729a7b455ff0f16b6539d05dcc862eae17cfebcf38d4c77a1583ea538fa41d436264644ecf49d
+EBUILD entropy-0.4.1.6-r1.ebuild 719 BLAKE2B c3bab30197ea2f80d0d0279b42b9269514aac5da849410bc327fa378585cf9d86c7bc406b76cbe5d78c727ebb13b37b9311535980fe282386bb633a829a3396f SHA512 89c7d1a9d3a0676cf3828e01208401b2ac973e7dbfac988a4a6083cee78bbbf9d228557134786cc42720f2ea83083bb1fde335e9e359bf5d561d2f49393159ef
 MISC metadata.xml 713 BLAKE2B 547d673c11b741ecab47fc1857be8b2e27c6cdd0941be5fe337326a73950d0f72186ff34ee801170e329c8bc35644ff81fd7819443119400f222b519a16831e6 SHA512 d568d3a280a724f96bc97dea7d020ec3a588c1336b98fdbb135ead7596047137e2240668a7621cedef63498cb6b8f7d32e6fcb79c9787a3c9ee4676f02c6e612
diff --git a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
index 04b1100f2a3b..2ecb344836a3 100644
--- a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
+++ b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="halvm"
 
 RDEPEND=">=dev-lang/ghc-7.10.1:=
diff --git a/dev-haskell/errorcall-eq-instance/Manifest b/dev-haskell/errorcall-eq-instance/Manifest
index 1e869beb3d09..a0fc01f00fff 100644
--- a/dev-haskell/errorcall-eq-instance/Manifest
+++ b/dev-haskell/errorcall-eq-instance/Manifest
@@ -1,3 +1,3 @@
 DIST errorcall-eq-instance-0.3.0.tar.gz 1534 BLAKE2B 6b137de15395742d5c73e1e9f1b06f88109675da701d7d65e40879b844b4ebbe4d8400fec44a12388af3a4ab1dddec30a8365e63eb8f042805ad020a575de325 SHA512 934ee3b3f00d7d32b9aa384a568cfc9c99a3947cb39cdc23495dda21acd0672d6de753b4243f417397738473d091fd14776c21da0dbaa0b40c2b465cde5910a6
-EBUILD errorcall-eq-instance-0.3.0.ebuild 665 BLAKE2B 42a2c8c73b4d75a35ce15bef547b1d0cd614299f7e62df9b8ddb797f6a3a233f9dce332858fe5e607fe46b4aa5e87ad0066a127a6c35b6fa187bce25e062abb4 SHA512 c6e2d2ab884191d7fcc927254862dbc2b9993fd5624a519b75dd91708995ec01cacaee9b0468c2e059ec546cbd60dba67f62bc3d4d7ae6862e85c6e302bf2a90
+EBUILD errorcall-eq-instance-0.3.0.ebuild 672 BLAKE2B 47a8b15917332ea6a455b924ff7c81b952628f160bac3e3b026ffd235f2f7fd6f4e9e99d1f79ec52c4a3adf7e9f4d05ccf7591e757850e3ae409c2cc5cbf38a1 SHA512 da15ee5f3ef97c3a2348d140f50293af9436e940abd7286483d00e1796ae2b4c1fccd74cdd9181cd72c9ff63b437154606c1edfafdfa9bf5bbb84a4efaee66fe
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
index e63ef2b19c3e..5161103f2505 100644
--- a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
+++ b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/base-orphans:=[profile?]
diff --git a/dev-haskell/fdo-notify/Manifest b/dev-haskell/fdo-notify/Manifest
index 958045c9a3de..613527472033 100644
--- a/dev-haskell/fdo-notify/Manifest
+++ b/dev-haskell/fdo-notify/Manifest
@@ -1,3 +1,3 @@
 DIST fdo-notify-0.3.1.tar.gz 4882 BLAKE2B 9ebf5bed4b17601b4deabc523e1ad529b95856ff6c0e6e83966fdee0373a37f8432c0fa34a6322157da1b3a93b12d10de2ff97da83c8ab9b2659932050083757 SHA512 d9193899d5eebd7c36e9464571827bd5b560fcc156e89822877b3b67a1f376c7abea9958f7e0aa6f79da06ad5f35a8738ad30a40d447b64ad557ed341054e6b6
-EBUILD fdo-notify-0.3.1.ebuild 569 BLAKE2B 0cd793a514c3c2d242b33243e3857c3c20ec0f1177d6a40c67aee2be944a4514c3efd81607c054cb2efc6da29e9ea6101faca65e1793fd2b0882fcc8ddad7039 SHA512 bad84f591bfbc7fb137d62af45f0d7230519d95264f22f29ad57809aeeb0e7f98ed350f84bcfb1bcf5669f9483797244cb1058531a2fc6db1d21e82521b953b3
+EBUILD fdo-notify-0.3.1.ebuild 576 BLAKE2B 6efd8c89ee83c8e16acd87c0c52790811ede41e9c713cfb061e826ab1b56e157e455707d6dedb1ae9d2b20115c716c2ccf043220e767b5f6f2229bdc6e855f54 SHA512 08122da70218ac4392385cf73f9fbef8eafa7d8318b918916ed8ca91c687736284ef3b843fc1ae9150d7c55820095325d08a75b461b054f71248f1629f57f837
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
index 4bca228c937b..5275d9c7389f 100644
--- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+++ b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/dbus-0.10.7:=[profile?]
diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest
index 2f1b5a9f2df6..308a876f51a9 100644
--- a/dev-haskell/feed/Manifest
+++ b/dev-haskell/feed/Manifest
@@ -1,4 +1,4 @@
 AUX feed-1.3.2.1-disable-doctest.patch 589 BLAKE2B 2ad6e862b624700eae5be36564f713badfa788842db5774836871dc46cc56bb067288ed030a83ce1009ab79a3831c5ec0b92b53af384b261203023db6be67569 SHA512 eff83526535450086e1af5ae52b14d260f3d6cea02f30fb513de18f4ba15278e4c6e375df55ea8d1854060d8603ccbe855354710094f62dc7a3615139f0c9ddd
 DIST feed-1.3.2.1.tar.gz 107015 BLAKE2B 4a40441b17f50b9e7d43aee629fa0bc44f5b5cd1ca6281f3f5a8930b9cc5c2acdbdff05e9db4cc96c0e40681ecb15896655d8bbc708dc0bc4e3734b6e9f563bd SHA512 2175201ff9eaab5732e1c4e8dda6a35e8fa0dea5c58cd379348c97cd61a5eaf76e88f8d58d22df0a4b16681017e7ad01657ad60a63d90dab88df3b644ccb1ea0
-EBUILD feed-1.3.2.1.ebuild 1556 BLAKE2B b3962cf967552dab92b87fcf6f905ca07f39e407ccff684aeb3abcc249c08ce28b50fea1bd670679a0b5e02d353286a52153f64f1c2d9617002c8bd25cd9a9d2 SHA512 946fe4dee9e7bb08f7664babaa4bc7100c7deae601cef8283a33fd5e8106fbb12382b3f2ffed89fb767a746b30013c46c9229d41efa7fa1657527192ec8441f1
+EBUILD feed-1.3.2.1.ebuild 1563 BLAKE2B c702cdbc3bff42cd34b5503e85214e25432cc583f02d36560dbe4e9fd123bb00d2d1f95a543ae0e602f9005a7332e4210e236552f3578ad6d28e6c414dcc63fd SHA512 98c62bdfff426547dd0348c60b9e76a68fd09236030e67925cd3f1441c27627d129ae506c12f43e741773ae6abf81618a1b52bfe6166252d5f6ff93e6687ccfc
 MISC metadata.xml 323 BLAKE2B c187f8488cb46ab3da8c9f970ebcc5525b610a4e7f0c2c6324e9b67d613eac5a38bdf4bc9a2f78f3da7e52f61ba1262bcff919baede93ad00df998ecb8b58fd1 SHA512 17a8b843b6b086fa21b8652571310293d327332f0fece460c7bf9a6c9e6e887bec5e57fb067ce9e46b1549c93fd74e9133c382154b49938f26a1e385374b81c5
diff --git a/dev-haskell/feed/feed-1.3.2.1.ebuild b/dev-haskell/feed/feed-1.3.2.1.ebuild
index 3204f130059b..dd7b5d0484ff 100644
--- a/dev-haskell/feed/feed-1.3.2.1.ebuild
+++ b/dev-haskell/feed/feed-1.3.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-disable-doctest.patch" )
 
diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
index 761abe837f3f..945a1d04407f 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -1,3 +1,3 @@
-DIST fgl-5.7.0.2.tar.gz 56399 BLAKE2B 0972a1db67f1e1e4910afc6d2cdd974715647ca0e3e0d8bbb1d2ac4bcf36afe9a4d36033c0bc2246d8bc87c5795494776173878e9c17f479f702722fc0fdf9f7 SHA512 a259cd9abe236cfec892d520b27e293293071ce1b435055cd009087d7d1fc2a87b71306e362020d3e8f6460c538da4e686c6b08b13361fc07c1e978b49a775fd
-EBUILD fgl-5.7.0.2.ebuild 676 BLAKE2B 7803637d3d52870ba16d6441cacd85abda29e3cc9d211f863417576431620e6bee11ae4dd833bdd037e6cbdc99bc9481797ac4c770645c61a7a617e198af7753 SHA512 32ced29b91fcab2a7774b3213276d6141d37e8e1c3e7463a646a72e9cc586eebf5c1dfe9c4265c894f8588f6387d35ad2715e4cb166f16863476c52edf028c40
+DIST fgl-5.7.0.3.tar.gz 56415 BLAKE2B 6b7f5d3d2fd93494f3c2f9fbf69dd38c0358ced8a4f488f31d4904a375e21b4d12b974fe78868be8184a989b43fa6f345ca84ed74ea8c5970416c2903dd7a024 SHA512 f77ee1a66fe02b0a01e70b6fcb16baaba67be5433e4310bfb0862cec66855fc0413de586ca111e2e1569898b890fe93faf7c9f079dc569ca2d32b6c087762bbd
+EBUILD fgl-5.7.0.3.ebuild 738 BLAKE2B c186e4a02abf4c52481ecfe090cd6890ccc4c689536b152a5461c513ad2b61a378363babe111b612839f052f01c422057fa8d93369f2c8df78ae2f9703d57f12 SHA512 de6888c0a76c9f9d99363b4562ee8406e489f6d09c5a2833de263d8dfc6ac6c446ea53a904ddb477a2e371c466e420d000aa943fcc76219b089d4dd5f3aa47b4
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/fgl/fgl-5.7.0.2.ebuild b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
index 26d3c88482dd..afcf30e183c4 100644
--- a/dev-haskell/fgl/fgl-5.7.0.2.ebuild
+++ b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,13 +14,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 )
+	test? ( >=dev-haskell/hspec-2.1
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
 "
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'hspec >= 2.1 && < 2.8' 'hspec >= 2.1'
+}
diff --git a/dev-haskell/filepath-bytestring/Manifest b/dev-haskell/filepath-bytestring/Manifest
index 94271258dead..1beebd82254e 100644
--- a/dev-haskell/filepath-bytestring/Manifest
+++ b/dev-haskell/filepath-bytestring/Manifest
@@ -1,3 +1,3 @@
-DIST filepath-bytestring-1.4.2.1.6.tar.gz 25418 BLAKE2B 3b1eaa89f68f6bea1ab1cf003cb53032eeea81f36b2de046054310b17c60d951791499afbd1e92a3d264515cfa3d3b60c87527f3579401a92b92efcc265c4c3f SHA512 f101d718681373faead2e916dbdb7fda7b12091067d070f5d0e8ceab48c8081ca7f46bdc2fcfc0b535d65d51a3835fed05a50acf36f1a01c22c8d01c4c98e106
-EBUILD filepath-bytestring-1.4.2.1.6.ebuild 661 BLAKE2B 6453c72198aef122f54938f6ed442523a2b90d380927aed2c00aeec7c7a0bc27fa1810704eb2b861c45928c5fe5a823adb1379886a96492701eb1017f193ea32 SHA512 50ea1391f7464ac1938ba591bfd2ace4fe26bf6d5a3af6370b75ec406eda0091db4300d4a611fccc1f2cb899c00bcd4895d867e77175f285429885926e080bd3
+DIST filepath-bytestring-1.4.2.1.9.tar.gz 25901 BLAKE2B f8cc6b01daa2a89ba9c4cfc448675ba00a203ba7eee7f966380e84daa56cf83899ea471d4b0b17f2d10b4fe8efccdca8dd188f4bdc842eee85a1f81e31a59b6a SHA512 814ca8e733afb85187055bf8fdf7381cba4de8587141eff678ec78aca76cd3042a40c3046d5fe4adaaa3575701c2a4172202ef9580ad66d87c92ee4a4e66fe87
+EBUILD filepath-bytestring-1.4.2.1.9.ebuild 602 BLAKE2B 151837c3aa9b69443be3416a2492d58bf5ee1692697d94d4c6f5b6a29fc9b182cdcd297fd5810b04543fc240cf9564d549f906b6024e02a75455bc58d74b7ec7 SHA512 c8341eeb0e6edce00e6d09d1dc8c33be4e248f9b1646ec2044098d5faa1aeee89a1f40666a6ca418edc55335fa8286d6e0870bbd7a036f27e23cf638eef248be
 MISC metadata.xml 1015 BLAKE2B f0852ea0ff280a3cced94c3acc8f94e75d1afcf845e83717ccada480ab020b294ccfd552b2e0fac262becbd0267fa5f3aca86427c08a800a2d75510ac4c41bc7 SHA512 e48b7ff201b33cb3c013cb6b6d8be54e737e24c917ba4f676deba01123fcedc6bb0b2b6259edca753f4c843dd30a829f3239b6193a2163a3d25373dc4639caef
diff --git a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
index 5c15d58f56c7..0a2f5192736c 100644
--- a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
+++ b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.2.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Library for manipulating RawFilePaths in a cross platform way"
 HOMEPAGE="https://hackage.haskell.org/package/filepath-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 )
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15 )
 "
diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest
index 65f6f9634fdf..59c7613140f1 100644
--- a/dev-haskell/foldl/Manifest
+++ b/dev-haskell/foldl/Manifest
@@ -1,7 +1,5 @@
 AUX foldl-1.4.12-cabal-doctest.patch 2371 BLAKE2B e3a402b7bbd433e2744810f56aa9d467a72d90941ee8b7d760c4a56513f8aff75aadc34e6b9bf1fd7cd573078d774df92401c44d04cf82161f9c334bb3930ad6 SHA512 773aaf5ddd1743398fd26a33702455de1bd470130855e763c3352006e8f0ea67ad5599efda38878f2572023e9d3fb5209f5e6efb4e3ae68dd381602ee5995dec
 DIST foldl-1.4.12-rev2.cabal 2668 BLAKE2B 4255e285bade060ee547a96c6db7a7d92b85bde3ca0f496fa7750b42df7e6382adbaa1ee7c2c8327f39eec6aba3eb44b7d29c9213e6595160bd8743fd364f73e SHA512 44ff1cb8f31c9770d78139053f2f31dcba76998339a9d07cd681994a0c34d862a750de2e5afa3b42a16528f38a6f9007a5481b9b52b481258006cd8466060ca1
 DIST foldl-1.4.12.tar.gz 23210 BLAKE2B bbdd9a0b74d5b27b4b8800090a1b2dc717d023d860af8f26846a86866756211b30c755f6a1c3e604d6d1db91e5afa35ee943e014672c0a6e65712e0fbcfd29d0 SHA512 6b345b59c52039e914ea703ab88a08a8bba0a18bea91fcf4cf379ce678e5a97044f563c7b285cb656a764068756b4fae8321308e86813f86d04c462e9889e6e0
-DIST foldl-1.4.7.tar.gz 21602 BLAKE2B 617f16b0b5ce18c12d5807daf973beb7e5fcd01591ff057d6ec66e8c6fae3cec140949ac87bd5c7d23bbd5ac86cd4355f5c96b8f4d703fa26f291975ff6bac8c SHA512 e1c8569214ee58d1d5333018a50832e8be53fa2751c18b5d93c7c8d393f722248050fc56c6a5243a0f9f8ff94a0cd2f475c03107e70d601bf6bf3a81c509b58d
 EBUILD foldl-1.4.12.ebuild 1738 BLAKE2B 78b9522754ec18b2c0b938397ee96c9aa426880de452238c3053c52451d782e0f3306637700a27d7a7b1092c999379ecd01263680dee98c1e923a6da6c6cfca7 SHA512 6e54094260cb2ab3bca8fc5233dae160b333da9ce40b70034e739ede2f2bacc876a3d19bda3ace9a472d6b82a6a47c252061596b7315f40ebbbaed91a7f89871
-EBUILD foldl-1.4.7.ebuild 1448 BLAKE2B 3c5dad0ede5d45cacf16861957de80545b4593ba9cd6634fbc41230b6af367bb2c749b6ff3def80c223c49ac1e76e017c45ab7e342b293c03f6e47e4bf608c47 SHA512 34c44b52fe87cf777764c9ced704d76d850705f4be53b8b634059e6cdcef4e3ecdab75417076ca841e1af663d9a99b1409d0e789c7cfc9fe73fd191de1a86711
 MISC metadata.xml 546 BLAKE2B 671ba01a8895c38c93d2bc5d5ca16470c8e14557a19cc96e6122b11a147dfa8da2247c6a780d412e609c59fbc0314c1a2b65ea80a2783be3f4b784cde9462704 SHA512 5c329503486cadd2127fd72c09e9c1bf4a06ea5bb2c65390ae21784ea0db74ccc81b9118829180c6991f57fe91cd445180513797e63563a26cbd23bb218dc9fe
diff --git a/dev-haskell/foldl/foldl-1.4.7.ebuild b/dev-haskell/foldl/foldl-1.4.7.ebuild
deleted file mode 100644
index 943ea2b45db8..000000000000
--- a/dev-haskell/foldl/foldl-1.4.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="https://hackage.haskell.org/package/foldl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # it was found in multiple packages: hashmap-1.3.3 unordered-containers-0.2.10.0
-
-RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	<dev-haskell/contravariant-1.6:=[profile?]
-	<dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.15:=[profile?]
-	<dev-haskell/primitive-0.8:=[profile?]
-	<dev-haskell/profunctors-5.6:=[profile?]
-	>=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1.20:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	<dev-haskell/vector-builder-0.4:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/doctest-0.16 )
-"
diff --git a/dev-haskell/genvalidity-hspec/Manifest b/dev-haskell/genvalidity-hspec/Manifest
index 6072459339d2..aa3efa133e57 100644
--- a/dev-haskell/genvalidity-hspec/Manifest
+++ b/dev-haskell/genvalidity-hspec/Manifest
@@ -1,3 +1,3 @@
-DIST genvalidity-hspec-0.7.0.4.tar.gz 13818 BLAKE2B c57e3f941bcc11987c1430aed1c1613c2b3af28e80d818829a07d81759e300cf7fd51c0d827efad50dbb7c465d261ff39e82f592ad25e0825f4f3996516b104b SHA512 25b660ca378f9015a71063c49ee0acb98fee2d66a61562e1fca831f1eb806ab6adc469b9694e51a610b14f9ee09765f83223b65a737effeef1fb0aeb98f30392
-EBUILD genvalidity-hspec-0.7.0.4.ebuild 801 BLAKE2B a756c5d0656ff7c5659e1d8589b3ff286795da256eff5c6dd7a1cc4a566286f80d959c56cf5c6ae28629f6cc897ee118dbb26b38526b49a5ba070d9461670547 SHA512 a7fabb73dea3190334c6cf6bc3c2affba274f537f3209a39a0abe99d6a82bc595cbc5d5df42f01daf4640801e3a8f220f2f860e269ce25d1fe223c24b6ed8ca2
+DIST genvalidity-hspec-1.0.0.0.tar.gz 11721 BLAKE2B 70065c7ee463ca097ab2298767e2cf39693c18aad7eb154589930f252e8129795b59018114fc0e5409c788c3fc88a2e1686da02b5fe65c908c50609f6bfd0a73 SHA512 90818ec5bbf91ebe67ae9d079a695de2520c48b93cb7344e003f1b85963a6bb64addc15f1d5789b263b13a390b03c1bb49efecb52bc3de2d4b6988dad96d0626
+EBUILD genvalidity-hspec-1.0.0.0.ebuild 810 BLAKE2B efd8e70804d9b64d3380955cc061e5341588bc9e39964f5c20bcd27056ce6b2463b21fa1b25eeb75e54a8cd7d9d4f6992ef13aa06f9e7392c23576f66c3cd32b SHA512 a4409b3f817a91a58eac5d03bf2003e8c2cbb015f7ba80a9b65dcdcff7aaaad936841343e4421ae0063e882a472fa572e060ded71b5fbcd90948b74ed093d1b5
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild b/dev-haskell/genvalidity-hspec/genvalidity-hspec-1.0.0.0.ebuild
index 803a16b0fd27..70a1f08184c9 100644
--- a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
+++ b/dev-haskell/genvalidity-hspec/genvalidity-hspec-1.0.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,17 +14,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND=">=dev-haskell/genvalidity-0.8:=[profile?]
+RDEPEND=">=dev-haskell/genvalidity-1.0:=[profile?]
 	>=dev-haskell/genvalidity-property-0.5:=[profile?]
 	dev-haskell/hspec:=[profile?]
-	dev-haskell/hspec-core:=[profile?]
+	>=dev-haskell/hspec-core-2.5.0:=[profile?]
 	dev-haskell/quickcheck:2=[profile?]
 	>=dev-haskell/validity-0.5:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
+	>=dev-haskell/cabal-2.2.0.1
 "
diff --git a/dev-haskell/genvalidity-property/Manifest b/dev-haskell/genvalidity-property/Manifest
index 8389f40ae4b8..91ae3544fa4f 100644
--- a/dev-haskell/genvalidity-property/Manifest
+++ b/dev-haskell/genvalidity-property/Manifest
@@ -1,3 +1,3 @@
-DIST genvalidity-property-0.5.0.1.tar.gz 10723 BLAKE2B 520af5982119d2df2ebcd4bfce1b4378500c48af1fee95c212d5bae13e958eeb28dcc50aa3e0fd7358e74f0d98ac8da4d72f8198ccf90095fca7a8bced3bb528 SHA512 a50b3cb28cb843bfacff8b1a2248fc6e80ea1667518955a0d8479d607017f45ff99eac71be6797e232e9d6f08f6bfeb3ce00b346c9a40d2cf9da880d84f29add
-EBUILD genvalidity-property-0.5.0.1.ebuild 799 BLAKE2B 5551fad258c5123a76ad28f6939d7d25c3bd53b0d8f7fa57bcdd403c062de77306f4e2ea3486a325309da352199b1c4c9410be8a3901751f61ff122df2f5f80a SHA512 4928ccda62e358fb63bfe7d12a7a6109f9b7af107f431eb4766cda883a184443b7afe335d698ea260beed4d10cddd4643fa549e0fe155e1a480caac548212489
+DIST genvalidity-property-1.0.0.0.tar.gz 9333 BLAKE2B 4236156a04abbef4924e8e725f7804a80caee9ecc0672ad0e695390ee50aa29d1b32272472c6df0d6479f0d27c9bbf36b8642123d367c97199e743d7f1f1cfab SHA512 fdb11224baad570cc91762ade0a09be924547df0cb6d3438463e17d981ac8298052051f3dc3df3ccf17386eb12e47cf68a218d4374d806f709df106018fd290c
+EBUILD genvalidity-property-1.0.0.0.ebuild 769 BLAKE2B 15e0f9ddd872da87387d2f3e12463bcc63f39f1115688aeb7a6216b9e18bd6c779ebb1c2480593798838c8bddf9e6c5d9c1572db1bac1a2be08d9f41fc2de424 SHA512 3f050c31b5d0b457fbb8fe2e11bc62d17dbb58317beff1ed23fb383889ed24f8af1a4ff641b99f87a5f7dce3c935d2d326e39f86ed08a8d3da5fb7f6007b9813
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild b/dev-haskell/genvalidity-property/genvalidity-property-1.0.0.0.ebuild
index 5af378911aee..b644a45dab26 100644
--- a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
+++ b/dev-haskell/genvalidity-property/genvalidity-property-1.0.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.3
+# ebuild generated by hackport 0.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,17 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND=">=dev-haskell/genvalidity-0.7:=[profile?]
+RDEPEND=">=dev-haskell/genvalidity-1.0:=[profile?]
 	>=dev-haskell/hspec-2.1:=[profile?]
 	dev-haskell/pretty-show:=[profile?]
 	dev-haskell/quickcheck:2=[profile?]
 	>=dev-haskell/validity-0.9:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/doctest )
+	>=dev-haskell/cabal-2.2.0.1
 "
diff --git a/dev-haskell/genvalidity/Manifest b/dev-haskell/genvalidity/Manifest
index 1d9d611b0491..beff3cfcddca 100644
--- a/dev-haskell/genvalidity/Manifest
+++ b/dev-haskell/genvalidity/Manifest
@@ -1,3 +1,3 @@
-DIST genvalidity-0.10.0.2.tar.gz 14421 BLAKE2B 60dde212f779123677ccbcbc45297602c99a3d55e4ab5c38c8d784def8b3d4d748d86d85118c3be91fa5f2e7400f58b617164f614cb3769cc4434aa4a1326a38 SHA512 67e89cee72fc5c6017e4862bf88506683ba8f26eb786fb8c7972454b44344cf2885b04e24b29e72fe1c16ff3f25330fbcf9b979fbd99d1e23e7e146336c005e5
-EBUILD genvalidity-0.10.0.2.ebuild 736 BLAKE2B 88cc13b972612b8d6397421f59adeb20567ae64ab5ee506905cc78803063c7bae721dc6bbf4448882eb56c12770c1d1e5d19b3ffd0dde8b80e47181973c88259 SHA512 f8d12cc9fc1ac9e35679e6049b4bd7a3fe5e93ea0ff447ba9c74c9dfc7e39f038b41ec5e1ef5f4e7be3a720ca45698d9c2a50ce37cec4b8e96cb6513fd807673
+DIST genvalidity-1.0.0.1.tar.gz 12074 BLAKE2B 91a99130c446bbaab556230cd525adf9f2d0be8f04517428e088aadaf5dad30be411a5d22430fad942a273c706a5ca41fd275a19a12589c121d9003b57a25495 SHA512 520122e67b3b95798b9701cd090a80886efd4f029f1a7f54b76adf427d8e457ed3eafa1d3fd4d40b5456ae592cd9153e43f8ed2ed52b014a9f5b66de02f8b01f
+EBUILD genvalidity-1.0.0.1.ebuild 741 BLAKE2B 94232392b9bd132b696020316b51e5c49fc7021e7a90a3db6a50ec2ff13be722dea2e37ce8bdeb8dd96bdc19723740834c0783ca7205563581a88221ff801b52 SHA512 251c62e564baaa06a185b044d837a6c31174bfc09d884e7ec4948d2d6e78f7b856a3c6074a55ecde0f387a9038d8d49346f0140b0633fc038ed3464eeb8ea39d
 MISC metadata.xml 535 BLAKE2B cc4280a98e56ead3041b3f16195456e8a5aafea01068fa6a97f19b2ff2f8051db94501e3b5df45ce6f4755ebec0a663f425ac47136c49f89a82718dcd8269821 SHA512 863281a519c61123819fe8cd84aa7271f906c2021d317a111bc51b70ef0cae51faad5bf394a0090283839b4f96aa6254dddca59977baa07de44c7781f2942e72
diff --git a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild b/dev-haskell/genvalidity/genvalidity-1.0.0.1.ebuild
index a8b688efd42b..fe16939bdb02 100644
--- a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
+++ b/dev-haskell/genvalidity/genvalidity-1.0.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,16 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/validity-0.9:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
+RDEPEND=">=dev-haskell/quickcheck-2.13:2=[profile?]
+	>=dev-haskell/random-1.1:=[profile?]
+	>=dev-haskell/validity-0.12:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
+	>=dev-haskell/cabal-3.0.0.0
 	test? ( dev-haskell/hspec
 		dev-haskell/hspec-core )
 "
diff --git a/dev-haskell/git-lfs/Manifest b/dev-haskell/git-lfs/Manifest
index 8dca6883c5d4..7eb7f8b7fb49 100644
--- a/dev-haskell/git-lfs/Manifest
+++ b/dev-haskell/git-lfs/Manifest
@@ -1,3 +1,3 @@
-DIST git-lfs-1.1.2.tar.gz 16802 BLAKE2B d183dbaaa4cb72dd500b43d75ad3769847c9278adc0eda33679f51a746753d81cea253ddece5ef84172cedaa0e7410c3065ea293c7fcc869e95312401602b2db SHA512 ea4b72dc33a1e7012be984bdca34f45767db6da3ae4e5190addc05a81fffe1f78f25d650b633ac911f28057e6f62cb99fcaa7992fbe9a20dcf4b4e475d7d62a0
-EBUILD git-lfs-1.1.2.ebuild 878 BLAKE2B 4abce0f4740ca42d15b80a760ee3b566a6e5592259d3448283f3bfc99d4004b301ca56c92fc014a5f360b467f7eb34ae71a0606a202218e55e2456cb1e697d65 SHA512 e2822e8ded4e0622fcf1b77f5fe0271a716604f73ed52b833bfd568536a05670653fc90a13f14db7f036dc5ea1dda81ceac4d84dd6443a247eedfa128c21b02f
+DIST git-lfs-1.2.0.tar.gz 17277 BLAKE2B 6f9fb460dc7413e5a8a89a560f437a986c6d9cd140d1c4479cb1a8becd2aa478575261d83a3889167d26fe004a59af7b9c9364f3e2a2e15f08e22630b9d004fb SHA512 13d8c3c7c9844e935af278b4b6dc477b4ef069a3b61a5fea5bf28aadbd3ca4b475aa23701fe7be8a9468af78771d1fabda3e74c5d4b9a3fbb77ee8b803198f65
+EBUILD git-lfs-1.2.0.ebuild 885 BLAKE2B 4ffa1d41a05e6b7e3fb18a66048487d1b18821ce6ca67d64da40a723703b22c50433a0e2d3a2a7d9f4ed5999578bb4e20c44f9538c8664bec9c646ab81624fa4 SHA512 ada616835fa063e06a0c61fa1e258d622ee7b8561ecabea4019e9e913aa49c13736c3aa1b53fa8f1a940bb1a6f6f7f372dee9194df8e01153ef594f078e711a6
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/git-lfs/git-lfs-1.1.2.ebuild b/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild
index 51e56239689c..2ab66ee62505 100644
--- a/dev-haskell/git-lfs/git-lfs-1.1.2.ebuild
+++ b/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://hackage.haskell.org/package/git-lfs"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/aeson-1.3:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
 	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
diff --git a/dev-haskell/glob/Manifest b/dev-haskell/glob/Manifest
index 300abd98347b..53ec7f1d85aa 100644
--- a/dev-haskell/glob/Manifest
+++ b/dev-haskell/glob/Manifest
@@ -1,6 +1,4 @@
-DIST Glob-0.10.1.tar.gz 29763 BLAKE2B f0618d9b230037d9f6aa52d24e2d78f7220136b0da4161dc64b7cd777835fcc5a6da963725b935d8c4653704eaf3534d50f6dbdae6e19f1bd095447937de4595 SHA512 b2b2ee93f2cadf01f8a6828b9e742a241601f5fada1f73388dc0044f8e0985c601bd6a42738c60c54eecb619b6289ac1302751d8e2402f6494aaeb2b2a4abb42
 DIST Glob-0.10.2-rev3.cabal 2938 BLAKE2B 52a1600d5eaa09126757fdc00e009708e9c3d8408523535835f8598906e24aa0590114aa75fcc5e57d0ebf6d38a2a387650824b7eb2f8ae7b79fc0f62eba0912 SHA512 8802d8cd4d19a5ffa4dda9fb55d3454de762f2701d9cc720d5a0841848a736b2470e67a9fb19a5756bd69dd89c3fec20b38466fa49d7ceb5af7ba10bf6c165da
 DIST Glob-0.10.2.tar.gz 30226 BLAKE2B b729e1b3e36d2161db185b882dcc2d331f35a284f89cb149a9210c082b1c11a3cbced76f299348a511ce1a32a5df0acdbfd4222145c62ac6e94536030f88ca70 SHA512 cd3c3fb00fad3b3e8d9ae2856a76d0d1688885ecec0b083eed87a4c1cf46111df747e66ff3e8bab2ffaf2a5f776a791442c7e0eefcf58f9d1e15e341b4c35a12
-EBUILD glob-0.10.1.ebuild 1192 BLAKE2B bf008db0c479a7d2d1ac99ad0a035ad539c0cae96890a6cd5086e2c9868c51bc2135903adcaa5f931ae48a2d5e48bcef0a2d843e0a9263312c4883e4deab679b SHA512 69255739955307a65ed8e54728eb092c78aa9712a6c17b74eeacfc403cb7d8ae346fb25e499bc5cc858aab5173bc72a7e4c5c0317ca519622752227fc4d64ce9
 EBUILD glob-0.10.2.ebuild 1397 BLAKE2B ae78490514afbf125ebe24a6fcbf121c5e61a187b001e6428a1026ac5be97b9af9e16520668cd3b407e88d8dac41d0ff1dc738795af5b98218190518243f3c2f SHA512 ec74d59d448564d338017d41729e563f6d49492437e1e775d29252c92db67303242ed4d3a1abdbdf00b8c1cdb4f2419c765688f13858701941cddeaa920e2d6e
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/glob/glob-0.10.1.ebuild b/dev-haskell/glob/glob-0.10.1.ebuild
deleted file mode 100644
index 0f8f8bcf04d3..000000000000
--- a/dev-haskell/glob/glob-0.10.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="Glob"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Globbing library"
-HOMEPAGE="http://iki.fi/matti.niemenmaa/glob/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/groups/Manifest b/dev-haskell/groups/Manifest
index 9009a4f1bd87..f2821369e712 100644
--- a/dev-haskell/groups/Manifest
+++ b/dev-haskell/groups/Manifest
@@ -1,3 +1,3 @@
 DIST groups-0.5.3.tar.gz 3396 BLAKE2B fbd87c5954550de266fcbe176d631577c22ad468a061b01f295d21fb8fcf1b9f218489ffe0962a7b9b04e0a5a2ddbc911158eecd6a4d4a0b0a562a70da8afa1d SHA512 5601e9c44d742dd715016d9d4f69f5033aad332c2a5b47d6e79d51e437d3166b6e8bd975f7e4b44acf6cbf1eb5a1fae021ddfd2058c6cd00b25030f0d7b70387
-EBUILD groups-0.5.3.ebuild 538 BLAKE2B d2228ff69ca0d016752cad97ab87bfd5e380f9b447eac59472a1f092c2f2295f87db470367303006d75d3a7f6d2612248cbc677407b14fef4e9bf5f202d3d90a SHA512 4e9d05256657b6d0cd49f6fc4597e8ed30819ba94bf38bc2622f83a0fdbb28074bdbc46220b3813fda30c2b79d6f463382eacaddd39c5781664181957a8b5fd6
+EBUILD groups-0.5.3.ebuild 545 BLAKE2B e651166a64814ccaf7f57658cb2672e3c17c30305bdffda31bde38ce0addb62d4aac5257bd5ecf829bd3770ed5a09ead4aca83ebdbc8358600041c16958e9011 SHA512 cfc1efb40e9fff3b4c3bf5bab281273643eb29cb8f4bb4c0a91de1224f59a5c18631671a08f3ef1d7b393317ff223b9b195cc736a40eb3b5793b519328d7c392
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/groups/groups-0.5.3.ebuild b/dev-haskell/groups/groups-0.5.3.ebuild
index 3a1556e50030..01d0900ac58b 100644
--- a/dev-haskell/groups/groups-0.5.3.ebuild
+++ b/dev-haskell/groups/groups-0.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index e58432e09650..98e086117b4a 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,3 +1,3 @@
 DIST hackage-security-0.6.1.0.tar.gz 86243 BLAKE2B f28651d9c0506e4e1b9085e1efd6647ad3dd0dea4fcec2823f3072504831e7d01be34f6a14619cc352ef236214a1fd7073449f00c82c8f7ef5e95cdca1ad3133 SHA512 0a303e8c594a5fef52bf95f3ff75379aeec44fdaebc6ba78da8bf7911798040b43c3c289f0c4d7bcd2c1903d82c29d5ffa012360660c3548c0f3fb4b719a9327
-EBUILD hackage-security-0.6.1.0.ebuild 2324 BLAKE2B 4b788fcb42e4b375dd7f001f3fde38a080ad8e3f6eaf11c90e4ef13b4632c3fd3ee089b1158e64271115e1d0f556f6fd5b8ba685bdc3b0a6f94e7c370a3f0b97 SHA512 86a65171444ecf1a46d2cac5d5be960e16aac7df6037114e74232669475b14515912e6ed7bd0d624aa71e708324e59b804982795b314a62e0cd982d4e3817b59
+EBUILD hackage-security-0.6.1.0.ebuild 2331 BLAKE2B e10a26a3dfe8522896d8c8cfe5ff0dccd59bc9722c730b03ac3f6d1ec5b05c3e50c626249b0097936b4a7beb10a4e79e2c2d02600defdd3a2c9a8109ea71fdf2 SHA512 6012c7f747ca6cf371b977d9d3ea51d0bdecd3d39bc256804f715a6fc597b4f9f02be6fa91a4464c2c82f2782be103e358364387a5976e90186eb11967119210
 MISC metadata.xml 358 BLAKE2B 12d49d372b9d972b090959fa4386cd071450c6c038d3cbe5adc0b2ff5de41de6fc422cc0063382c84dc1a2e188e3eae64e2ce84504587aff452e4fc11d895b2f SHA512 ad8b0b471b64cc9dec807c71d5c2cebea90558a51794c36cff68b30c65e9f8d3f5f965c660a989e1c0a98636c2670926629913ab5b8916524609ceed4a47db91
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
index 3923c2735456..fd148c49f7e8 100644
--- a/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
+++ b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+lukko"
 
 RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
diff --git a/dev-haskell/hashable-time/Manifest b/dev-haskell/hashable-time/Manifest
index 4e25f9a23393..fb1216f2cb2f 100644
--- a/dev-haskell/hashable-time/Manifest
+++ b/dev-haskell/hashable-time/Manifest
@@ -1,5 +1,3 @@
-DIST hashable-time-0.2.0.2.tar.gz 2180 BLAKE2B 194e3d4e9bcf7c9b0d8a97a210bebee91e0f22ccf76e8726b563baa2380751447a655b12eadb63a29f191e093925ebe9bf9c31c29ae01077f6e9e287f61847ad SHA512 38ade3c808072cc1488e0f68d054891576c781d33f7151721dae9f994833723b7b30e92cc77750e91929ce9cd47753a8b1d8157845d7c972f1bdbd44b3094c0a
 DIST hashable-time-0.3.tar.gz 2240 BLAKE2B 328aa39a575f4f356be83adaa29f42e145c68df0e9a25c38c5ca44f1f8af5cb3c434994412f9602c30469fb4ac22a6ab462e57b2b470b801d59f0ce4bf4f6d91 SHA512 c6715693b55892beab59820e0dc742ddbf3c8b75f3bc4994b90175f4220da841aa514b34e08e5f58971fb523fa75cc2da59f5bb37c7e7744d6de6eacd7c27b51
-EBUILD hashable-time-0.2.0.2-r1.ebuild 852 BLAKE2B a81ca4b6b47f7a355a74c9caabfd0a100bef9d6ebf054b702f747cf0e5701336415557bd7b14329b619af87c5aa2b279102ef2a5c8dd1aaf6fe27441b90c1fc0 SHA512 dfd945efc3d82b9b32e63043c9922a22dc44422ad7a13756820eae7464b0e77004d6a4f6dce588707e1383d81d6af64d7cb9fb731065496f6c7e1c2faeb061dc
 EBUILD hashable-time-0.3.ebuild 678 BLAKE2B 206c12d0e73ec23d3257f80da8b5094331845942f53379b7d099e5dacfbfe7f6176142bba529bc1cfcc20b9ecc85b96696aadd9a50f91f12a2511335665dc12d SHA512 1274e27c0adb3782c14627e0e7a1f6a5657bdd0622cc1ac9b745acc162f5b3b2fe1b22b897302076a973aa9e9c5156128f0a8e4ef94e02531c3b129205189c6c
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
deleted file mode 100644
index 72b81da8323a..000000000000
--- a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Hashable instances for Data.Time"
-HOMEPAGE="https://hackage.haskell.org/package/hashable-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.7 && <4.13' 'base >=4.7' \
-		'hashable >=1.2.3.3 && <=1.3' 'hashable >=1.2.3.3'
-}
diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest
index 7436cf79bd95..0349ea79b5e2 100644
--- a/dev-haskell/hashable/Manifest
+++ b/dev-haskell/hashable/Manifest
@@ -1,5 +1,3 @@
-DIST hashable-1.2.7.0.tar.gz 30182 BLAKE2B 7dee78e531fb396c51531f7b239f45a316bad3494590684b13814894a606ab8ddf7ef85a2027f26eeddad0a38f2c06a8a16d03b1b67ce009f9e8aed6cc872232 SHA512 41accac8fa38ab5c243caa058deaf31644d4df670520010d0d593e84fd42970f3fe2d4e945a31ac5491050467e843c7bdb299283a4c6d1446dfcbc2dbc58eec7
 DIST hashable-1.4.0.2.tar.gz 25528 BLAKE2B a9d219ce08db64b2bccf691f26ea5e248785ac3263ce1045eb612d2deaf51baa5f0b14270a9810aa1d32193fe9f52b26c2ca4fccb94b98e2ccdcb0b6ba6e8a56 SHA512 a8cc2b7cafa8f18d9a74490d2dff7edf12901b7c40ca0c1881af579695135c1ca7629347d34d0c7dc662078d7669d5d6234bd889c1f77f344297942243fe7dda
-EBUILD hashable-1.2.7.0.ebuild 1236 BLAKE2B fb61e392041caf8415e4bc7099e39d0af4f8fefe7d52ec43f3bd20df169735927bf94214b5393475e7a3cbec98eb26c70e95ccd7741934eb769887963c97c7d9 SHA512 895e0ba34c4c91e33aa2ab89d370f3b4e76abf7925c8ca4a97fb4c1a9fab36de96112d542a722fc73f7c261fb206e6feb6be282e498485a20dc38ceb63b0317e
 EBUILD hashable-1.4.0.2.ebuild 1169 BLAKE2B 5d1fd19cb56da8a2ae5c70991358217f4e73382b1186267aa7a1b7fee75a4e0b0739420b2edae6c973d01fa3c37315561e88ed35ff259e7290096ef7110d5091 SHA512 573ed58365ed37daa9b11cf3968c203aa9d2fd60d035720c9cfbb0c4edfd535827c43dc79570b1f5c1453993380aeefad8a998e7838c590459dd0196557c1a03
 MISC metadata.xml 620 BLAKE2B 96a75145d515eeede8ba0c3d62af5af520664968c9260660ad615ce465c0e560dd9613f0e0e826731b84f4d8d0149f819bb3a620315325a75275f9007e9ae033 SHA512 dc8d316a0eed1f5a656c22b03fae938d6383a1417c4db9e1cd53f7291d030bf3941f187f57219a0204a1013f5b4e08f62b67d5e03a5f6bedd7402b8cb758492f
diff --git a/dev-haskell/hashable/hashable-1.2.7.0.ebuild b/dev-haskell/hashable/hashable-1.2.7.0.ebuild
deleted file mode 100644
index dbcf2526b0c2..000000000000
--- a/dev-haskell/hashable/hashable-1.2.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depend
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types that can be converted to a hash value"
-HOMEPAGE="https://github.com/tibbe/hashable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 examples +gmp"
-
-RESTRICT=test # circular deps: hashable[test]->quickcheck->semigroups->hashable
-
-RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.4 && < 4.12' 'base >= 4.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples) \
-		$(cabal_flag gmp integer-gmp) \
-		$(cabal_flag cpu_flags_x86_sse2 sse2) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41)
-}
diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest
index 4c89bee32a69..ea3e55572716 100644
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@@ -1,3 +1,3 @@
-DIST hashtables-1.2.4.1.tar.gz 58425 BLAKE2B 1e7d0e0f80e2e8ef17370f7019f802989c12eb7a7e340cfac44fa4138baa105985846262b0d5eeb1f59ee21d27a5036dce9c45623fecf6ecdf319ed8d4e36bc8 SHA512 e88fb8f9c8a51be31e5d07ca1fef3d1a05a347942878f84a500d8c224b1118a2be97f9a947f17834a8331f296f302eafeef34d1f151360361675ecf5204b38f6
-EBUILD hashtables-1.2.4.1.ebuild 1574 BLAKE2B 025ec4927d92f9b0b71a6f69bb80bc977a85f0c3b20c2b765c675797c0ce8382097e31ea35a9648e7db81123cf666df5db230d9b66d2a5de339977085d7f9766 SHA512 660f7e436099477f5dd89aa3018c133b88994a03a135b93b96138620651256f1832cb48cee84db45ffef2826263e9691025d5e1cffae402ddd749d849c55d18f
-MISC metadata.xml 4982 BLAKE2B fbcbf2f3265a707d5e21d0e2e20000d15f155e080a9058336273c8ad0650c4fc76770a2654c7a66f4ed3f34c91a9ad65e738d44d136c99ce011532485482588f SHA512 675452507f1b746c1cc9edb068429d27613c6f5fca1f31fc6a45351161f66738df038592854e3ed73801b7c08973eae4c13402ef7caf50645fe550ef4ed5a396
+DIST hashtables-1.3.tar.gz 58599 BLAKE2B a0ce2ecc6b91c3b1c46759ef7e6a067b6872998d7fbecc22e8ee84bafc80bd5b7e286100c3c906a0b60ae86bceafb2cca7717081f347790d70c47e164aea9800 SHA512 7fb82e7c45c13d7bde8a216fb678d20bbd4c970f7860cbc2f08fb5524324f6b9584e1b5d397bdcb3fdbf53928758b608986167bb2bc2f1adae6feb3b0dd94444
+EBUILD hashtables-1.3.ebuild 1555 BLAKE2B d238fe3f1ce51fd50e0c576922e1b8eeb2d3f801348cf6ab6f7f144992c6f0b981f78855585e35e41a521827b3bd879a3ab74a2906cafc21382a0e147cdabc04 SHA512 ad4aa5ce49da29a232ba3b9569094bca2b2d21dd9c86afdb1f9dd2ea3fcdfea97e23fc5f4f69fb223872d5e6ffdf846826a2f055c5fead2ebb86f96d4ad5d731
+MISC metadata.xml 447 BLAKE2B c991b1240987728e39457ee74db6fc0cc9e45af88315e363ed093229d8d473767827b1bf047c262f2274e6d13f31bfc7261d83af7dbc26cadf4ea64009ecb2b8 SHA512 0d9827b54886393fa50594252d5727ae8a59217730022544f2e763f58ef336bf042f09bc69fd4db7804a0d5b4ceef80ebde134dd16b52ae098a9a8cc654444b5
diff --git a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild b/dev-haskell/hashtables/hashtables-1.3.ebuild
index b4558c556890..d3059c57ed9b 100644
--- a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6
-#hackport: flags: sse42:cpu_flags_x86_sse4_2
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: sse42:cpu_flags_x86_sse4_2,+unsafe-tricks,-portable
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,16 +15,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling portable +unsafe-tricks"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling"
 
-RDEPEND="dev-haskell/primitive:=[profile?]
+RDEPEND=">=dev-haskell/hashable-1.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	dev-haskell/primitive:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
 		>=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16
 		>=dev-haskell/quickcheck-2.3.0.2
@@ -38,7 +38,7 @@ src_configure() {
 		$(cabal_flag bounds-checking bounds-checking) \
 		$(cabal_flag debug debug) \
 		$(cabal_flag detailed-profiling detailed-profiling) \
-		$(cabal_flag portable portable) \
+		--flag=-portable \
 		$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
-		$(cabal_flag unsafe-tricks unsafe-tricks)
+		--flag=unsafe-tricks
 }
diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml
index 86c607e5ac2e..6f84b90b37dc 100644
--- a/dev-haskell/hashtables/metadata.xml
+++ b/dev-haskell/hashtables/metadata.xml
@@ -3,107 +3,10 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a couple of different implementations of mutable hash
-		tables in the ST monad, as well as a typeclass abstracting their common
-		operations, and a set of wrappers to use the hash tables in the IO monad.
-		
-		/QUICK START/: documentation for the hash table operations is provided in the
-		"Data.HashTable.Class" module, and the IO wrappers (which most users will
-		probably prefer) are located in the "Data.HashTable.IO" module.
-		
-		This package currently contains three hash table implementations:
-		
-		1. "Data.HashTable.ST.Basic" contains a basic open-addressing hash table
-		using linear probing as the collision strategy. On a pure speed basis it
-		should currently be the fastest available Haskell hash table
-		implementation for lookups, although it has a higher memory overhead
-		than the other tables and can suffer from long delays when the table is
-		resized because all of the elements in the table need to be rehashed.
-		
-		2. "Data.HashTable.ST.Cuckoo" contains an implementation of \"cuckoo
-		hashing\" as introduced by Pagh and Rodler in 2001 (see
-		&lt;https://en.wikipedia.org/wiki/Cuckoo_hashing&gt;). Cuckoo hashing has
-		worst-case /O(1)/ lookups and can reach a high \"load factor\", in which
-		the table can perform acceptably well even when more than 90% full.
-		Randomized testing shows this implementation of cuckoo hashing to be
-		slightly faster on insert and slightly slower on lookup than
-		"Data.Hashtable.ST.Basic", while being more space efficient by about a
-		half-word per key-value mapping. Cuckoo hashing, like the basic hash
-		table implementation using linear probing, can suffer from long delays
-		when the table is resized.
-		
-		3. "Data.HashTable.ST.Linear" contains a linear hash table (see
-		&lt;https://en.wikipedia.org/wiki/Linear_hashing&gt;), which trades some insert
-		and lookup performance for higher space efficiency and much shorter
-		delays when expanding the table. In most cases, benchmarks show this
-		table to be currently slightly faster than @Data.HashTable@ from the
-		Haskell base library.
-		
-		It is recommended to create a concrete type alias in your code when using this
-		package, i.e.:
-		
-		&gt; import qualified Data.HashTable.IO as H
-		&gt;
-		&gt; type HashTable k v = H.BasicHashTable k v
-		&gt;
-		&gt; foo :: IO (HashTable Int Int)
-		&gt; foo = do
-		&gt;	 ht &lt;- H.new
-		&gt;	 H.insert ht 1 1
-		&gt;	 return ht
-		
-		Firstly, this makes it easy to switch to a different hash table implementation,
-		and secondly, using a concrete type rather than leaving your functions abstract
-		in the HashTable class should allow GHC to optimize away the typeclass
-		dictionaries.
-		
-		This package accepts a couple of different cabal flags:
-		
-		* @unsafe-tricks@, default /ON/. If this flag is enabled, we use some
-		unsafe GHC-specific tricks to save indirections (namely @unsafeCoerce#@
-		and @reallyUnsafePtrEquality#@. These techniques rely on assumptions
-		about the behaviour of the GHC runtime system and, although they've been
-		tested and should be safe under normal conditions, are slightly
-		dangerous. Caveat emptor. In particular, these techniques are
-		incompatible with HPC code coverage reports.
-		
-		* @sse41@, default /OFF/. If this flag is enabled, we use some SSE 4.1
-		instructions (see &lt;https://en.wikipedia.org/wiki/SSE4&gt;, first available on
-		Intel Core 2 processors) to speed up cache-line searches for cuckoo
-		hashing.
-		
-		* @bounds-checking@, default /OFF/. If this flag is enabled, array accesses
-		are bounds-checked.
-		
-		* @debug@, default /OFF/. If turned on, we'll rudely spew debug output to
-		stdout.
-		
-		* @portable@, default /OFF/. If this flag is enabled, we use only pure
-		Haskell code and try not to use unportable GHC extensions. Turning this
-		flag on forces @unsafe-tricks@ and @sse41@ /OFF/.
-		
-		This package has been tested with GHC 7.0.3, on:
-		
-		* a MacBook Pro running Snow Leopard with an Intel Core i5 processor,
-		running GHC 7.0.3 in 64-bit mode.
-		
-		* an Arch Linux desktop with an AMD Phenom II X4 940 quad-core processor.
-		
-		* a MacBook Pro running Snow Leopard with an Intel Core 2 Duo processor,
-		running GHC 6.12.3 in 32-bit mode.
-		
-		Please send bug reports to
-		&lt;https://github.com/gregorycollins/hashtables/issues&gt;.
-	</longdescription>
 	<use>
 		<flag name="bounds-checking">if on, use bounds-checking array accesses</flag>
 		<flag name="detailed-profiling">add detailed profiling information to profiled build-depends</flag>
-		<flag name="portable">if on, use only pure Haskell code and no GHC extensions.</flag>
-		<flag name="unsafe-tricks">turn on unsafe GHC tricks</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">gregorycollins/hashtables</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hjsmin/Manifest b/dev-haskell/hjsmin/Manifest
index 4b6733ddda2a..55a00e300f0b 100644
--- a/dev-haskell/hjsmin/Manifest
+++ b/dev-haskell/hjsmin/Manifest
@@ -1,3 +1,3 @@
 DIST hjsmin-0.2.0.4.tar.gz 5233 BLAKE2B 839cc956a7dad0b958a12f9e9ca45dfeb2c64ef35f6e746747a01d1bba771edc229b9822c9274a67c1fa483da64f94e500644b77b9d90283e1feb56975d0badb SHA512 11534fd3f351cb1b73e9f166ee42737eb31c10f8f49b2b8d593f9a5a07d08d6b070f71204ec41257d02f38b0dc1172f48bd95d59b553b9f602b90018a795b07c
-EBUILD hjsmin-0.2.0.4.ebuild 847 BLAKE2B ceb384ee937b3c32f803a101e069f48fca31aaf477395dc5e5ef1d9d25bf27e17be795dcbaad87692c9a167e58c7effc8838b21d1b8635010dcfd3c335280840 SHA512 1f6815430f952ea34c62457af9c2f230102716e0c783fe3ec54d8f92c51507dbcd6402344f4f3a84db0d2ca4f1a8d74079dcf7db323739d926571f5cc7c7b794
+EBUILD hjsmin-0.2.0.4.ebuild 854 BLAKE2B 4d55b8e9b90670d4753b1e76f70005dd11fa1f883acf8f500f796a5785bede46b904c4de3b92d0cef9b3c790fa17faf414a00c7dbcd4c390f353370884b30450 SHA512 c86ee2d8127a39246754000c064162d62aec0d9b70d3a0fba1610493103344cf45443e9711b9be6f7b071753d14f4a7812d9750a27307c8e8d2e8f0b17fc55a2
 MISC metadata.xml 504 BLAKE2B 13d6ca313751303af3521c7143a59fa49a2ff0362e48e369bdf1a8fa7f058a766d2422643586bd6cd2529877f8ab8cda78ee88cb8c2c37b49752666ea757f44a SHA512 0b3424105c0b30033427a4c9d88eedf67ea6130f5099a2b07d493c49223915cd87fec0772bc96cfdd6918c19a2191a3ecafcc2b6448fb82a1e713ae33ee6d4b6
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
index e74f3c315fb3..7e17d678b59c 100644
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
+++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # Requires network access?
diff --git a/dev-haskell/hslogger/Manifest b/dev-haskell/hslogger/Manifest
index c63a7eca61aa..2fca3e6c437f 100644
--- a/dev-haskell/hslogger/Manifest
+++ b/dev-haskell/hslogger/Manifest
@@ -1,3 +1,3 @@
 DIST hslogger-1.3.1.0.tar.gz 37468 BLAKE2B 24bb750c356f071ee35cc84e01b2483f612b6e7403fe8fe60b8af148dba43107660a36a0e30305666fb76af1939ff00f6817dff98720ab7eef321192e6e87976 SHA512 a08e7c85efe2b3f97e87b54db993f78ac31380f9b6f8d926517854771f482b2c64c358ddd12a449a413e5af0f374c034161b6f772148835b50551dc2cdbfa15a
-EBUILD hslogger-1.3.1.0-r1.ebuild 1308 BLAKE2B 73891c296306463996fbaf192a9aefa8e0b2e49a170159bd4d6347ce87d07fb6787ef8d1f6b1ae0889257705759efe855f1520466f817f7212d65daf5e02c442 SHA512 87fb214c0a79eb0280fb6a1db873fd3d66f50645643f0bfb591cbc455eafa75585dbbf0a9f0864c5707f4b35df3fefd1b0146e8169901c65d433c86b595cdd47
-MISC metadata.xml 775 BLAKE2B 475be3f4eee76193d6b8c432dfb78d39a772a4ed96832fc3ec4d4e5de3cec49513a7b692dee22625b03084498c5f318ce77ccb9ca83906b36a5aec3aa4dfff79 SHA512 635bc1b66cd5882b4f244e4a77e5fa90fb95d5a26fd6a67a0aa49fd4e3f2c1a71b87f81300e0056b69c93281c64f4053d5155158220c1d150cf5f5dec7431e7a
+EBUILD hslogger-1.3.1.0-r2.ebuild 1124 BLAKE2B 46038b24a7a0a49372fd701542e533b1e6ff6e8c3060376d64656bfa22f165175e9425748106384650416d86ee94356c48bfbfbbce24937653040fd86f64f0fa SHA512 6095ed85f1ae8fd31656e4066823331e59886c628cff15161cb242b4b3ded829d27fe013d02cf264df4daa8c7dd6055d1c5def1d6836b269b49c6c295d64a6bf
+MISC metadata.xml 630 BLAKE2B 11d2a986cd31d758bff8b7412112a2c3bf3dcc60f25260332e26d89365453538ecc0be44a9dc62e217135f9ff59697ccac4896e1f1dc4dd3abd2b5d620bf4d51 SHA512 548c86396cd351db44bce714c7f2c287d8836e7d523f2b55cc841eba5ba09f953b2172ac8c1b9f3247d685790620d38b5f388eab59ce836bb83d746154039a35
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
index b91fd077bbf5..7bf1e26b1cb7 100644
--- a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
+++ b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -test,-buildtests
+#hackport: flags: -test,-buildtests,+network--gt-3_0_0
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,19 +15,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+network-3"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 
 RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
-				>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
-	!network-3? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?] )
+	>=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.12
-	test? ( || ( ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.4 )
-			( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
+	test? ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7 )
 "
 
 src_prepare() {
@@ -40,6 +37,6 @@ src_prepare() {
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-buildtests \
-		$(cabal_flag network-3 network--gt-3_0_0) \
+		--flag=network--gt-3_0_0 \
 		--flag=-test
 }
diff --git a/dev-haskell/hslogger/metadata.xml b/dev-haskell/hslogger/metadata.xml
index 7ea7e95faf7c..8aed04d90153 100644
--- a/dev-haskell/hslogger/metadata.xml
+++ b/dev-haskell/hslogger/metadata.xml
@@ -5,19 +5,13 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="network-3">Use network-3</flag>
-	</use>
 	<longdescription>
 		hslogger is a logging framework for Haskell, roughly similar to
 		Python's logging module.
-		
+
 		hslogger lets each log message have a priority and source be associated
 		with it.  The programmer can then define global handlers that route
 		or filter messages based on the priority and source.  hslogger also
 		has a syslog handler built in.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">jgoerzen/hslogger</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hslua-module-path/Manifest b/dev-haskell/hslua-module-path/Manifest
index a24029d9c913..d8be10279bc0 100644
--- a/dev-haskell/hslua-module-path/Manifest
+++ b/dev-haskell/hslua-module-path/Manifest
@@ -1,5 +1,3 @@
-DIST hslua-module-path-0.1.0.1.tar.gz 8144 BLAKE2B d86eb43e1bc5805c60971bf1d9c9f0824118b06879c5e74d820324451ead467fc08a8272dcb37a698ca35c46103456efa2333002c2627679b1f5952693af0a37 SHA512 b6448d187ffff02340612c69d28fde429186de44874f52a01b3b3cc77cfe7a105426b4cdbe8e27b13620869a64ac0893abbfc5ffd7d2d500008efb94af00a3bb
 DIST hslua-module-path-1.0.2.tar.gz 7991 BLAKE2B 4cb4ce417cca440185099c003f83c7baf402fb90e00d044bae4b395465083f6f04102c40f06d4e20e581fb3ddf965bb90ef551087d3aeaa12806b43e1266a2ad SHA512 57387757b5adbc52f39d3a9d6eb2bc5f0d59ef054b88a4c61541a38bd07793635c7b54212ef4e720dc5d1604054242175fc28b332bd20480461eb274c8a23b76
-EBUILD hslua-module-path-0.1.0.1.ebuild 801 BLAKE2B 56dc787c691989bebddb9cec19e26b81b8202e42656fa653210e1b46cb9c33c2a3706fb2728663dba47eb425cbba5ff53f84c223f20520c5f0bafc2dcbc6fedb SHA512 24b2bee1f836b17365214dc0c0716a22270209ccf74c4ec4939f89d47ae052dcb630c947121109de267422eea55d5fa87fdb6d417452c5f6471bb41ef1ef8e6f
 EBUILD hslua-module-path-1.0.2.ebuild 984 BLAKE2B 92fec3b75cb33240e41f53c67a9ebdf10a7a79a7738ef3f71a53d83b3118d113b3cd88b52bd1a031d980e8de95f7a9671fe29bb34615fb495bc8696a2c61827c SHA512 0b8ad29c34678572e073faf03e251e39d914ec247245c430cbda237b2cb5b38749b890c3fce70b67becc95f56b687a148bb7c7786ea1447fb3b11f96560f79f6
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild b/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild
deleted file mode 100644
index bebeecf74cf6..000000000000
--- a/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module to work with file paths"
-HOMEPAGE="https://github.com/hslua/hslua-module-path"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		>=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 )
-"
diff --git a/dev-haskell/hslua-module-system/Manifest b/dev-haskell/hslua-module-system/Manifest
index 40525441404b..7a974530c289 100644
--- a/dev-haskell/hslua-module-system/Manifest
+++ b/dev-haskell/hslua-module-system/Manifest
@@ -1,5 +1,3 @@
-DIST hslua-module-system-0.2.2.1.tar.gz 6962 BLAKE2B bedc569bb969c0529a70b82fc1ddf14cc013c1954f97cb518cc5ea3495392812c2635b214c6a31d9f39107ea8e3ba68f4380fd1d9dd082b195a21ab697ef4e32 SHA512 66cf57b8c80605bdfa5145fc61dbe59b66dd67a82a8365006b80e2ab74a71fff0fdf0ffa690daab66e82b8ad086adbcd622a6844b2107c0b9719b8cdabdf542b
 DIST hslua-module-system-1.0.2.tar.gz 8488 BLAKE2B 433f7aefcdcc3ad6ea04192718d0a8891d4a845e6e1585da7b15b98299574b6e53391b4b5e44dc2e8ca28a5c46486ea067d390df664ea237fe1675282a4b057a SHA512 921c5098f5f5ea4483ed787de68824cd316c5c202a7387bfdc23969f7b6fa30782cc946f34137d44870e921c2d9c7aebbf67ff3cfbf158585a42e2ba38ac5963
-EBUILD hslua-module-system-0.2.2.1.ebuild 941 BLAKE2B d9302fe139971b7024e003b6dc6c7a0a76c0a13578381ac8e3a8fa441ec95c93e32c386c0d56667dc7f3c928b863b042a9ebd6ad46a01f9bacd8a1c73af368da SHA512 c71ee43a5b88b5ee519aee4b19b96aaed22c5e19dded15530ce9c67146722f54cf6ed18b09f5ef30e47d85fa90c8be91e44bddf7cfc5141414461f6cf01a025b
 EBUILD hslua-module-system-1.0.2.ebuild 1188 BLAKE2B 882066153326baef855946d2ecf6609a5f33b7cc31b61f1ca5510ce58f863fa2075e2dc6b35da6be728583701fc373ccf8a309140766cfe6ed3220d020a6a1cc SHA512 3fa4dbb99a4da23a1b1ad6abd4b81debc0a34422683feb35ff07463e90ef27f193a5fc5fba89e4125e06481c8e5a7df354eaecd3b9a55b812baed22bd40f6a94
 MISC metadata.xml 605 BLAKE2B d6bc1c0ee7f75fca6c601f461fc478b0d77596ca5fe6d4d170b58cf97333e7628ae4898eac3806912f93a682416f5d1b8769785742be2e34bff5a127fea0c2cf SHA512 a0faefce452f2f9dfd3cad8b7da2439387408cd1ac1078b8048315853bb1aec46d0a4e8eb6aafe09cb579eec53343df438420e5499b1f6a260389fe248c21c7d
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild
deleted file mode 100644
index 85a0d5fd8f2f..000000000000
--- a/dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module wrapper around Haskell's System module"
-HOMEPAGE="https://github.com/hslua/hslua-module-system"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
-	>=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		>=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
-		dev-haskell/text )
-"
diff --git a/dev-haskell/hslua-module-text/Manifest b/dev-haskell/hslua-module-text/Manifest
index af2e483dc5fd..53612a779b43 100644
--- a/dev-haskell/hslua-module-text/Manifest
+++ b/dev-haskell/hslua-module-text/Manifest
@@ -1,7 +1,3 @@
-DIST hslua-module-text-0.2.1.tar.gz 3498 BLAKE2B 6bf71d9c434042f881bdaa42fa2ef3e076f1bf25ae00cc04a0b64055719246901c482f4fbfa280d2f6ebf66cf5d1f5668ba73e91c589dfe081cce25439b40466 SHA512 e2da17ec688c00968537e49c18d71a3e365a57bb0c8cb2639b2052d04771686ee695186726569e82f72723c78841bccdc0de33d0302e943e67f3432bd5fb9d13
-DIST hslua-module-text-0.3.0.1.tar.gz 4617 BLAKE2B 682650493a2757b6d40a75aee5995f39bbca649d072eefad4f5d5394efd152088304379fa5d1e605111f9329e4eb5ddf98228006f90f8c5a2566c9b3bc684bc6 SHA512 15ba5e97261e9fa0bb4053575a0dd368048141a401200c32bb53a969cc741d2bd2d04890fef5c488fb6f476438d28e4d5ab9fea4a62aecdee285e8f1a1adecc4
 DIST hslua-module-text-1.0.2.tar.gz 4650 BLAKE2B 94e6a2ff8682acfe29b556e6f3b5a789d7c6f2c8864e4e5d91872c637ed864af4743ca45c64f3c7ce6462c25dbc52308e7fa935b9dac214666ae177ee2ab835f SHA512 1678630a5ae7ac66946598691901a2dcb2f62723e9f7bda50d8c3711384437f4280d280363b04e2794487a541a9b5ee70bbf52a94fa042128650a9c576108e0d
-EBUILD hslua-module-text-0.2.1.ebuild 736 BLAKE2B 3191d844e61a220826f6bc85988d92630fb18fb389d4d2efb0f69303715743ccb690036b25c28dc92700c4c98dc52151ee9e79433b869ecddd00803505e26c3f SHA512 99564a1ba0e3c2a670212837e1771632a0439a98d1f81bb7be71ec0660802ca261439ddb5b05ca6a3566fe521d8e7a3fb22df13e0bd7a540ee8cd9cc70e1c30f
-EBUILD hslua-module-text-0.3.0.1.ebuild 784 BLAKE2B 4f81b6f5a5a0485d2f8e37ec2f19867326abdef3bd35c5e3ae5cc41ebaf9e2631c3e750cb097d1b470d3522daeb2ce10602d002b664c0a502295ecc3fc9dc6c8 SHA512 95cdc7db8f7142ffcf120157a9424bd31f2357eddece2810db01f9b6365044209742d15f49f64d560602b393f0b064fc922c12d52d295102a063b6c961b56ea1
 EBUILD hslua-module-text-1.0.2.ebuild 994 BLAKE2B 88812e1e151580d9bdc099a2e9e446eac3da812faecc7a6ba3d88c91cd20ecdbae12366ae7c053aba2914411ae3c3489ec71b4864ea8b3230129c36584067a8d SHA512 491e0e83701c24377d0b448128f23b584ef17d3a346d236dbc84264fb2661f77b46423fb030c73827b0c92389eb8a913fc680a83c17218a7e28a78ca42343ea5
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
deleted file mode 100644
index f0377f866dbc..000000000000
--- a/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module for text"
-HOMEPAGE="https://github.com/hslua/hslua-module-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild
deleted file mode 100644
index 12af58705fdb..000000000000
--- a/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module for text"
-HOMEPAGE="https://github.com/hslua/hslua-module-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		>=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 )
-"
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index a27e6a5613ba..d6ed0be5cb4e 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,11 +1,5 @@
-DIST hslua-1.0.3.1.tar.gz 236734 BLAKE2B 45eba849c41a22fdc7d03729f0ac15fb25ff83d1cdcb905a58a5813ef34f3b2e2a98a7ff2991083672a7afd5898e50e6ef9c83157c773b9861bd1547f4da5972 SHA512 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657
-DIST hslua-1.1.2.tar.gz 244832 BLAKE2B 5da2b9c2da6f43d841662b3143d3cd5b084d3f32cd2804316a8741e863d4c8dcab85da650b219af4250b2d4ec0570a742dc13b8bbeab79ec6dd5d4ddbe4907be SHA512 886a9d555a034b8fe74d5184457dad9e1bc9bd75662760a0415a75222bd64c556043ce6f98bc11dc1d27c34212f87ad3ce2271d5ff8125c1b5a89263cdf987eb
-DIST hslua-1.3.0.1.tar.gz 253503 BLAKE2B 381a0281d7bfd6713b1e8ec4023ff4a42e9b9248d20c958daa1ff75b0a52f9ed381bf3dda6ee87d51c130b31d6627f20f66dd9ff918bb5047ad98475b72a3304 SHA512 6c270cfd3abd81c3b06dc2005796909ea96e14ecc2ff4689f18164ac38fe13f99ff0e5cd25ed1aa020ad422c7e52d2d40001e1c7298436c10e04f3670aa08e98
 DIST hslua-2.1.0.tar.gz 17065 BLAKE2B 269a6ea5dd432500879c190b37941483889841ecee27f9af161dae98c70e21aa3a9a4f1ecb0805d06154fa12742edb5be2f0ec246117d399e19a275f67ba93dd SHA512 c1c0f942406f6c346c7922fe3bcf0d76abad66898f075f296e24ad82153330e35a0559276945146834f5d6156adc714a69ecec5db42be35b80084210886264e6
 DIST hslua-2.2.0.tar.gz 17278 BLAKE2B eda496aa4a2bd89fd0be2fcefa0b1554a931c7876f5b2e456fb315a72d304050f8d9b2ad5ee583c15f4b31dc26f1a87370c526626d8dbed1e2fc5660ee66667e SHA512 cdd4ff872557ba014bb6f64a592702820e9274456c35b9f9c42fccbd279b2157b3087a5040be2bad03890934bf682c7f4d066232480e8243d5259f871514346a
-EBUILD hslua-1.0.3.1.ebuild 1405 BLAKE2B 1a3176ccd23989bb6dec246a72c5648613a02c618fadddb3fadea69d4256b9cfb58879fd20149b1d1054fa7bf99a06b5ea3c5b2474418cb5514153788231ac80 SHA512 55a084b210b8d382d031ba80091abefbb645da5f39257329a1bb6dcbe3f6b3b30b833ac836f488a756d63bd35d18b0399676cad8a4cb70cefa1f391354a0e86b
-EBUILD hslua-1.1.2.ebuild 1558 BLAKE2B 8b737fcbcee9cce4d4ebb749dbd432fd4536668cef86c5d024e81cd7275306e90bcf437d6acf839a9ace9e9a90065ecdf794839880dd7962bcdd3937a82111fd SHA512 9a3cc589126828d57b55a6ac5b3055885a6bbf154d0049dc39a61d12d09c2906fe89b2cde662f12fcce6ae19630dc98f42c542e5492fd94ac6b39bf7770d5c48
-EBUILD hslua-1.3.0.1.ebuild 1411 BLAKE2B 36a11a48464360b35e97b8ef720964c77aca0dfb5d2b1ac32c9fae361ef86462c5699169a7ce31114f81487e8716577bc4485b00d4b4fbd6fc67bbe5ff254636 SHA512 74f75ba264cb4c6c3b7530765b7dbc3f724ffe883b5c61fb89c15db7dacf366bf85231f899d0b70500b77c8c5cd9ae5e25ff844ef93f5cb0cde89c4814fd6d77
 EBUILD hslua-2.1.0.ebuild 1675 BLAKE2B 44e9d52d5c74b8695a0cdfc232f8527488d52ed374a5cf5fcd4f347baf2ffc92fc7acb1ddadce5d56d8090f285af1e29eed6c41b8d69167d9e5a9d6814c4acde SHA512 fea7eb4ad8757d3b9cff601f48eb68f781a4029cf2a1590e161e001db02b70e2a31f15860801289d6ddc43d21b549a1bfbd9032bb248f7d0fd0d6de32d9c8b7a
 EBUILD hslua-2.2.0.ebuild 1668 BLAKE2B eed8948adc91b743f1c22e9f32c51d2018f9f1b83b7fdcba472d37eee2627b464e8527c9f49af408590c8ca64161960ff14525384d9e859c856caccc0c779e35 SHA512 0e2a2699366670b5e6f9c22338ccd9191dc6c40efd9265a1b8b32c376afd8cbedced02d25148dcb41be8ad4ee7f34e7abf2e590636c75af9081879740c9af4c0
-MISC metadata.xml 560 BLAKE2B 1af2e2f2e3e11138ca9f9c4a53c63980c3b7216404600ccecdd613a69a8b584c182db110773bf096d7bd16de6fb00420e0035f2168d61db74817a315a6fb5234 SHA512 ed2a88cadd87228bec07019cd574861952d4ec6f83fe27ac451c821cb0ec6c1d9862bc84fb0600db4c51fdcb57571a9f12c56f62288c0f7fcce36b48fd3e3ac3
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua/hslua-1.0.3.1.ebuild b/dev-haskell/hslua/hslua-1.0.3.1.ebuild
deleted file mode 100644
index 14a16b75700b..000000000000
--- a/dev-haskell/hslua/hslua-1.0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="" # system-lua disabled since it requires lua-5.3, which is masked
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allow-unsafe-gc \
-		--flag=-apicheck \
-		--flag=-export-dynamic \
-		--flag=-lua501 \
-		--flag=-lua502 \
-		--flag=-lua_32bits \
-		--flag=-system-lua \
-		--flag=-pkg-config
-}
diff --git a/dev-haskell/hslua/hslua-1.1.2.ebuild b/dev-haskell/hslua/hslua-1.1.2.ebuild
deleted file mode 100644
index 829469faf3e7..000000000000
--- a/dev-haskell/hslua/hslua-1.1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardcode-reg-keys"
-
-RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allow-unsafe-gc \
-		--flag=-apicheck \
-		--flag=-export-dynamic \
-		$(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
-		--flag=-lua501 \
-		--flag=-lua502 \
-		--flag=-lua_32bits \
-		--flag=-pkg-config \
-		--flag=-system-lua
-}
diff --git a/dev-haskell/hslua/hslua-1.3.0.1.ebuild b/dev-haskell/hslua/hslua-1.3.0.1.ebuild
deleted file mode 100644
index 7a67259435cd..000000000000
--- a/dev-haskell/hslua/hslua-1.3.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Lua, an embeddable scripting language"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardcode-reg-keys"
-
-RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( >=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allow-unsafe-gc \
-		--flag=-apicheck \
-		--flag=-export-dynamic \
-		$(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
-		--flag=-lua501 \
-		--flag=-lua502 \
-		--flag=-lua_32bits \
-		--flag=-pkg-config \
-		--flag=-system-lua
-}
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
index dd3f14edb59f..937381521944 100644
--- a/dev-haskell/hslua/metadata.xml
+++ b/dev-haskell/hslua/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="hardcode-reg-keys">Don't use CAPI to determine the names of certain registry key names but Use hard coded values for instead. This flag is required when compiling against Lua 5.3.3 or earlier, as those do not expose the necessary information in the @lauxlib.h@ header file.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/hsopenssl/Manifest b/dev-haskell/hsopenssl/Manifest
index 47d12749669a..3005990fa7d4 100644
--- a/dev-haskell/hsopenssl/Manifest
+++ b/dev-haskell/hsopenssl/Manifest
@@ -1,3 +1,3 @@
 DIST HsOpenSSL-0.11.4.17.tar.gz 80235 BLAKE2B c8229b96e5d079a46255010dd44ca9caed292c974dfe5d815130696d798263c493bc8825be9ff1e360a2e0c86919842883d9125f26166184d002c619fab03649 SHA512 fe7be85a6e9690f4c7a5d79c0bab56efd42e183415c5b92b589c5bd380f2646877e0d4b1208f5583d3223a602118c9a3d74688e02f9d24a1ea20aea64a625eb6
-EBUILD hsopenssl-0.11.4.17-r1.ebuild 1025 BLAKE2B 37ad8da2e3463c336268af457a0267e6c8c79a5bf1455c63340567765d49942b9b4e6e1bfaadd8748dbd0eec900c1e9a8a0d9fbf9e5190891e8a174c67610ab2 SHA512 9304916ebdddcc2d41625951de573efd31bb1edfc1d8e371d9d886bed6a07f9063ee24a42ee596bdb33899a529cb0490cb9629c6968ee572063079f3147f2c4e
+EBUILD hsopenssl-0.11.4.17-r1.ebuild 1032 BLAKE2B 00c180f384df5c674ca7e03f8ac963e6cdd9f51effa95c5acab31954042be28303c26696347daac0dd934cef42fa1f9009248e0ad11d050412fb4007a54c9a36 SHA512 a3ef0be87af4f5312264a193a3aac73c1f05aba24a51ff1042416d95bf384974b1627e36ae315bc29f1f105c1987ba40815f3826dd8361710cc6b4a48e59f7a1
 MISC metadata.xml 1175 BLAKE2B d289b5cb7795c468df64faeee310f55a6b9f29cbda10fea6cddfc12a20e052762cf8fc1a38f63245b5fcd1d84046a3f04edf20a4c893881959c64224b7b20423 SHA512 cee36fe4f12fdf09e5f8ec05c9d7988992d203bae6bda1494626ce9207190a64b777e0b39cfc604dcfd5692f7df0d058ef191551b04578e721a7f6921992e996
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild
index 7e8c53796aee..01d4ec7912e8 100644
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="fast-bignum"
 
 RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile?]
diff --git a/dev-haskell/hspec-megaparsec/Manifest b/dev-haskell/hspec-megaparsec/Manifest
new file mode 100644
index 000000000000..977f71b8a3bb
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/Manifest
@@ -0,0 +1,3 @@
+DIST hspec-megaparsec-2.2.0.tar.gz 5298 BLAKE2B fe18c95325a7b17c214635d8e57477dcd55b10b9a8dad20ccbf7c3d8bdd9027b49da394397493276b1b5aceb5a8337f51688c409fbb1ea1ddf86e96502e19c8e SHA512 347e1d5275fbd52bc0a51a1106aab8de123034ec34d5f0a113af76136009bc16d2c570aa747e903e050899cf3d53a091e765af5aa67dd7eb3ee7aef6e62054a4
+EBUILD hspec-megaparsec-2.2.0.ebuild 915 BLAKE2B d7c15660a9c47a9181dcaff1c11799235b2d3e4971bbb570bd57336f1ee1c9d8ed9f10a1bdd4f038d88685f62926503c3ddbdf6ffbb43e39c42211de69b8e12c SHA512 bbfdb90b7da643b18659f951b8031605a883bc5a5643c646d9f9534c8c60ee3191303162a1dc1bc69d235aa7ceba8b58df8057e8db9cbd76643c7ebd29702b0b
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild b/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild
new file mode 100644
index 000000000000..11ebdbec45f2
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utility functions for testing Megaparsec parsers with Hspec"
+HOMEPAGE="https://github.com/mrkkrp/hspec-megaparsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?]
+	>=dev-haskell/megaparsec-9.0:=[profile?] <dev-haskell/megaparsec-10.0:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/hspec-megaparsec/metadata.xml b/dev-haskell/hspec-megaparsec/metadata.xml
new file mode 100644
index 000000000000..937381521944
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/html-conduit/Manifest b/dev-haskell/html-conduit/Manifest
index c2fa5b524383..1e36165cb366 100644
--- a/dev-haskell/html-conduit/Manifest
+++ b/dev-haskell/html-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST html-conduit-1.3.2.1.tar.gz 8976 BLAKE2B 070f6f0bc2c47c5e884d81cca1ccd5c72fbfefc39fc4a3d937d9a10ebf496b405b3e4f46382a882fc96cd12247ee00a834e90d2d06256316c96e2d3e8f2d3147 SHA512 94e9db8db839c5368f5a042a7039d44e3fabf5ffa30426894675317b985288c0d5fa94a6d1864b94802ea2fda3ff2728c4578759405dacdc64d8e2cfbb24aa70
-EBUILD html-conduit-1.3.2.1.ebuild 920 BLAKE2B 77ba57850988b9684684fc21af7befed30d48256c6e1d0e12dcac9cdc79b580d4edcc87bd134133f9e242cb5c4f8ce6371fa548b1a93a7c13c120980eacd6da6 SHA512 9bbb290cb8af708ae4baa0d866d3faefb19f08c1a6da48ef683da73d314848b7c203a8bd763d0cda3530f3ed01b32d86bfdc75fb5123c5f4a01bf929a9086b42
+EBUILD html-conduit-1.3.2.1.ebuild 927 BLAKE2B 8ee0e37edc9c5b22f8fa0cafbc79aba1fe34fa616d0e4776b62e3b2dfbf07c2b95a49562f2b50ed8470b358ca03d2e8305134e1c0f73d52496ba312dd6403e19 SHA512 ae4f1379fe9a03e50ea9eac7d2178f8b2c7836fac15389f998a2589679f03f853b3796faa7fcf14030e6acfc4df28c9f503fde4d511d5463729b6accb315c724
 MISC metadata.xml 604 BLAKE2B fb7f02a42de515d39b2f0497fef75d14ed6aecd541ccca354e48ab7a527a5e181158d21d2c0211f42bb3f097cafa30e7d5a94eba32cda0f08a178a5a35bcd568 SHA512 f6e93b18ebc9712d41a61feb8599c33e6102ee5baef414bd00b8a8f4ad78d00eec58191e66a02ff64b569748e25240ac79ef892a3d6005d62a6bf31aba709f1a
diff --git a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
index eb613fbe946e..c873043957b8 100644
--- a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
+++ b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/attoparsec:=[profile?]
diff --git a/dev-haskell/http-api-data/Manifest b/dev-haskell/http-api-data/Manifest
index b95872c0dbff..3a3228300acb 100644
--- a/dev-haskell/http-api-data/Manifest
+++ b/dev-haskell/http-api-data/Manifest
@@ -1,6 +1,4 @@
-DIST http-api-data-0.4.1.1.tar.gz 19800 BLAKE2B 1dea8465ca41d6a8afdc1a994bec79e2fd58889732275dd0dfab73b917e1ae7b21824ba36ba83471d82e18f4ebe05265655098912c4136fd4a250070641c5c74 SHA512 9b768dc790999e42a82753b69f6ab48df90721468eaff79bf4b9a1eb08572dba3488908db4ad0a1afb3956513a16fcd663f005856e230748f665987766e10c59
 DIST http-api-data-0.4.3.cabal 3845 BLAKE2B fdde464e0c378bd60b135fd325bd2263df2eef42f797c1aa7b04e9382027b58498c80414a75dd83278d3bdf5676041c3ed2493b918d87eda3140ccddecc410b8 SHA512 cbf03caa0a026cad8c327b9fdf04dcc447dab3879c9cacf8fe7cf118665b9466983660937684fe8d14b7c50a29d7fa8a5f8f2eb2e8febc9d8217f3d30888e5d5
 DIST http-api-data-0.4.3.tar.gz 20827 BLAKE2B 04e7f0a9e5edebc230b47640c6a86dc76d271942cc70d0aa109d289fe2b1139e4c8103ba0799990b4c7ea0a37f3dd46ac4a72e9a5e4a39029d856e134ebfe8fb SHA512 625367d8f524eff07c69620df17c87a4365c01b9bc8bdd6bab5b8abe1b47cc429a050d63f48e50cb08fcac55aef95dfea532a5d52c87b6fa2d3e58b06aa8f4b0
-EBUILD http-api-data-0.4.1.1.ebuild 2235 BLAKE2B 76eda71dd0eb62a2ac7ecc8e455ae7d75d21fd9144b8654ed93fcf5c68fe23071640a034fdaffec1e6acad3f0297730efcc10da9cf2147f3b424b53bbb9deabb SHA512 c8954f6394dbf3b3911adfb9208a686de9c51738178408cf47ef60bef421cf5ae31d18c0fd837c86811acde72da27d110b3b9b70c819e0ac387d311a537b09e9
 EBUILD http-api-data-0.4.3.ebuild 2309 BLAKE2B 3a10503254995908bff0b35850d3b9fab0e42642f8165a36bf6a2637549d5c01cae7ada6bcf7d36e7766f7747358621a7db4846a6b73143f53f517a815da1b6c SHA512 154813c7f7e531a974e72a89d24122ef8b1ac3e14d317ed24402963da590343071bb44b338121f069c08c4563ae10e535736cdb89050bbf1edab1f4b01284720
 MISC metadata.xml 448 BLAKE2B 708be06baddd59c81fddffbd8bb36e23617b3e915234157a108b7c0f5607c0e50a8e6d0d8aeff51477b2b413a21d9a51000a96e55526cccf65a3484ebe438fe6 SHA512 770923b4a23b3093f0ce1e780be8efe80668ee76c61bb28d1e0fd4b3114c5802babb784914f32a323b801e8d715e9dedd4422b56ef97a53aa9da7ae423060f0d
diff --git a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild b/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
deleted file mode 100644
index f64232f9c25c..000000000000
--- a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
-HOMEPAGE="https://github.com/fizruk/http-api-data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
-	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
-	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
-	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-compat-1.9.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.8
-		>=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base                  >= 4.7      && < 4.14' 'base                  >= 4.7'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-use-text-show
-}
diff --git a/dev-haskell/http-client-restricted/Manifest b/dev-haskell/http-client-restricted/Manifest
index 618c82bf00b1..b218ccc91e8d 100644
--- a/dev-haskell/http-client-restricted/Manifest
+++ b/dev-haskell/http-client-restricted/Manifest
@@ -1,3 +1,3 @@
-DIST http-client-restricted-0.0.3.tar.gz 5178 BLAKE2B 3fd0a0d1218f1a5ef0d87ac43cd3b3ddc37cf78ca3a8c6841409048d3de4cc44773539b17f0c60ec75dc5e120497e6226edad5556024623a09544a0d78ea9e4c SHA512 6734f674b6a026f1cbba495b892cd98892584817db69bc36db07f4179e6ae4841055afa37a4841edff7c30270f9977b5700ecd9640ca812d213c575fb4ffbf86
-EBUILD http-client-restricted-0.0.3.ebuild 952 BLAKE2B ce967203b09b2bc5a5f7838fc94eae8240ed834a9fe3d79077956972a475c7e0dacdf37401d06bf3b0953ded82527dae7c61621ee790b346bcb450b8e0511901 SHA512 75a242e0233d42584fd6529297051ad58d6d29d67559286e7075dc0a4b8f1ac03cce4388a2d9e6274aae1cb7c890a0ffcc9b1c82c5ee2fbdd0fea75f3be5cd41
+DIST http-client-restricted-0.0.5.tar.gz 5389 BLAKE2B 83ec4694c6d99858b85c9751ed915b1d2ebf1df901c62fe59521dda18ced697ec9af71519785df16d06a795c18e496f8b90f6253845b88e810bf4caf0c02704d SHA512 d5876c02c1c6989f1da4741e191f18554efd448339e83bb9b267edec0e414141221c4f770d9f8e48c9d5f4a8fac9d58295e5f57e8c877710c95a71419e53cf3d
+EBUILD http-client-restricted-0.0.5.ebuild 956 BLAKE2B 1a6f95c8bcebaf1461ef6a52da457500397d4397479952af45f97576c94f70e2ee3fad8a7743e49c09839df7072f37269545494b02044a9a272c0e2e8a9c56a3 SHA512 8e57ae9e58bbbbbfaff9fda57f65df3e43fa503c03ccd55163505b44a59a486671aab31d0c761e1c9f9bfdf9cb99165d5bcbc2547fc0da1de271fee958d40f53
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
index 22410e693dcc..f30821e3c4f1 100644
--- a/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild
+++ b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,13 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/connection-0.2.5:=[profile?]
 	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
-	>=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-client-0.7.11:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.3.6:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
 	>=dev-haskell/network-3.0.0.0:=[profile?]
 	dev-haskell/network-bsd:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
diff --git a/dev-haskell/http-client-tls/Manifest b/dev-haskell/http-client-tls/Manifest
index d6137347bcac..73e888973564 100644
--- a/dev-haskell/http-client-tls/Manifest
+++ b/dev-haskell/http-client-tls/Manifest
@@ -1,3 +1,3 @@
-DIST http-client-tls-0.3.5.3.tar.gz 7679 BLAKE2B 490fb9af14ba814528560bab7cbf37bf348db38078d08d6be07934e52754741bc3b0ed91e614598ab8b26e19a67d7c6121f52a59b0b9ee47481e5c9bdf3cd36d SHA512 df4fff9fbd6736a52d54bf04669107b24e3d31c22b0f7882310204ca4ef1a895e9f79cea289423341aa575759a2667ff9ca86b889567605ad3daec266a1bbb14
-EBUILD http-client-tls-0.3.5.3.ebuild 1107 BLAKE2B bfe01cb2db66cd1fcb280f1d15f274ea2aecad9de2f2c76e2e88f2a6219756fb46d5c64a70287337a28ab28f4853c07a244b6404c5ceae0fc11c4a382df1f2cc SHA512 6ee010fe2cede64a7d7d0806932abd54d2d6c88190d08dd9c99d04ee38744a50fed40d7302386bf95f05e67bfcd63bd62b37a75cc92dbf139f939617842c56fc
+DIST http-client-tls-0.3.6.1.tar.gz 7850 BLAKE2B c2ef4e8981f2141d496d2d3e0720a29a536cd4937a95e4a59c8db356ac4390c2d419bf61b2eae6fcb4b5e98a73cd945981c9d8535353b3e444b603f9237bab3e SHA512 81b6e9ad3956f237bec83173ab8ac153ea3e9b555f0a84dc6ec0a13f6ad96dfc104d61125b66fc8733c8d8c3b7f8fc5e89cfcb885a7352f3af2e2b5473732294
+EBUILD http-client-tls-0.3.6.1.ebuild 1039 BLAKE2B a58d93a4bbc6b9c92b651fc99eb07d0850d9ae7d50927e398c280819527a4552e2eca4e3ba904857a9c71687215f242a21fb0f00651b09cfe41d7d475e704cfd SHA512 2d8761024c120c2aafe4f33d6cf6b34623e293a04da139719c6d63a48eaa10a54af67771b1c959c9f247e102b1376c9b047d7fba73af65eb3a064898d5cf65d9
 MISC metadata.xml 335 BLAKE2B 5883a7474b5c0f79f8f42480cd8bcd76c88d3c86083605aa50d20b3e48a463b14312d4f55a501be32a00ab2104635e31f75b67e1f46ee378b5c10cb6b4db1b9f SHA512 749b03388d61a464a2117dc047d57a0bab8fa5793019fb2aa3bd7a44b3fe9d61881204f7ef3945cb63bf6491f677c4a09c5206324c4fbf2a5868f73cc47443cb
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
index 6f546ee52e64..cda31b0ece39 100644
--- a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.5.5.9999
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,25 +15,22 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
-RESTRICT=test # needs network access
+RESTRICT=test # requires network access
 
 RDEPEND="dev-haskell/case-insensitive:=[profile?]
 	>=dev-haskell/connection-0.2.5:=[profile?]
 	dev-haskell/cryptonite:=[profile?]
 	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/http-client-0.5.0:=[profile?]
+	>=dev-haskell/http-client-0.7.11:=[profile?]
 	dev-haskell/http-types:=[profile?]
 	dev-haskell/memory:=[profile?]
 	dev-haskell/network:=[profile?]
 	dev-haskell/network-uri:=[profile?]
-	dev-haskell/text:=[profile?]
 	>=dev-haskell/tls-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.10.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-3.2.0.0
 	test? ( dev-haskell/hspec )
 "
diff --git a/dev-haskell/http-client/Manifest b/dev-haskell/http-client/Manifest
index a1b5b70f4138..badd387ca52d 100644
--- a/dev-haskell/http-client/Manifest
+++ b/dev-haskell/http-client/Manifest
@@ -1,6 +1,4 @@
 AUX http-client-0.7.10-disable-net-tests.patch 558 BLAKE2B cda700e04ad2627cdf4b8f3da5f7fadac5a116766783a7f5d850c3d5f0388986acefc1f25b460b482061e3bb93f8b908882fd104e3e3f5b1ee49a1643fc92b9e SHA512 142ceae88189ffccdeff8ecd77d04d0383af3350970a9a55571844c09dca72a11c989fe9abf5f6adf75cbf98b3e9ee81250d925293e27480bcfa92a61579a124
-DIST http-client-0.6.4.1.tar.gz 89702 BLAKE2B 845488745e7429b833c92521be7abb6e03ae90fa81f819995d9fead467fce1f3c43ece8c4f5da1f8242d79086556b0f86eeea3da931a0a613eb49966ca9cd60d SHA512 b9595ebf3cb48c5ed288934976b78270a3092a35ae083853684c848301ee88a18e0e41534180033df071ab87dc9f9cbab99da37cbc74d538472409c13dcfce7d
 DIST http-client-0.7.11.tar.gz 94548 BLAKE2B 5e630b5ec1861301a8a503238c111091b9b099d181b17a1d9c5fd22dac1dc60952faa7ec1da597dd909fe5f23408d728964461d77314a30a747e5edaa1757889 SHA512 0c01961e66c71636ff2628851151a788aaf941155d50a9f20b01a2e065ca7a8218ab4867b24e7cfb434aaa9b9178f727d950017870540e0bce91fffdcc374852
-EBUILD http-client-0.6.4.1.ebuild 1604 BLAKE2B 47a4b3503232150aafe3fb35566ce5c6a76349bd58aec53c2ba594fe919f290b817bcb99b0288f592ad10b410f3daa1e75600e51b9b03bab39da3b0daaa5c297 SHA512 fd0979e106b669b260ed9b76bfa82aaa39f03a883287e76804211f03dab039161088de6a824ff196e76e5bf2b64b11bbde1c864834edc9a8c5d75b42494e7595
 EBUILD http-client-0.7.11.ebuild 1398 BLAKE2B dbd744f7767355d01386f3432f396065c5ab8b982e5710ca87e4c05c12cd0520d2ae59cd7250927ed256351b0a16cd30077d446356134cdef5d7cd8c0de2d129 SHA512 8e0f68440bc3ee7498006d78202a77cbd07c4f251f689cb27697144b0d5c8d11b6c0a58c9810c93329e652d50182af54023a5e79122aacf70b0e24d1829228f1
-MISC metadata.xml 430 BLAKE2B 098802e1dac0b41ca8041832ed91082890146c367919d4d63bb1b8691f4ce752a6e8319fd66098a80df4bdb3d26e541d8aea9e1e30f47260646bfa38cd59885e SHA512 edf1972b0395980415935a3bb83309845f04ec4ce57d5a309aa0f277400a61f10adc7732ad7ca235dc628e614b409cc262496ae90c3b82cf00e65a0a6a4cb9bf
+MISC metadata.xml 335 BLAKE2B 5883a7474b5c0f79f8f42480cd8bcd76c88d3c86083605aa50d20b3e48a463b14312d4f55a501be32a00ab2104635e31f75b67e1f46ee378b5c10cb6b4db1b9f SHA512 749b03388d61a464a2117dc047d57a0bab8fa5793019fb2aa3bd7a44b3fe9d61881204f7ef3945cb63bf6491f677c4a09c5206324c4fbf2a5868f73cc47443cb
diff --git a/dev-haskell/http-client/http-client-0.6.4.1.ebuild b/dev-haskell/http-client/http-client-0.6.4.1.ebuild
deleted file mode 100644
index 023cfce84a64..000000000000
--- a/dev-haskell/http-client/http-client-0.6.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	>=dev-haskell/memory-0.7:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/metadata.xml b/dev-haskell/http-client/metadata.xml
index 7ade654e2560..895e9366e8a6 100644
--- a/dev-haskell/http-client/metadata.xml
+++ b/dev-haskell/http-client/metadata.xml
@@ -5,9 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">snoyberg/http-client</remote-id>
 	</upstream>
diff --git a/dev-haskell/http-common/Manifest b/dev-haskell/http-common/Manifest
index b5f5d25fb6d2..4ff1e174be05 100644
--- a/dev-haskell/http-common/Manifest
+++ b/dev-haskell/http-common/Manifest
@@ -1,3 +1,3 @@
-DIST http-common-0.8.2.1.tar.gz 9413 BLAKE2B 0e79e29f277902ac188ff2ba962f9bd3ad99d21f70a9f9f9e6ad5951d9af353110dd1a7519f77d0fb593aa965cdfd08be8abc01b27ce9fcc82e37a696dc790ca SHA512 da165d118575f1958c300c2b389b28cd4e0d720be79e776b5e72444b30b7b0369f336d44283d8b71c7758c1405e64a13e5591971da2e6b29cf7786233f2e04dc
-EBUILD http-common-0.8.2.1.ebuild 807 BLAKE2B 18ca9453a2bc2bebc36a0e7872c29c1b3f9349b72a3269bcaa6c1e622456c07ef1773accdb625fe17a43d9febe0ee651440caabe263b0bb821cc58554e1da560 SHA512 9cc6d355490ed14cc446715eb335a9e64c40348fea3680edecc6e070d0f7901b90efe4142cb2f7826423dca1c9a2263f945aa7a02960238e0a8f73f378044f58
+DIST http-common-0.8.3.4.tar.gz 10268 BLAKE2B 166ae57320b72198b60f97c766546155149ac40efe17a8f28cf5e9b757d352f2872f2fb5b2b3f5b7f2bd7692bdfc997f489dddca8e396ad3c043ddc21eeedba4 SHA512 8b344d80ecd5cf54eed44e281dadda0be401f88af7def443d172c3bde9c702e5137f09ab4bf3695e43ef6598508e94e80c12989568ca0c876d68479d553ee876
+EBUILD http-common-0.8.3.4.ebuild 840 BLAKE2B 49895f7a3a4f9b51595cba35003707b225695d9185d37c4aeeb813b3df1ddd22e04ef5995530b0b438b9354c11e3477ccbe5343bd1d440f632cc02402c35ba41 SHA512 c5d7834a53950a222a26d581b924f74eaaaa312564bcecc8d8885a6708c9c6bf6d123fa8f811b123d7d602ce60dfdeb28ffb0a52d0a2ec1388f9cdfb511a675a
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/http-common/http-common-0.8.2.1.ebuild b/dev-haskell/http-common/http-common-0.8.3.4.ebuild
index e0fe46eedcb0..33969bd87820 100644
--- a/dev-haskell/http-common/http-common-0.8.2.1.ebuild
+++ b/dev-haskell/http-common/http-common-0.8.3.4.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Common types for HTTP clients and servers"
-HOMEPAGE="https://github.com/istathar/http-common"
+HOMEPAGE="https://github.com/aesiniath/http-common"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="dev-haskell/base64-bytestring:=[profile?]
 	dev-haskell/blaze-builder:=[profile?]
 	dev-haskell/case-insensitive:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	dev-haskell/network:=[profile?]
+	dev-haskell/random:=[profile?]
 	dev-haskell/text:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
+	>=dev-haskell/cabal-2.2.0.1
 "
diff --git a/dev-haskell/http-streams/Manifest b/dev-haskell/http-streams/Manifest
index b20872c37eb1..344169498ffe 100644
--- a/dev-haskell/http-streams/Manifest
+++ b/dev-haskell/http-streams/Manifest
@@ -1,3 +1,3 @@
-DIST http-streams-0.8.7.2.tar.gz 35163 BLAKE2B 80b5a12bd95379009993efe1eb3f484c54e143d2d132a9b7a4faa64fd59fcacdade0b388138de7357692c49bffbdf508ccf05dc2e919e56c59e52191bf1b7f8c SHA512 1028e7a102fc189ddd20d353492306d506f24f0408a234e0ec2b01c11737bc9ffec76a5609e18e355ef838663ec412ce3b358d8223deea7dd4c35ada5223f3ea
-EBUILD http-streams-0.8.7.2.ebuild 1546 BLAKE2B e2ed198e2f57cbdb80d7dc02fa639f4c0981cf9af9d42cdde6aeb2f24d02e209b496cf6115e99d15933eb6089a7120e795b86d6519bdeb3ca4b6e78a44e1f274 SHA512 8dec19601bc58ecbf0770fa28fdbe2ad498dc06f90741a8016963fa2fb1773c9fc56ec5f897b2097ad9ab68c32da6c9e0a169a9cacbf619dc3be46bad003ad29
-MISC metadata.xml 728 BLAKE2B d69372a0a2cd2167b07ef24be006522e2ed769026152dace3cc8ef279007a59b5f9e1246996bb8ea4c629bc5b143a2d1621dd1c16a3f5f071f8412e01bc2046a SHA512 1b8ce4745d766b9bd93f9f62a9fe8a133f7ddc2dae79602c32db13419111e7a14e813e0e66126c1c67a494397baf5f876e348498ecda5acf9083039d232c9ff2
+DIST http-streams-0.8.9.4.tar.gz 37090 BLAKE2B 4e81ce6fffd8132d8a74c210c70a786c37fd09493c9806b8e15d570922c8e792d6244e1b3e80ef5dbf607291161c01a53617fc030f0c0088a70f9b6ad531eba9 SHA512 8448fba398ae323f1bdd44c8cbb02ba678ffc9d06f26d4e46c8c1f1de849a83a9fef697ffa5650ef58730ad81714775046a9b0857e760112ef25b418e2b5d0fe
+EBUILD http-streams-0.8.9.4.ebuild 1932 BLAKE2B b687ba966262a1b3ca46c8cfdfa1cf6c148814448e03678fa06fcf75fec5ad8da18606bb3657f68f20535c4f7924937af75d9f7454b8df9f30e36e0c25d839d2 SHA512 54dba1930558fe193f207f22203dec26755c3a7a57d2b019e5b4421b74334329036860bc0c0a6412de4b329ca87b6fb636acc9816414cdd630b9e921ed2c43ea
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild b/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild
deleted file mode 100644
index e2e1e9367992..000000000000
--- a/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop 'test-suite' to avoid circular depend
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client using io-streams"
-HOMEPAGE="https://github.com/afcowie/http-streams/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test #circular test depend: http-streams -> snap-server -> http-streams
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/hsopenssl-0.11.2:=[profile?]
-	>=dev-haskell/http-common-0.8.2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
-			<dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-streams/http-streams-0.8.9.4.ebuild b/dev-haskell/http-streams/http-streams-0.8.9.4.ebuild
new file mode 100644
index 000000000000..f91d92336669
--- /dev/null
+++ b/dev-haskell/http-streams/http-streams-0.8.9.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: +network-uri
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite circular depends
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client using io-streams"
+HOMEPAGE="https://github.com/aesiniath/http-streams/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT=test #circular test depend: http-streams -> snap-server -> http-streams
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/blaze-builder-0.4:=[profile?]
+	dev-haskell/case-insensitive:=[profile?]
+	>=dev-haskell/hsopenssl-0.11.2:=[profile?]
+	>=dev-haskell/http-common-0.8.3.4:=[profile?]
+	>=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+# 	test? ( dev-haskell/aeson-pretty
+# 		dev-haskell/hspec
+# 		dev-haskell/hspec-expectations
+# 		dev-haskell/hunit
+# 		dev-haskell/lifted-base
+# 		dev-haskell/random
+# 		>=dev-haskell/snap-core-1.0 <dev-haskell/snap-core-1.2
+# 		>=dev-haskell/snap-server-1.1 <dev-haskell/snap-server-1.2
+# 		>=dev-haskell/system-fileio-0.3.10 <dev-haskell/system-fileio-0.4
+# 		>=dev-haskell/system-filepath-0.4.1 <dev-haskell/system-filepath-0.5
+# 		!network-uri? ( >=dev-haskell/network-2.6
+# 				>=dev-haskell/network-uri-2.6 ) )
+# "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=network-uri
+}
diff --git a/dev-haskell/http-streams/metadata.xml b/dev-haskell/http-streams/metadata.xml
index 72f0ed5fab0e..937381521944 100644
--- a/dev-haskell/http-streams/metadata.xml
+++ b/dev-haskell/http-streams/metadata.xml
@@ -5,18 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		/Overview/
-		
-		An HTTP client, using the Snap Framework's 'io-streams' library to
-		hande the streaming IO. The API is optimized for ease of use for the
-		rather common case of code needing to query web services and deal with
-		the result.
-		
-		The library is exported in a single module; see "Network.Http.Client"
-		for full documentation.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index 955368845ec9..48307fae5926 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-4000.3.16.tar.gz 74516 BLAKE2B a02f66ac69f3e039e465744876b53b94791ca556c90dd13486ccc38138167ef66dedbe985615b62a2a66304b3970643fed4dd268ae9ada2619d373021bd2da97 SHA512 b5136b55967d4db7569a0269b429c8e419878acc548d962af94efa5aa0ddbb8a6ab22bc3096ce3d78b61dc708996c408d4bfa55c6c7fb6c0d915389503cbd755
 DIST HTTP-4000.4.1.tar.gz 74330 BLAKE2B a4efc62f565609efb981c32961ad9fec28246fc67bbbc3da2c8430b7f4c2a96ee378b12b4f6f5f268353db870949cc6b04a9d8489c8f2bee70d783651a2bafc5 SHA512 c1edc529032013391263bcc0f8abd9534fc53a617b5033dfdc478318465cd988732b2644c7144979156c62bd1a08b1ace507b4fb4e2806f22ec7696cbdfd0147
-EBUILD http-4000.3.16.ebuild 1434 BLAKE2B 5e57acc86ca30e67d1d386494aadb460ec5bea4af422a2eb0ec2f8293fd871b479877625e3ec7e5d8dbe513fb34bbfd67eab08f4af7f644df129cdf1dc43c4ca SHA512 1a347de2f2df7321b00130239229f838b8b1053bfa86b2ff491ccb8cf4e6b0466bb0be6ce42d332c3121bb33b87e66d0aff5e4d2c313b7b2f0c7b1f368be93d1
-EBUILD http-4000.4.1.ebuild 1436 BLAKE2B 2c1f0fd07b03c7f5b273479d132389419e67f1b0b4db0ae6849a240022baf5d769ac11756f63fea5c586e43b01c29f1f7c1ba87793077727b3d97320b4278d49 SHA512 e03e3d3f8168b9e437d112f61d03fdfc0adf4a03bc257256832d97f7eac009d10d4676de3c7b90176394a310be12e68a39c4018a8487885caec3ab0b29680f3c
+EBUILD http-4000.4.1.ebuild 1443 BLAKE2B 4f7c9f7694e2e8bec5623bf1a83015d416b87158ae660eda1e401e17fac0d2dd8eb1ea822c651eda8ff87de3b61c81813ec30ba256256753a0a4219cf04241c7 SHA512 136fae374f7b28c89a5699574a2d1c1dfb6cddc22253957aad7856afa1835fe054264e4a0b6de809fdfe5db5bd0445207a59ad618dbda02f96ceb0774355af40
 MISC metadata.xml 1921 BLAKE2B 85057698a772ab77a8760ae7f5b9642dc9b6ed4ba2c9a5c334520223a84b4847071c332377b2529f2614f21022cad639d4456acf2ba34f83a50f9508685519ae SHA512 14bab08c037b6405fe99ad2dbbc5ca894f5b6bd2cd509d8c02d6cf61bfd7a29d7b5b63b40952cc662f513b75f7494e88a81e5505ba2249399c49e37602bb0699
diff --git a/dev-haskell/http/http-4000.3.16.ebuild b/dev-haskell/http/http-4000.3.16.ebuild
deleted file mode 100644
index 858fd331b35f..000000000000
--- a/dev-haskell/http/http-4000.3.16.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23,+network-uri,-conduit10
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
-	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
-		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-conduit10 \
-		--flag=-mtl1 \
-		--flag=network-uri \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.4.1.ebuild b/dev-haskell/http/http-4000.4.1.ebuild
index cf5e8423a02d..fcb0013a8bca 100644
--- a/dev-haskell/http/http-4000.4.1.ebuild
+++ b/dev-haskell/http/http-4000.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
diff --git a/dev-haskell/httpd-shed/Manifest b/dev-haskell/httpd-shed/Manifest
index d8bcc7bc9007..f812724b941e 100644
--- a/dev-haskell/httpd-shed/Manifest
+++ b/dev-haskell/httpd-shed/Manifest
@@ -1,3 +1,3 @@
 DIST httpd-shed-0.4.1.1.tar.gz 4457 BLAKE2B 0b7452c8b60517055a4ab9eb56ffcd289f66671f9d9e73ecc57adbb0861797df121f96ef82d924782a691fce83f87c32fa0b65317db06bd6a42780bf5d373b8d SHA512 b168fd18f4d476fc6d903d8dc17a1831645049dc6ae57e977b97453f69c98dc3a288e2c8d0298283bc2b8dd0d4e994fcec27058bb36b9ee0d4d4aac2b9de3b97
-EBUILD httpd-shed-0.4.1.1.ebuild 1340 BLAKE2B c00cd8327bc7835326c556e71c8aa2f86f4ce020dc30b8bfb516d299f225160db26fd4697359704328d5d4a4c01bfde7f9ad3c8a6bbd87b7aa9e6a4c7c6a1818 SHA512 cd85356b83a805d6c0a7cfcfa6860e216273c323f3f3beb3492f8a2ef3c02231b314f76dbc739b79c53f4046334ec21a8fd3cdbf0ed83539bb646885b80537f0
-MISC metadata.xml 724 BLAKE2B ce471e80a27bddc479279a4db0d83e74000548e271861f7c363408da3b5de21a204fd70ca3f3343fe8325b9ab6b9b2b0bd00a5ef8cca837b3f88b855409913f9 SHA512 899aeaa4bdece4238d6d9f09b544f7ef89180c9c631fed9dbb1e73b9d4361a714fb5df2d0e9a5b86ce4cc23b3e5198614b098c788f6d78286c29844911de94a5
+EBUILD httpd-shed-0.4.1.1-r1.ebuild 964 BLAKE2B 7346607235faba1f547f29060e8d99f4c1bc36a47d54b4da32944ac8e5ebf4ea249114a5506e412e87bb18c4cf08daf07aeeeae63b44c55e0fd13a11a264e5d4 SHA512 59d144ac1847a3a9a4503e87c2562899264d23b6ef61ed05dd8382730da1ba14a4bc72b7301ce3929c50028007b2f911e3361e8aef665289783a99e0dfd59a8b
+MISC metadata.xml 564 BLAKE2B fd31eda69066dae5eb73b1f7970d92077769ca1652cd6254b6bac4bae13b13e21f8bbc545c634d59bb54e02a8f0404a13a4f0e191c8a0a2530e167cb27e6b4cb SHA512 1d95f00d4f08bfcbedd3321faa1ea7d1efa0acdcf1eabb03bc0cec0e21382d3c1251eccce79d04150170ea7b9946d22752bbc93f696353fcfbe6438c4e1da8fe
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild
new file mode 100644
index 000000000000..25e4e5f39a23
--- /dev/null
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +network-uri,+network-bsd
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple web-server with an interact style API"
+HOMEPAGE="https://hackage.haskell.org/package/httpd-shed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="buildexamples"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag buildexamples buildexamples) \
+		--flag=network-bsd \
+		--flag=network-uri
+}
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
deleted file mode 100644
index 887a309bcd6a..000000000000
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple web-server with an interact style API"
-HOMEPAGE="https://hackage.haskell.org/package/httpd-shed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildexamples +network-bsd +network-uri"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
-					>=dev-haskell/network-2.7:=[profile?] )
-	!network-bsd? ( <dev-haskell/network-2.7:=[profile?] )
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?]
-					>=dev-haskell/network-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
-					<dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildexamples buildexamples) \
-		$(cabal_flag network-bsd network-bsd) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
index 7a2c9f5d6382..e8d6b06231be 100644
--- a/dev-haskell/httpd-shed/metadata.xml
+++ b/dev-haskell/httpd-shed/metadata.xml
@@ -12,7 +12,5 @@
 	</longdescription>
 	<use>
 		<flag name="buildexamples">Build example executables.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-		<flag name="network-bsd">Get Network.BSD from the network-bsd package.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/hxt/Manifest b/dev-haskell/hxt/Manifest
index b3ce6afa7787..7f7fe009de5c 100644
--- a/dev-haskell/hxt/Manifest
+++ b/dev-haskell/hxt/Manifest
@@ -1,3 +1,3 @@
-DIST hxt-9.3.1.18.tar.gz 223887 BLAKE2B 35d48b60496fc365b4ba493a8cec186fd379ee360fcf311b4529c617f4a7cf825c6547edf3ba3c7b7f5cfff14e05a0fceff71ccab8a45609f445c5c4fd29c468 SHA512 4b7c57486fe02357a45b5f835dd9f05333ce39578ec84c3c920fdcaa2df8ae1067da3650d3948559ddaf2e6f77f14291e1ddaa28a12ea9dfb62a797d296ec118
-EBUILD hxt-9.3.1.18.ebuild 950 BLAKE2B 2ccacd53c502b487624b6e59c3c45080decf227da4bdbb4259f5fee1929e4cfd5f13dd40fdaa35a379461b11dc4b923a515cdf42e8ee22ead732ccf87564330f SHA512 7df9944c51d796da4fa1699b45fb91fc0ffde4b817cceb71b793a2006129bbf52959aea57553e9537a110530d906219205f637324ea5e83171605563e44d500c
+DIST hxt-9.3.1.22.tar.gz 224934 BLAKE2B bbe83adfc1506bad54e20859c91bff04a6b15ca9ece0a90455bb54b77eb55414dd0428656fb641af06e903d17f32a25389fb52bac066d5c51a79e5c4985298ab SHA512 ac7720a01a7769bfb528aa5de29fff9a993c430af75d1326bd50e845c3b7378be09bdda8c99bdd7e45fc5c09fac10c6fc318ff77cf65b2ad7ea2709aff2c1af8
+EBUILD hxt-9.3.1.22.ebuild 1028 BLAKE2B 4739b5516ef2c1b63fbbf8b5269fbb5afbcbb5a7f368ae0ebb17ddf0e20ba6a5eabe7703de3e48fb5bb3fd5720347878c075b43e1f0e634dfff72383334dca72 SHA512 4b71ba1791948071a5117556687c87e7561dbdf64dc4629262cabfc09f793ccc52533da13225b2ac6404da6f948f86e08c4d40dc07ffbe508ce786892eb5d133
 MISC metadata.xml 1294 BLAKE2B b3c309d76bb64d89b089ed74622c15c325b62aded75f9c6c64a8eab944f2799c401176eced495db7fcca949fd1362589141df4ff2d7a36d2e90607846c7f4e43 SHA512 f6b70c76bf6334df21ee7674cc542d7567a480136bc3064d4037cb8b14933a4d9af48bb4123e62366c49cc8e88c66910b2af53fe534de457ed7d73ad1a44b964
diff --git a/dev-haskell/hxt/hxt-9.3.1.18.ebuild b/dev-haskell/hxt/hxt-9.3.1.22.ebuild
index 2a562ce245da..aac5424955fc 100644
--- a/dev-haskell/hxt/hxt-9.3.1.18.ebuild
+++ b/dev-haskell/hxt/hxt-9.3.1.22.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +network-uri
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -15,21 +16,22 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="profile"
 
 RDEPEND=">=dev-haskell/hxt-charproperties-9.1:=[profile?]
 	>=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?]
 	>=dev-haskell/hxt-unicode-9.0.1:=[profile?]
 	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
 	>=dev-haskell/network-uri-2.6:=[profile?]
+	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-2.2.0.1
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		--flag=network-uri
+		--flag=network-uri \
+		$(cabal_flag profile profile)
 }
diff --git a/dev-haskell/ieee754/Manifest b/dev-haskell/ieee754/Manifest
index d3ef230171e1..383c7c780c2b 100644
--- a/dev-haskell/ieee754/Manifest
+++ b/dev-haskell/ieee754/Manifest
@@ -1,3 +1,3 @@
 DIST ieee754-0.7.8.tar.gz 17290 BLAKE2B befc4e9f5f1b69a6ad29a2bde915a6f9115a307419d903db6f4cb4108f3556d5475805f997e31212f580ed859c45e3019c55c0fd1ce8ec3bbf0d1892b04fc091 SHA512 662ed7c68797164ee5f0cd3132da96d8d9032aa23037d57636281fdc4952a7c276f92deb032db60663ab1c71311fd8d3088265fc03f772f271dcb659f3e9b866
-EBUILD ieee754-0.7.8.ebuild 558 BLAKE2B 7b88b011524cc30aff34399f88ad131ae9d7fa03c1e142ba73dfcda39852ba652e68b34639da61e437d4fa04c8b717db217c62179a2b9f2209a272277a35c11d SHA512 57a6351bbec899e5bbe016e69b8bfb311451b1d3739f200847777e21224e1d6a71f3111b3cb7521640d7540238938f414e7f36ae90c9e0ebcea27f0387115467
+EBUILD ieee754-0.7.8.ebuild 565 BLAKE2B a6497935120caf3c3a43748d9f1e0512443381a808088424a060869e7b5502b99914f3458596f221c2c0b8ba1d26a3ec8c8f2824124500a647a5e8d713c9b6b0 SHA512 f88f123eecf5b7441c114a4f8781c8b9da1fb7647b0c5b53c218884429407426210c649705313380f3f3ce2fe35a58882bfacfbd075abb294918142cab52c825
 MISC metadata.xml 531 BLAKE2B 43b4ada366347037989a9d0f578d3007c7dbe15e21a37fcf3840a57772e15edccfa8817b6aa1bd2dc9b3bd84fd7ac767e476d85b7ab5083745b756b9bc899e4e SHA512 8cab2f17293a73ca7a84527035a44bf7b0cdfbb8ac54b5c78c3ff0752dd165550116dfc4f3af2b93d5d558879ff3d16e91bd1db5c6c17a6002cd8d5e2edeebcb
diff --git a/dev-haskell/ieee754/ieee754-0.7.8.ebuild b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
index a2ba2fb33338..8893882e40d3 100644
--- a/dev-haskell/ieee754/ieee754-0.7.8.ebuild
+++ b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ifelse/Manifest b/dev-haskell/ifelse/Manifest
index a11dd74931e9..7bcbbeed2546 100644
--- a/dev-haskell/ifelse/Manifest
+++ b/dev-haskell/ifelse/Manifest
@@ -1,3 +1,3 @@
 DIST IfElse-0.85.tar.gz 2865 BLAKE2B 620522dd255b30d28dd1ffe93591ceff0191845731e4a717bcd92dbf746f363fa37b1eb6694af55fc9f4fe56add4fb9b82bdb17d0b0263cf82feb2bf76cc4c39 SHA512 5378b0f98d3a14dbc5b297a01a5c48aed4825f4ab2192e35b3a6aee932cce5b740e5ea44cbbd69dc3e74ff38415d77df43136e2a8ddf9bc6fd9fe1497a6dcd1c
-EBUILD ifelse-0.85-r1.ebuild 658 BLAKE2B 3988fbda1743ee629c7834dc9fccb02add046a09186e5e2cb85951006180bee4f9b06016e1f5946b1ae664a8ea204f68aef4d6b87cffdccdede1af22263c14e0 SHA512 0cd013d01d5509dab5a9333c67c38ea7c507e79bce512582ec977396fbc9bd1019e0392f7ce850169342d2730d2f111153bd95be850b354404b1ed8ff7f620e4
+EBUILD ifelse-0.85-r1.ebuild 665 BLAKE2B c744e48858b00c12797a0566230fb4b2e5685ff9325be80c669dd7c8f6e552e9cc1e368dfc2eae60af770ff31bd0eb9ab3e6b9f87ba1d3862ddd4e1006b7291e SHA512 05d8ec69233a8c86ac7b73441f00652aa019e20b3f8c8826c5505e4a0eb21c64f3f824437cf0dc5a8f59d4f0526fc7da36a1ad819a95a11e591c4f3db382a370
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
index c1d6dc73bdc1..3823f3932d9b 100644
--- a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
+++ b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/indexed-traversable/Manifest b/dev-haskell/indexed-traversable/Manifest
index 406eb77062e3..4ec9156a452a 100644
--- a/dev-haskell/indexed-traversable/Manifest
+++ b/dev-haskell/indexed-traversable/Manifest
@@ -1,7 +1,3 @@
-DIST indexed-traversable-0.1.1.tar.gz 8424 BLAKE2B ae6465c62dbd850350433e9a465fcc54d7e25ab80da8b86180bb9aba9ffb7010df5704931a0137737129143e984a6d4ec367ee06d8ed4fda9336410397c4ea9a SHA512 63d6c305f33d97f34c4efaeaede0e5c06c5ff95df9c45307e849de54693c0f93ec017d0e163c64e14bbb498bb2b02a3d54d1cd6a4e75992c8f96609bb73c8dbc
 DIST indexed-traversable-0.1.2.tar.gz 8685 BLAKE2B e136715ed18919f614b1c977f27556447f3bfdf745f6e47e7cd2aeb3038d7afaae31a34f4e9f299494cc034d34ba4e75e7e8481b8b81ba421a1afb1a8408c619 SHA512 38d2dfc0e45e3eafa1e8827c7f27a64e296902f0193cb61939af74ad6845be067024ac32278a6b5bca1976a2d3ada5820a7a6879d7bf9000730450714a5df9c4
-DIST indexed-traversable-0.1.tar.gz 8261 BLAKE2B 872042f6a153daa7e862d9de04d18b18689550c64a750631956e778c59ac918165d2d55f0e4306ed146c873af01f97b54bc9bac15f9ddc0982db3860146d5069 SHA512 46ef672659685fd30be7a0ef62aa9b9cc63582acf97d44d6a43557f94116a90d5457d1efe20593caad5ab348c688f4b935e1595aff750fdf671bb20942ac7320
-EBUILD indexed-traversable-0.1.1.ebuild 931 BLAKE2B 9f5c97d6ea7035a8fd060e99a330af090f3904f76144129496d1807031c0d5a399aa4d218d590cf2598250bdf6ee4fd2d61940bb2e34ed9d37853861330cd618 SHA512 097285114aa41b5edb6be01b610247ffaef3feb3e501098b2081af2dbe9b321d850e1b69c3b49ba5cb7a953324a3fb82f9ae6aaf906d093fe5258958a506aee1
 EBUILD indexed-traversable-0.1.2.ebuild 583 BLAKE2B 8a7e8abfaadbec454af8978a1707f0897c0c28aa6ddb5eb6f83c4e64ddc009cc2493c1decfb386226f8cbe0b32579be1e9fb012352af549fa7db1d7f9bdae8da SHA512 315333d608682b5cd0634cac01b5ab98491b5ffa7cca08899c7aa0c2e38fd9de6c43ba406ebbd14bc9c9b92fff999bca566ccaf642eeeb7aae3ba5a411fc860f
-EBUILD indexed-traversable-0.1.ebuild 931 BLAKE2B 847cab458f19c947ff211eda8385ebd980cfd47a62aa352ef443cf2f2b5a9c7529f2926f02594d1cf84dfdc1d7c3bb29c2ae9bcb3cf933490098ca93a73fa648 SHA512 a65f0c0a63efad4f6accbec70640c22d373ed39f7ac623dceae4829a5cad2d020042fc98fb684d7ad867355d3fa7cc98138a17af40e89cff7ea9f617e40fc8ee
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild
deleted file mode 100644
index 865aa49f6371..000000000000
--- a/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
-HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
deleted file mode 100644
index 5c2c92466fbe..000000000000
--- a/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
-HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/io-streams-haproxy/Manifest b/dev-haskell/io-streams-haproxy/Manifest
index a625ebe9b01f..3a7dc29dad7d 100644
--- a/dev-haskell/io-streams-haproxy/Manifest
+++ b/dev-haskell/io-streams-haproxy/Manifest
@@ -1,3 +1,4 @@
+DIST io-streams-haproxy-1.0.1.0-rev3.cabal 3084 BLAKE2B fafef1a4200d013fa97b674929b9529f09ddf63d004a63ea2941ed1ab0caa53d820fde2103208b8b1bf40b3f1a501f637029699a563cb5ad81e421c774e9e062 SHA512 34dc8cd1b371aefe81a4416b5cf3a19d2cd89ecd2e01594707d21346a6011c64d9522e38343bc8f80fc97b371079cc5c034fade773cfd9ac42ad51842e4ea9fe
 DIST io-streams-haproxy-1.0.1.0.tar.gz 10348 BLAKE2B 6c2268cacdfbe73561b8f753594fa39a4027ddf5d22696c7487e8b4c74c330627feec748789389f9f942c14412ecd030c80e779ef0031905d2fe681d7a1bff66 SHA512 6d9f2da6b014a9f2ee894237af56376b94616af1c1795681adac4bfd10edfb851cbe1a37295025c6ebf7e77fe7b5d2abba3557ac1a9ed594deabaee05151572a
-EBUILD io-streams-haproxy-1.0.1.0-r1.ebuild 1248 BLAKE2B b7024c8d4b2cd27af12d68baa23627ae81bcdc843afdadeedd1d2619831cd90a51ea9eac9f5b214895be5a06dca91f43d36a73177404c46038a7b1dc21350015 SHA512 0c85bcde5dd017b23526684f24d76368da90f3a9d01b9459f48fed1c0c16f6308916c40c30c2a6e22876285a3b3f86d16b9b5ccf6eaff0cd92aa7aa34c44ee2d
-MISC metadata.xml 622 BLAKE2B 22ec2f743f190e52da3cc5d500294f01f4c7e8c3a36c7c9f134ef87256ec0dc32bf0e867d1e24c3f1b4eb4da5dea84b8108e7134622f6df443341d4d00c908d2 SHA512 0383579d4fbe5a9ceb0e21a9afba4a9d70ef568ce59498437ecfaec299b5310f3d0ea499d6741bb768aba4c8ad1804fe27d66962ade4610c9e4b50cb4dd08f13
+EBUILD io-streams-haproxy-1.0.1.0-r2.ebuild 1591 BLAKE2B 72d51238742f761a3893269866cfcc27fb219eadd1c9c37300fb07c393678a52fd34ba07b2a4cb2e3f505a913dee341fd9c2fc43e72dda8ca8c2f4566c18dfe0 SHA512 599bca791e5510672624c8aa54b7848d332d177dd43c07a8c067e2a86cf39d8e494a98f6687e08e64daf2e3a9c9a0730d5c5457bd291d30a26147d121a9899c6
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
deleted file mode 100644
index 8dbbfe09f058..000000000000
--- a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HAProxy protocol 1.5 support for io-streams"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # two tests require network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base              >= 4.5 && < 4.13' 'base              >= 4.5' \
-		'network           >= 2.3 && < 3.1' 'network           >= 2.3 && < 3.2'
-}
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild
new file mode 100644
index 000000000000..22bc397b0345
--- /dev/null
+++ b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="HAProxy protocol 1.5 support for io-streams"
+HOMEPAGE="https://snapframework.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?]
+	>=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?]
+	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+
+	cabal_chdeps \
+		'attoparsec        >= 0.7 && < 0.14' 'attoparsec >=0.7' \
+		'base              >= 4.5 && < 4.15' 'base >=4.5'
+}
diff --git a/dev-haskell/io-streams-haproxy/metadata.xml b/dev-haskell/io-streams-haproxy/metadata.xml
index 297f2aa02cbf..937381521944 100644
--- a/dev-haskell/io-streams-haproxy/metadata.xml
+++ b/dev-haskell/io-streams-haproxy/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HAProxy protocol version 1.5 support (see
-		&lt;http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt&gt;) for applications
-		using io-streams. The proxy protocol allows information about a networked
-		peer (like remote address and port) to be propagated through a forwarding
-		proxy that is configured to speak this protocol.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
index 4e2eac96838e..78050f62179c 100644
--- a/dev-haskell/io-streams/Manifest
+++ b/dev-haskell/io-streams/Manifest
@@ -1,3 +1,4 @@
-DIST io-streams-1.5.2.0.tar.gz 63812 BLAKE2B a555bc0bc365e4e2c28570da34e6c2891ff56a7460ec8a857285a22ea3a4a2b8975139c3024fd90ffec51386646d9ed632754971abef04fd2c358cba5e0a19c6 SHA512 2cb6c9cded0077f1501b0fba576b79e5ebf21ccc2711a91552ec46ef6d5e943e0c1255cdfda381aa8e4d7691b1e450956bedd2fbd4414b13ef7926b0cc3dc4c3
-EBUILD io-streams-1.5.2.0.ebuild 1863 BLAKE2B 7239468f7bb1b4523aadea960743b25ed33bc764e1ec16d167281a7ead27a30553b600bce45d179940dd1f4d4cc47fe2bbbfa73be1bef0ad7a81702a6ee2cef5 SHA512 1e7037f2b0c55ffd1529e89a53bee05b3716511dc7b513e761c8f53ef11b9f50a9c1fc680e23e3b282cf073d8cff80bb38f2715d2533a282a11d985107c5c387
-MISC metadata.xml 2650 BLAKE2B c67f812693ab5b41ed42dd9f02e3cc60e3374a0a071bff6ec19bb8746a43da48c59029d38ca80d59d23f58a96de118fef40594ca1bc91e05e5c66adc09c17622 SHA512 8210a9391b6c3d025f02050d8c2a3815ea0ceefbe5afa18908508ca87975c116a19ca53d1f7c134f675da458e3b801acf665a0237b5fd19bde4e987e8a183b53
+DIST io-streams-1.5.2.1-rev2.cabal 9916 BLAKE2B ac72adc1e84dc2016db65266141113d26e981d2c057574f02ac4ada94c62f4923265e528f3cd4917142ec32de2880f8607776964628c589355fb3639a222448e SHA512 3b2519b655095bdd6a5c2d1180dbaa2ff750f52a9ee02d893d6b82951e3ca2b6a61b81d694cb1539a0dd4080f223a038d3e92df1b660fa9c4a5626fa62460541
+DIST io-streams-1.5.2.1.tar.gz 64050 BLAKE2B 6533d2cff65e3f7af54b6a652e13a2e75ef4a2b38dad6dec3bd3d299f479e7f6293bb63b27dd1066561d6a1eed9a65fe47910d2f8eec83baffdff532deb53433 SHA512 c86f55714469198bab5a670e8b061e75f3f9ad6576ed1523df543365caac492ba3b54fb6356a898c27fa6394e96874bb636e5b9100cf70e0de0d7f73e91ba9c9
+EBUILD io-streams-1.5.2.1.ebuild 2107 BLAKE2B 8f0623e6d1c3aa5f48ecfb1ee0f4b2a93053eb3e5206d88f8d270adda2718e06870264a0e0c5be89cd10a1c2885970041036f8838af979f47933aabb6309db67 SHA512 e82656183091e14b2349cfed64baba604ac5470780baaba316885d793b784dde86a2c734b1a9065aba49179465e7109a7e339ef607b2357e1d1a366cb20d3b9b
+MISC metadata.xml 367 BLAKE2B 7941719997b039a64f880ce01d6a68af50af62e185633a78992961b1ee691a1387cf612dd1ba8083d4fcd3097f4d16a6732103cbd6f3acdc9f76c05ac405d657 SHA512 b9056efbbd8d992bfd04e21e1572bb942e03124f35b305eddbc76338381ff0bd8d594cad739b13ffc397dbc4c5bada776f28d25040651fa818e26692333cb226
diff --git a/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild b/dev-haskell/io-streams/io-streams-1.5.2.1.ebuild
index 0d44d531e46d..f7a2f97e1d31 100644
--- a/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild
+++ b/dev-haskell/io-streams/io-streams-1.5.2.1.ebuild
@@ -1,44 +1,57 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.1.1.9999
 #hackport: flags: +nointeractivetests
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="2"
 inherit haskell-cabal
 
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
 DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
 HOMEPAGE="https://hackage.haskell.org/package/io-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+network +zlib"
 
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
 	>=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 	network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] )
 	zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/mtl-2 <dev-haskell/mtl-3
 		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
 		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
 		zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) )
 "
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/io-streams/metadata.xml b/dev-haskell/io-streams/metadata.xml
index 310f0593f2cf..7696ff9ecf64 100644
--- a/dev-haskell/io-streams/metadata.xml
+++ b/dev-haskell/io-streams/metadata.xml
@@ -9,73 +9,4 @@
 		<flag name="network">Include network support</flag>
 		<flag name="zlib">Include zlib support</flag>
 	</use>
-	<longdescription>
-		/Overview/
-		
-		The io-streams library contains simple and easy-to-use primitives for I/O
-		using streams. Most users will want to import the top-level convenience
-		module "System.IO.Streams", which re-exports most of the library:
-		
-		@
-		import           System.IO.Streams (InputStream, OutputStream)
-		import qualified System.IO.Streams as Streams
-		@
-		
-		For first-time users, @io-streams@ comes with an included tutorial, which can
-		be found in the "System.IO.Streams.Tutorial" module.
-		
-		/Features/
-		
-		The @io-streams@ user API has two basic types: @InputStream a@ and
-		@OutputStream a@, and three fundamental I/O primitives:
-		
-		@
-		\-\- read an item from an input stream
-		Streams.read :: InputStream a -&gt; IO (Maybe a)
-		
-		\-\- push an item back to an input stream
-		Streams.unRead :: a -&gt; InputStream a -&gt; IO ()
-		
-		\-\- write to an output stream
-		Streams.write :: Maybe a -&gt; OutputStream a -&gt; IO ()
-		@
-		
-		Streams can be transformed by composition and hooked together with provided combinators:
-		
-		@
-		ghci&gt; Streams.fromList [1,2,3::Int] &gt;&gt;= Streams.map (*10) &gt;&gt;= Streams.toList
-		[10,20,30]
-		@
-		
-		Stream composition leaves the original stream accessible:
-		
-		@
-		ghci&gt; input \&lt;- Streams.fromByteString \"long string\"
-		ghci&gt; wrapped \&lt;- Streams.takeBytes 4 input
-		ghci&gt; Streams.read wrapped
-		Just \"long\"
-		ghci&gt; Streams.read wrapped
-		Nothing
-		ghci&gt; Streams.read input
-		Just \" string\"
-		@
-		
-		Simple types and operations in the IO monad mean straightforward and simple
-		exception handling and resource cleanup using Haskell standard library
-		facilities like 'Control.Exception.bracket'.
-		
-		@io-streams@ comes with:
-		
-		* functions to use files, handles, concurrent channels, sockets, lists,
-		vectors, and more as streams.
-		
-		* a variety of combinators for wrapping and transforming streams, including
-		compression and decompression using zlib, controlling precisely how many
-		bytes are read from or written to a stream, buffering output using
-		bytestring builders, folds, maps, filters, zips, etc.
-		
-		* support for parsing from streams using @attoparsec@.
-		
-		* support for spawning processes and communicating with them using streams.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/ipynb/Manifest b/dev-haskell/ipynb/Manifest
index c87acfcc30fe..f9134e84bf6b 100644
--- a/dev-haskell/ipynb/Manifest
+++ b/dev-haskell/ipynb/Manifest
@@ -1,7 +1,3 @@
-DIST ipynb-0.1.0.2.tar.gz 20158 BLAKE2B 0bdae84979f855e619be8bd61ff7f6c2f47a5fb7b69dd5e4d22b629a5684efd8ad0085dbb3fda50b726cb84fc72c1fee956cfa53e280e7f63e57c404ac5d9c3b SHA512 81f1322d8e6c79eee117b60aa6b2c15b89345d14e52066127e7ecbbf68ed2ac307917913f1f51fd310055043e92457e2f3610912c5f647fdf096d8bfe8874ebf
-DIST ipynb-0.1.tar.gz 632774 BLAKE2B 9c1c7523c230730f56fd7c0fb729f67a904b34c48e573aa7e19f1b34d47791f4a3cace8d0e6d4ba6faec531b476fa012c742b8b33232f2c09e23da91541f71c0 SHA512 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4
 DIST ipynb-0.2.tar.gz 632962 BLAKE2B bdd85dd21e9e34e9e60157bb3d7447afa96a5ff83aa00fcf9662ce388617e974e81058d6588d5b41d55a38c32fe2e05458987e5ea37c53bf0852bd6c7b60b2b3 SHA512 885ffa2f2269b2bc6c2381fe7a7c91de93e8539ca3493d5a8207e75e986fc42a4b8ead0b4d05184da5bbb931466431ca1b810f03db8cd2c1624a67e1bbb782ea
-EBUILD ipynb-0.1.0.2.ebuild 966 BLAKE2B e7bb8cddba04fbf59de0a95a342b3ca209c2be9b27fee554be2a9c1e5d956a88ce3e469a35636f4369a879fee74a4df7b8f2db6f9c9aa142d33e151b3f9722f9 SHA512 4d1e53ce108fc854ac42b5f9385d7dd0bc1f0bd510263d624aefb8ed6f26f4b48916037fda08c5974c4d9cbd1908e74be53617cd3fc0f6070f4ce9b6fc238fc6
-EBUILD ipynb-0.1.ebuild 966 BLAKE2B 9cf3b710d92ae690e260276ba731bb032a0526cca5f932b289da7afb11319d93a49dbe4f4abd44b56051e033e5bc8d5a0fcd2633f16f156c88cff797523825e9 SHA512 2f59310131d782b98a72cbd865d6fb77fd74c8e2a9f5500e2865632572cc0ae69e0e12ebdb0fd0a30494470afe19e98cc142ffb1e4f462919ae82fd0c048082a
 EBUILD ipynb-0.2.ebuild 847 BLAKE2B 7d100fa8e11dcdb7f740fe153665930991e7199a7fce6055687a29cecc8ff41c913d149c5b9b0d1d0a02e511df521932185a8cdcbc4bc88d0b82294363a61744 SHA512 7d4c7a388f4f3ebc625a3f390ff03bf4c16239afb7f9c54eab46b15d0e116ce730ae86cf073858e904fd6b317ff5645d30513a3966f1053c2d9cdcd745be9a7d
 MISC metadata.xml 449 BLAKE2B fab284b4735e33304e32c70e04a68f86383f357920d6c38d0d746381a9c44653213c424a7fd8048ccd1332018e9673d837b32665a9acc5d5b20ef8c7d196673e SHA512 6b8f9a40aa74e508fc8d36a0551759864015e751fa08064a077f48ac7dcea8f49b49362cabcbccba727e449d9c5e6b534b0d3e7c1483f79851a1353bc1503e94
diff --git a/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild b/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild
deleted file mode 100644
index e8f0c458f446..000000000000
--- a/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Data structure for working with Jupyter notebooks (ipynb)"
-HOMEPAGE="https://hackage.haskell.org/package/ipynb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/aeson-diff
-		dev-haskell/microlens
-		dev-haskell/microlens-aeson
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/vector )
-"
diff --git a/dev-haskell/ipynb/ipynb-0.1.ebuild b/dev-haskell/ipynb/ipynb-0.1.ebuild
deleted file mode 100644
index 06638f5e9ff0..000000000000
--- a/dev-haskell/ipynb/ipynb-0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Data structure for working with Jupyter notebooks (ipynb)"
-HOMEPAGE="https://hackage.haskell.org/package/ipynb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/aeson-diff
-		dev-haskell/microlens
-		dev-haskell/microlens-aeson
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/vector )
-"
diff --git a/dev-haskell/js-chart/Manifest b/dev-haskell/js-chart/Manifest
new file mode 100644
index 000000000000..004eff151b2d
--- /dev/null
+++ b/dev-haskell/js-chart/Manifest
@@ -0,0 +1,3 @@
+DIST js-chart-2.9.4.1.tar.gz 501058 BLAKE2B 364aff9566b5fcb18cdef88af38ce7832cbe9347dd7aea0a2ef24aee80901d3802b26f6eb81b58894d94e138903b1dfb7381f8e6511294090da6f656ad63e04e SHA512 0e6325e12822d2607e04ac61e91963f4aed77a8700ec3bb3bc0662a9006780b6a60361ce135452a684dff048e6089f6057a85b2a83b093448f19dd4eeaf4ebae
+EBUILD js-chart-2.9.4.1.ebuild 551 BLAKE2B 3deddee6164318e0d0ac5b77959a80251c8bea724e1620d4adf9ccaf97cce00797ce4b2679c43e392c3d3b9e271e63eef0d2022786e8cc5fdf605840093987b6 SHA512 05b2aeaf21d8257f2a8977499df91737b06ee9cc38a62a20acf17bf9a1e40c669c5801c84d992ca499866fc1e466e34f18677ea70bf65f5392396600f113e456
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
new file mode 100644
index 000000000000..92338e500851
--- /dev/null
+++ b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Obtain minified chart.js code"
+HOMEPAGE="https://github.com/jonascarpay/js-chart#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/js-chart/metadata.xml b/dev-haskell/js-chart/metadata.xml
new file mode 100644
index 000000000000..937381521944
--- /dev/null
+++ b/dev-haskell/js-chart/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/js-flot/Manifest b/dev-haskell/js-flot/Manifest
index d8f75cf76a04..3a07b93563db 100644
--- a/dev-haskell/js-flot/Manifest
+++ b/dev-haskell/js-flot/Manifest
@@ -1,3 +1,3 @@
 DIST js-flot-0.8.3.tar.gz 662691 BLAKE2B d7a8abca7eb8a45fa28da783139f6e672f5557dfc75c1a2b1f41254a3b0e09500f0f1c179b41f76fed456485d4c1db716e51306260c84c090a8779f23b86b791 SHA512 5732938b37e9036156528c0d34cd99b45405db81d1e70b6651b056075ea8d9b616da1ae709c2de1f2f5be044236a3b81fc358d973769fca26993500ff9d0dabf
-EBUILD js-flot-0.8.3.ebuild 573 BLAKE2B b2a783b73b04a6b6b934356c37633a217a9bde7cabbe28c5c118ba122eafde0fb03819079bc2528a8c867e28d18b24daab828958124f9e6c5f32ffaa8288c8b4 SHA512 bb3b7253e20ec95a59343f83c6bb634e83ea92a8fafe5a36f099fc229a5b589bc24fe716bc596fc783f3dabbe71bf6ecf57b561d49d46f993e50392382bb15b8
+EBUILD js-flot-0.8.3.ebuild 580 BLAKE2B 59ff65ff4c84208c2e982667fd1e2e2aa92e7813d4d3c661ac7f75e27e94d96f94d79ec25f6d28d70908b4b7fbb3c636950a38e13b51dbfec32aa697dbad88a7 SHA512 3d79dc07ce19f901574610da8459e57cac876ba8f2ed63a40870b87158fa8e9cb9583cc9ad7f24b129016d1a3a737997eac10f2f48b909f257bd298b0e6b5440
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/js-flot/js-flot-0.8.3.ebuild b/dev-haskell/js-flot/js-flot-0.8.3.ebuild
index 147b2a8bfabe..b6ad17c9e0e2 100644
--- a/dev-haskell/js-flot/js-flot-0.8.3.ebuild
+++ b/dev-haskell/js-flot/js-flot-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/js-jquery/Manifest b/dev-haskell/js-jquery/Manifest
index 1d5168a6ce32..4c0faa37b645 100644
--- a/dev-haskell/js-jquery/Manifest
+++ b/dev-haskell/js-jquery/Manifest
@@ -1,3 +1,3 @@
 DIST js-jquery-3.3.1.tar.gz 114431 BLAKE2B 861251a15aa7b486202be7476366ebb584278ec6a5f5d58e132f2c4aaf086367e9952facf63ab8cc74eec8a9914182c18d66d2d4c76a59d627c887c3ca5e4792 SHA512 3222259a4342bc5156d5360385a478e235def04db0381cc48f342baac5018e91350dce760adb9b9ada796bc6341d5629f807672f629ee127faefe521801d62bb
-EBUILD js-jquery-3.3.1.ebuild 613 BLAKE2B 21d410960a74975bcc701e25acd66cb1798cdb7f30e1e917c386adcc3ffd13b6c51248b1dd576ee20aa110e86d08a10b116db3ce59183f31e448ce0c46f0083b SHA512 fea11d941775d6f734e9847de98d611da383252e0091c87a727563fd5804c486b2342d046315e84e4062d5b89548ef62d5724d0699706d9880b1379bb76abb6c
+EBUILD js-jquery-3.3.1.ebuild 620 BLAKE2B 329656a438cfbc653c3160629f48fa7f13a60b85b9117937e46bc2ac995cd9c7546a52fe47a80d7fea24e09cf5ffbda244b2c2d0175fd1899a09be81ed55a8f0 SHA512 24db341406f169c32dbf670efbd993119fe2dcebfd2ec7cf4874ba6380c1f4f4612127d047f15b0dc7dee41f41f6fac4bd46b1792ae93ac3bb46a23bb4e69cc3
 MISC metadata.xml 708 BLAKE2B f2884f4472e4df2ebb09b6a15df43dbb290d4701ff7f4b93bf0a77bffe7819d0f511ae98b18f234a9a8a231f57686941b3661b8ab0d54d8dcfccb4e7dd66a095 SHA512 f530dab3803ce3621941f25775f9c3a7044ec6aa12772114f603b345b4f4ec3f7fcdfae08c808c1a8e222e3e775afa61a2655da90af311e4ac46dad2cc14191d
diff --git a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
index 9487166647fc..6736690505d7 100644
--- a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
+++ b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # needs network access
diff --git a/dev-haskell/keys/Manifest b/dev-haskell/keys/Manifest
index 03309f6bb69f..03f1f95f6f21 100644
--- a/dev-haskell/keys/Manifest
+++ b/dev-haskell/keys/Manifest
@@ -1,3 +1,4 @@
+DIST keys-3.12.3-r1.cabal 2321 BLAKE2B 03ef68a87426ddc2f3e2e32ecaa047a12a0faaeffff34e6fe5e5e8feef2f2086fd5a00ad3fc9947aaddf6d650e7121154299b5d67c23e6d08792a3dcb816cae2 SHA512 d54ba212421849693e75e295e471858a20057230a68054fe931e0c4f054634e4e5e44ec9e38d3c062c31b41a4dc9dac4149dde3993c26ecacde7819038dc93d0
 DIST keys-3.12.3.tar.gz 14378 BLAKE2B 0c2c4599dfa9234e9170a285206ad94f988246a9d56440ea5a89680e17cabd488372ec7b444fd997deb27f6315f9d843494dfbbdd4d2a09ef0525829e7340ed6 SHA512 e0bab964eb38388dfb2fe7dcb4999da0263a2162f171f7ed629a2e1de33eb1cb99dc37a6fe32045f136466cebb5aed69e533417256877316c81a02abc700c28d
-EBUILD keys-3.12.3.ebuild 1348 BLAKE2B 1a684bb5dd33fc1ad37f34557b7020d7eb501521d5267a9ac8da6e0febefc24fd7b30ca60bf853d6139148d103d986c702301869db632a740c3d0b13f142a3b2 SHA512 e1a951c2aedf98d87fa21067915c3677e448712754e2376d8316545f3eed1a130552e6852116ecffc84c35c138e8eb327de62e4625f28575b3e08ff143f7c28e
-MISC metadata.xml 326 BLAKE2B 689967599b8b33639f8f2059c611d75207588ef9068cd55739765366bca3347fb224037e564139a3288c7ec8f723d1403f8a3eac0b60905d28c9cd04ed83b395 SHA512 2092d2d7fd1a024eefc668c1fcfe646b4cfbb1dbb0a29726e535a53f7fa139e58a1a69f7455f580a6c9bf9821d811beac0e572d5051f73cb1dac8fb1fd0c2526
+EBUILD keys-3.12.3-r1.ebuild 1588 BLAKE2B 51be28c4a869ced2786dd001cd1a2f0ec4fdb3085324e8a62a31069b41ccb12378a6bca2d86668e9dbf6c20e1f29d740490357f7e10f98a19fa614ccaad4f1a5 SHA512 c5c9149b23e905aeea40cef235be99f308a7ff968d5a7aa61a6f3b0da77a97fe146565bef5ac80dec10c6bf99567a54272b072a269fd7d1bf264640b1159cf59
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/keys/keys-3.12.3.ebuild b/dev-haskell/keys/keys-3.12.3-r1.ebuild
index 5d1ecad351ff..f8cd4e442042 100644
--- a/dev-haskell/keys/keys-3.12.3.ebuild
+++ b/dev-haskell/keys/keys-3.12.3-r1.ebuild
@@ -1,34 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="1"
 inherit haskell-cabal
 
 DESCRIPTION="Keyed functors and containers"
 HOMEPAGE="https://github.com/ekmett/keys/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND=">=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
 	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
 	>=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
 	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
 	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
 	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
 	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 "
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/keys/metadata.xml b/dev-haskell/keys/metadata.xml
index 845daf0c0a9e..937381521944 100644
--- a/dev-haskell/keys/metadata.xml
+++ b/dev-haskell/keys/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">ekmett/keys</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/language-haskell-extract/Manifest b/dev-haskell/language-haskell-extract/Manifest
index 9c15b45ed991..c6dacfc8f668 100644
--- a/dev-haskell/language-haskell-extract/Manifest
+++ b/dev-haskell/language-haskell-extract/Manifest
@@ -1,4 +1,4 @@
 AUX language-haskell-extract-0.2.4-ghc-8.10.patch 761 BLAKE2B 1565bc0b79d2d45e3f191c0dff11e2552f4665b37c536c29561f0b04c500e4aff8994472f09a6c5780ffa754007fd5e6a4c692aa827e6c4cf10843b1f17b414a SHA512 a8b0f4c1bb17ff160a755a5ca004e16659a051d31d4feb6cac0d91596b69da4668bdfae4cb855f876268d47d5c0e50e1955088f4431004b9b4c6d9a4ad2e2e15
 DIST language-haskell-extract-0.2.4.tar.gz 2458 BLAKE2B 9655707a3195c82d5eda9cfbba150d3a91e103155cb522b0d9e13456e833b5530c808435d915456c230f92c438d2989512cbff956c7fd87493e481d39a53fbd8 SHA512 6408459abf9d531ccbe7d65766d38fcb93f4d3f9c77db1a706231bf6d8ad6f845fcefc4fbb03833f45c74f21f324a44760f3c89ff093c69f1f9999e64344ab4d
-EBUILD language-haskell-extract-0.2.4-r1.ebuild 653 BLAKE2B 23572a466ce74b5c99b4a05197fd16073eaaec39f68d5b97798cc39635f37f20e37eae60e27c723d3775e0c25f9383c8231107800e8f6c43cd49e1b98227a84a SHA512 f444111d639713f8b99924f9dc2d2a8d5a2e67a9a40d9f9ea546b945a80caf8d96c91bcafe0e6e52f611b27dae1b0e5128e7764e42f664367faaf5a42cb45cea
+EBUILD language-haskell-extract-0.2.4-r1.ebuild 660 BLAKE2B b132e031701265b30711c76e0dded0a92f28a92fc59ade2eb9dfbd4e29bc2faae31835d65778cd683a934145a77cf68490fc351261407bf6a5cd2f476cf144d1 SHA512 55ea379004f85d18797a49a8af50a29770519b4db93ade226132b5e9b3167adf098ed95207a1ad0f31955d907ac07f8a45e7b70eed0bd40578a445faf8fa8427
 MISC metadata.xml 1476 BLAKE2B b1f7cd7468134bbde7be9be977e25f39da8475979de7d7a59491c1bb387eadd7e9e6d9f35921ccb96d7b74dd5b60f7f022b3765513bae8d3444eb8e0d8de97c2 SHA512 45ec94b3bbee94301428c55259237e2ed8de2e1c4925a9ff7e56a3f4dc6c8db868326617656387b23f47bde1e9a58e24b03c1625048ca8de214fedca1df1f86c
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
index f7c821fddeee..002b002320fb 100644
--- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
+++ b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/regex-posix:=[profile?]
diff --git a/dev-haskell/language-javascript/Manifest b/dev-haskell/language-javascript/Manifest
index 49b01dd9ee94..ab468ee39caf 100644
--- a/dev-haskell/language-javascript/Manifest
+++ b/dev-haskell/language-javascript/Manifest
@@ -1,3 +1,3 @@
 DIST language-javascript-0.6.0.14.tar.gz 75969 BLAKE2B ca286024545ae1b6ceb84150865c9b4768fd7ba3e783b86c01a977793cee868b55c1bec2daaa498ecc6b672be01358f76df9bcc8196c73d7463ed3213c9e6e42 SHA512 e51dc2d94339583cea58dafc5092571d54ea170a11dd1b38068f656af63ede76cc914dbbe2c18d3743c68108e3d143c8b153ecfb39410f8a4cbe108cea26fa56
-EBUILD language-javascript-0.6.0.14.ebuild 921 BLAKE2B 7dd00d593d113cd92e1c40f7aa4adcec952038457fed19522bcada2299b5911c48a213775dc5d10d698d3d9b78ab810c334264e83bd9be58c58c2a327475caa1 SHA512 7ce29ff9c327eebb3065d09f4a0b5d687469a2aebd9b71bbb622f939b7104cad62977db00d991a921a14b94a5cb640f2fd5c54c9795d45a74c5b621559fe43e0
+EBUILD language-javascript-0.6.0.14.ebuild 928 BLAKE2B 922a4dfe4b5b3c062627c4f038c563cac34a14142fe2725d98f41fceb83ce85443f384b4c7081b84e39d67e2344f6e6518b7ef88273f1b454e29ccb05cb683c7 SHA512 00e2d9902a3795994cb444e941092c938eca9d597fe62675ba9481346728cc71fe38e8cc7ba14bb8867f8ad524497113b22a227bc8b550032216bdcfc6f49f48
 MISC metadata.xml 340 BLAKE2B ff6ee61675b1a870f7f150de2e00f21cbae2b59c109ce4ffcd7572dfaf89c01e6a56f24babc1d285ef980fc753b04a9739d4aa960f9c29ca4fd471c7e549d8d5 SHA512 fea1b1d6d71c45090dcdfb181168ff4fa3b4406e607c770ff0d13f3b49217f889bbcb5d8021fd01eac329b865e16a298e87f502c503db7b27ed74c36e5267599
diff --git a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
index f06f2a718c6c..5f36a8d365e3 100644
--- a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
+++ b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
diff --git a/dev-haskell/lens/Manifest b/dev-haskell/lens/Manifest
index 9f9cd978d374..4c4e880f6d23 100644
--- a/dev-haskell/lens/Manifest
+++ b/dev-haskell/lens/Manifest
@@ -1,6 +1,3 @@
-DIST lens-4.19.2-r2.cabal 16053 BLAKE2B 66e0c6048fea41a029780e481e102e1881e0fa381eecbdfb3de01295669abf2ffb91c9c116cfaa9439d027ac4340ff86a37d18333a4ae03f9996be7129b8327d SHA512 6c2a535af6e73026884e925abcb7bca556ebef9cdfd8d340e0d03226b5c4347a9b3dc1b641b4e3386355a4e3e02694b72d076fd7dfabdf995297a2d0dfbb9cd5
-DIST lens-4.19.2.tar.gz 705314 BLAKE2B 02de2b8515225c07b039774da06e848c4c1332cb1fc28fe6f782502e8d8b34d09b40bb2272af006157940513b4ce97d192edc45529dd497686cee32a90bfe80d SHA512 f1627c950457c38b0363a71717b76c0c84eafdcebaf14904da632ea295195dee1fd11db07ca524988729254b0e018da4417e40c0cb4f8ff086fbe412ce89f4c6
 DIST lens-5.1.1.tar.gz 697888 BLAKE2B 707a7986a561abaa33abed08b170ba23945dc97ac98af0f72ce675ecd551903eb9eaaa9c8c1e22b841ab174409f1f1e8256cb17c87230b3733f0424b2bc3b6e4 SHA512 2d64cf710b7835e63a6e5af4a3075968354e01cbcd03b1ce4f7bbc56662d029b7dc399b2d8918692715f6e94f5885a63b811704b9016284dc54d9950d9142a78
-EBUILD lens-4.19.2-r2.ebuild 3658 BLAKE2B 31c91da376263daec83d52b382c1cf6eb7b7b776789254756f0259e8c8faac9e00be324004ee8694666cdad611af46dd756b612793025c9aa941f2e1e409e800 SHA512 70de336a4b73caddc4ecf13ca6ab0b517190e774ba83fb831d921f7d55d0cdaaecfb336e2e573448a31c4c6670492b4fed7e407b1f40b6108dcf2b8baaacf80f
 EBUILD lens-5.1.1.ebuild 3131 BLAKE2B 0271ca51d73e0fbc808a570c41900643b2c77d507fddb9f2def0b845b9ca97b7abc8cef4f8a84b4f49fa6b9b5be176bc8274417bfa37b493d128b4124a24eb49 SHA512 0439d912502f69c0da1afa029368115508e0b89c5669e53207801c3709009e0c496c0a6bce9695febdef945cfd9f111edc0617f277489b7f3a57378ec44eeb91
-MISC metadata.xml 1152 BLAKE2B 20a0b1bfd848aeadad1cd37d1992a61de1c976143584c39bce732d782a73b7932ddef1c4db66c2ec09b915284d9b33e755f7616eb8a4e20927efbe359baa47f4 SHA512 2ed58c29923afb2e1a9a2ba489b17b0b34ce4fec6f2092c261ed5c22028328186f96c39a71876aacb5988d16f461aa8a37ceb8b34b4ff34d1f506ca3cd3cef15
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/lens/lens-4.19.2-r2.ebuild b/dev-haskell/lens/lens-4.19.2-r2.ebuild
deleted file mode 100644
index e11ba5a2e8a7..000000000000
--- a/dev-haskell/lens/lens-4.19.2-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -lib-werror,test-hunit:test,test-properties:test,test-templates:test,test-doctests:test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite rebuild-after-doc-workaround"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/3.cabal -> ${PF}.cabal"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j safe +trustworthy"
-
-RESTRICT=test # Ambiguous occurrence 'foldmap': Vector.foldMap or Foldable.foldMap
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.4:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.6
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2
-		dev-haskell/generic-deriving
-		dev-haskell/nats
-		>=dev-haskell/semigroups-0.9
-		>=dev-haskell/simple-reflect-0.3.1
-		>=dev-haskell/doctest-0.11.4 <dev-haskell/doctest-0.18 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.10 && <3.3' 'Cabal >= 1.10'
-}
-
-src_prepare() {
-	default
-
-	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		--flag=-lib-werror \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test test-doctests) \
-		$(cabal_flag test test-hunit) \
-		$(cabal_flag test test-properties) \
-		$(cabal_flag test test-templates) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/metadata.xml b/dev-haskell/lens/metadata.xml
index 746157c47d78..937381521944 100644
--- a/dev-haskell/lens/metadata.xml
+++ b/dev-haskell/lens/metadata.xml
@@ -5,25 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="benchmark-uniplate">
-			Enable benchmarking against Neil Mitchell's
-			uniplate library for comparative performance analysis. Defaults to being
-			turned off to avoid the extra dependency.
-		</flag>
-		<flag name="inlining">
-			Generate inline pragmas when using
-			template-haskell. This defaults to enabled, but you can
-			to shut it off to benchmark the relative performance impact,
-			or as last ditch effort to address compile errors resulting
-			from the myriad versions of template-haskell that all purport to be 2.8.
-		</flag>
-		<flag name="safe">Disallow unsafeCoerce</flag>
-		<flag name="dump-splices">Build and run the doctests test-suite.</flag>
-		<flag name="j">Attempt a parallel build with GHC 7.8.</flag>
-		<flag name="trustworthy">Assert that we are trustworthy when we can</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/lens</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/lift-type/Manifest b/dev-haskell/lift-type/Manifest
index 25c87dcb04ec..bf391292916a 100644
--- a/dev-haskell/lift-type/Manifest
+++ b/dev-haskell/lift-type/Manifest
@@ -1,3 +1,3 @@
 DIST lift-type-0.1.0.1.tar.gz 3133 BLAKE2B 64e27c549960e2a02a1f01431f602d4dc34ac3ad8db430c0e8f473c70a412ebebf31b7da5ea4e6024b3e59df654dbccfc3b9f980b32516d9419476941417c41f SHA512 3555cfc79a317849921306f8766d031dbdf247aa9bec604e20b47c31c4d001c7392b2f47a3463a9699b33826fec4a5d092fbad82c3d6a75f3c3151afa033b372
-EBUILD lift-type-0.1.0.1.ebuild 581 BLAKE2B b5880c7a7a64865fef8de474cc0f1200d240906725d7bcf1472dee7b6dba8f0b84e38140d278174d9a13b89e61b1539cda94be1fa568905a482a8fe1535ea691 SHA512 f2c9aafcd92657b995ba0e438cb785f6796412fe90338bfa31590cc8fdc73b7905f72849cb8d38c29621aafb89e6354d9f9a8fb187b7031999e43ecc7c0a5e73
+EBUILD lift-type-0.1.0.1.ebuild 588 BLAKE2B 7f06e1d087e993eda94a92e323b768fbe048c84f225c51c02ddf04e0d333fce61ba5af57c293854cc48897cea895ea64b76860c37195371a5cae6997618ab6df SHA512 68e85677e07311f5df8afec98a435d59a5cd93ea83355c69f5cab3b0d13b49a82382ad11432b0e3fcd900a998d6e0d4842eb41f8fe5c438286396d401c7ebea1
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild b/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
index ddda2d6f39df..177fbc3d2095 100644
--- a/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
+++ b/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
index 8c71bb7c16b4..287b1d97707e 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1,5 +1,3 @@
-DIST lifted-async-0.10.0.6.tar.gz 10308 BLAKE2B f9718ed3d97d4cb17b87d49efb594a7b61f11b6be9819b44bd8382a87bb247b754328db07417699f5140f6168d42c3d51fceaaaf33da748f9aba8683101cd6ec SHA512 9e5ae5d906df2577453c9b86f196f4bb4ec4d7766c5d9bcb7d2fa66be62daa44c033ed1475bdc004e1540da81f645a4d39db35142d32d09b33cfe9c01412f1ce
 DIST lifted-async-0.10.2.tar.gz 10607 BLAKE2B 79ef9e4f11e5d41d3886473f2443a7345a1b52fd0aaf50a96a338f3958fdfef0a00846adf04cf8d310935c130a583544829685ad895c238544fd3ca5558973cd SHA512 eb2b33693ab1617fdeca934c6ede73c530e578425049804c3a0322a63b5262411453f80cb730dabd338590fc6b3093cd13872b9922f5cda4806741fc74ea63ee
-EBUILD lifted-async-0.10.0.6.ebuild 1264 BLAKE2B 6f4a009cb1f868dfcc3c7b08c621aff0f86784423d3552d39dc9599e48f4481cb06341c8bc697a55989d4183e9e112c34356b349dda2e3854d52ca3b9181a715 SHA512 b765eeb33987645ceaf6732f70ae8aa0c02f30e6a1e4b0b1a1c4ab8a734a758c717d78749e1ed27ecb0752bf54cd8cb954442c2d07bfc8daefebc34b2cdcead4
 EBUILD lifted-async-0.10.2.ebuild 1200 BLAKE2B a3eb4112a40db8d62cf9526b69f20c8735e8115e2ba7188e9a72ccd245d04a951bf140df7281533b9ba2f3cf50c07907f9bc44f66947f205d606a7638f2c87db SHA512 308e4a2feb23f83489525f104f6d0b9cea49439aafd010e8b303cb3636dfd85b786471bcf33e6ad136a87e01337ca2828bbb1bad93df6361a34c0e8154a16a7c
 MISC metadata.xml 493 BLAKE2B 729e6d6ac41bcbd2aa1621517020220d43bc49cf492774dd3b1ecc1d13b84d515d7dd6cb4385d9864adfdc4a2f02a5dd923835016fadb26b03e238f23d6be7cd SHA512 f8da79f548bcf39aeb61e6aadef259d12bb4d29bace4868cdd84be19d72b6b5d333da26aec9667aae36bbcd171a6991309678474e52a8bf6bea26fad135d2297
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
deleted file mode 100644
index fd66768fffd0..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#beware: hackport not reading `constraints` upper bound correctly
-
-RDEPEND=">=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
-	>=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.13:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		<dev-haskell/tasty-expected-failure-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		dev-haskell/tasty-th )
-"
diff --git a/dev-haskell/lukko/Manifest b/dev-haskell/lukko/Manifest
index 3c9141db9828..343f297baec8 100644
--- a/dev-haskell/lukko/Manifest
+++ b/dev-haskell/lukko/Manifest
@@ -1,4 +1,4 @@
 DIST lukko-0.1.1.3.cabal 4556 BLAKE2B 61ae605ec201a1870aba505e4434ace0b6f153b10eb740e2a28cb44cdf948086eb58485c976c0ab895e26521175f9e97c0c4b1ef296831a671c8c0ae64f719b2 SHA512 ac85483d44211bac42bb5bba64a790a2c328db3e3afb9f2837a50a792a13b6efcaf9298705051c6f54f151786c8a41c79f4929f8d5ef3934cc918dfe8091c12b
 DIST lukko-0.1.1.3.tar.gz 28575 BLAKE2B 9f0006d05ba1db03de6fda88265e8949797201124f71ca6690113431f398eb59f19ec67363eb6b2834cac136e985b84882d45dfeb71c67e1147dd000c06cd243 SHA512 8bed8b88a101883f642bb9d9d41512436f5c80db5ea1ad0cddb069c6d09257d21b56a60e0f70b57453e91126065fbfdeeb721064763e64de1975dcb51b1a484a
-EBUILD lukko-0.1.1.3.ebuild 1398 BLAKE2B 94a475448f14a56a0a9fc237a4ab07b17e6fc5bcce7247955105332d6c5170a1b7f8052bf17df506b5077b3fe6d4c6ab4e11c9e250e118551a8b9ea6a7b1f2a6 SHA512 d70543c9a05e568afb325c7ec4e94993775de2fcd96205e5f1a7b9c6879383edd2de9146e2966863551e5c0e2478826e7c1f91bb24e3646e695356149e59b988
+EBUILD lukko-0.1.1.3.ebuild 1405 BLAKE2B 5a2d043b697e7caa3a357667c132714152d7869727dd65626babd63d87938a87c7b66a8a189c8421b05d33f73420bdbf6b16cb93f150d9d2823558e2a57b4b5e SHA512 c644942bc248e0e9aba0cb3ec8de948c52fc5ee590080f6451057689f4a59e82d084becd9e269d7373b8f9a90e9902e13caf21300a67999a5dbe83d9eb105728
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/lukko/lukko-0.1.1.3.ebuild b/dev-haskell/lukko/lukko-0.1.1.3.ebuild
index 6c5b7eb3841f..38085fd4e276 100644
--- a/dev-haskell/lukko/lukko-0.1.1.3.ebuild
+++ b/dev-haskell/lukko/lukko-0.1.1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/magic/Manifest b/dev-haskell/magic/Manifest
index 0e234178b313..25d7d56e5c9c 100644
--- a/dev-haskell/magic/Manifest
+++ b/dev-haskell/magic/Manifest
@@ -1,3 +1,3 @@
 DIST magic-1.1.tar.gz 4318 BLAKE2B 413c01af3bad4dd12cf4eda39d7de44a2126d2d250605b4d9054eb5b33f061d29dab0d2e244b662f451d7ddb907a6bb3e9c1a1dfa2d337af4464a2a0578391c7 SHA512 f400396b0f82f9655376ac72e721badcf60c356c8594b4b67922890f55bac8e15b7aa856fdf61942c40b2622bdc231914994968af3b98d353bf50aed09ebbef5
-EBUILD magic-1.1.ebuild 553 BLAKE2B 547f4fcf90bdcf652a94c1ea9f05246584b46c00c5a5dae1a05ee01918ddb045e26fda8261201f3d613c0ae40db64f3245a01af4b2a879d41915ebee3c40485c SHA512 58127e773ed0cf03fd55d9b452e4db9f002f428a6bb687aea33d99164f12263e548f2eff12c263d65d71ee55208493e67d696085e79897bbadd3bc2689deea45
+EBUILD magic-1.1.ebuild 560 BLAKE2B 3819b0c76a0510d35bf1e15125127ee86d21fc5365088c07e67348ae294f8ba994fd148870cccb53ea0b9f8fb7f63502c5ded94fe41ede0326b53bfa45280c75 SHA512 ff4fce7a9b2b2a58ea127b5184b6de2f5274cfb6f758f5d4d9204fe214f9784a1a4a849f579fc4e73ec4a08a8ba543cf7bfe3e92703f6c7043538c10a06b7fbd
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/magic/magic-1.1.ebuild b/dev-haskell/magic/magic-1.1.ebuild
index 6e247ba72615..0c4072a52d05 100644
--- a/dev-haskell/magic/magic-1.1.ebuild
+++ b/dev-haskell/magic/magic-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/markdown-unlit/Manifest b/dev-haskell/markdown-unlit/Manifest
index eb66536547bb..eff144a3fbd3 100644
--- a/dev-haskell/markdown-unlit/Manifest
+++ b/dev-haskell/markdown-unlit/Manifest
@@ -1,3 +1,3 @@
 DIST markdown-unlit-0.5.0.tar.gz 4681 BLAKE2B cde0d867185c714e0c5d3c76e0baed4b1f7df4f0b85170e3d69476149caa5dd06f7de181e750eee357543ebc2d8e4178d711bee903bd41a5085c75057c9374c8 SHA512 580b4e4a4fcccf845c3e618b2ebc425dd8dba024c1c8bbae8db00a3e4b768353fe6738195dad80ae2afb1a46fcfad46cbed6d98bea1017ef098366fa7a2633ea
-EBUILD markdown-unlit-0.5.0.ebuild 743 BLAKE2B 5202c318c3c841a8f45cc0e7f9a7bb9ff1a759d496e2817633a1d78a93642a7ea0e742c29b4e071205258732c1279a1877a083a8492144683c682a0f6180bcd0 SHA512 5e1b2951f01e9916b8a21d2526699d43eea84ac026fcc0ea00b79ed3af69b4b5ef462aa822116a59a12aa6655925573a82fd0098c1c75abf411ceba51ce889b1
+EBUILD markdown-unlit-0.5.0.ebuild 750 BLAKE2B 9cde4759237341ecb9809e6d68be8a29a23c57bae15b80ac6665cf136ce9d109fd4b70598b89b87f095314db90d21684869716644add4fffa160607b2485fe59 SHA512 74a6aac7fd2d5bb54e4c335e5e0aa2675076a78ef9fe7d28c3fa9336e6b431f49b18883c3cf77042ca52651a189083de2c68e97aa26de6978351dc7a74d48369
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
index fbffd43af9e1..925b220c5252 100644
--- a/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/base-compat:=[profile?]
diff --git a/dev-haskell/megaparsec-tests/Manifest b/dev-haskell/megaparsec-tests/Manifest
new file mode 100644
index 000000000000..329117cc3f22
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/Manifest
@@ -0,0 +1,3 @@
+DIST megaparsec-tests-9.2.1.tar.gz 31015 BLAKE2B ace849dad1b883d7b5a62391c257782bbe1920f7f882198d92623b9ba44a6b4bd4cf407d9ea7d3003cd3b7d43dd0779b5256e024aec2b329987c1be96135d561 SHA512 8ad1fca05e99e8dfcd82223d97f54379af9bd8b8c938b51e33ca1c33995ef7e9262ebe34e94882f2ebe13326b8f1d4b89f58696b247a8bd77e0411528f55e779
+EBUILD megaparsec-tests-9.2.1.ebuild 1200 BLAKE2B cb2942cd62d2fbbaa5b345161ce420515e616377268750af486b2dd67f16dea8f2ff1afba366c483d7a962ac8d884976540daa93651aee2713ed70457a7eb10e SHA512 2a4981890505cf2c869ad994c07d9013e3959923aeb81b56ffa7c4481464caaa8dcf3c5ad96ed44451489fd274a184e064ade190bb956bd297c9fcc1e755fa0b
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.1.ebuild b/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.1.ebuild
new file mode 100644
index 000000000000..2889e442e423
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Test utilities and the test suite of Megaparsec"
+HOMEPAGE="https://github.com/mrkkrp/megaparsec"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/hspec-2.0:=[profile?] <dev-haskell/hspec-3.0:=[profile?]
+	>=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?]
+	>=dev-haskell/hspec-megaparsec-2.0:=[profile?] <dev-haskell/hspec-megaparsec-3.0:=[profile?]
+	~dev-haskell/megaparsec-9.2.1:=[profile?]
+	>=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/case-insensitive-1.2 <dev-haskell/case-insensitive-1.3
+		>=dev-haskell/parser-combinators-1.0 <dev-haskell/parser-combinators-2.0
+		>=dev-haskell/scientific-0.3.1 <dev-haskell/scientific-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/megaparsec-tests/metadata.xml b/dev-haskell/megaparsec-tests/metadata.xml
new file mode 100644
index 000000000000..937381521944
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/megaparsec/Manifest b/dev-haskell/megaparsec/Manifest
index f1884c7e23aa..a0e97a36381a 100644
--- a/dev-haskell/megaparsec/Manifest
+++ b/dev-haskell/megaparsec/Manifest
@@ -1,4 +1,3 @@
-DIST megaparsec-9.0.1.cabal 3248 BLAKE2B 66276c46371fee1eb8a4de8f380700eff4110f3e5f235b5d65e09a965fd2127e3e6b4c8d1496a0eef9561600d20e6930f6aa889e3cb7df7ae79b5e65848aa2cc SHA512 2d3933a46a909cf44a53d4e30d8bd6fc126e86acac4d297df1d0bbc3364f0463533ee141bbced82dc635bce6d8b86e856ebb358ad97e8c01d822a2623a4ec437
-DIST megaparsec-9.0.1.tar.gz 59734 BLAKE2B 61408e911178a3bd96feaf9def4cba0d47042fbe949ff47b49abd249839ffe52c0df0d8c0f38644aade491e4af2d7f9cd3763cfb73ce9b12a8f49494877f0847 SHA512 24ae5f291611a06ff69199d642de32d6dc5efc40cf6c6ccddcc59ff9d210a7bbd061ca17f1b5e04c2dded72108f140785f4ccfa64898b41f4ac7e21784c7b074
-EBUILD megaparsec-9.0.1.ebuild 1199 BLAKE2B 39d4a403df26464df090a2dc9f7a998bbbcfc446c40e38ff65acd80bccf2654b816fd72c877e9fef7f305a5917db2cdf4d775a3f9f5c07efd4b87c70ac313619 SHA512 3ef339561c76dad47b6e013d1fa6faac3db4c1e1360ac9fcb2965e47b130702b31931f46e9802bae7d6274dd4dff67906b3c825007eca7aac7d0f23a15de0f80
+DIST megaparsec-9.2.1.tar.gz 61210 BLAKE2B 8c66e3653b57869f39f715bae2c6296220f7fba58105beb58afceda6ba0301e31a93ce65691e2f6b3ee521e001601e24c42b0f9a2896ed9923175209d1361c89 SHA512 9bf81d3d3f13f5d5adaa53ff6024c95eada5e4f7377358124153670de6d29d1a653c428cdc8bfb27f88c3683c746ddc722286c281d01b9f0654c84a7fe0cd738
+EBUILD megaparsec-9.2.1.ebuild 835 BLAKE2B 2eeaf979365b7297eca8dab873e72312a1c8282ef4c4e880aeccea75dcdba1ecee0d2a3b6cdac3c6312016e373a1a707ab58bf5ded0e712a6f51ee79dfc474ba SHA512 515a21054d430a9e6e1a055651c2ec2e2de06e6c1f24e75689eb76548a1c4acaad47ae01abd497b1c3784b218eaa44322bdef3f6e671cd0b466226f09356ea10
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/megaparsec/megaparsec-9.0.1.ebuild b/dev-haskell/megaparsec/megaparsec-9.2.1.ebuild
index f1779d9f0549..1beb91f75a0e 100644
--- a/dev-haskell/megaparsec/megaparsec-9.0.1.ebuild
+++ b/dev-haskell/megaparsec/megaparsec-9.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.7.1.2.9999
 #hackport: flags: -dev
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
@@ -11,33 +11,20 @@ inherit haskell-cabal
 
 DESCRIPTION="Monadic parser combinators"
 HOMEPAGE="https://github.com/mrkkrp/megaparsec"
-SRC_URI="
-	https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/1.cabal -> ${PF}.cabal
-	"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
 	>=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.6.3:=
+	>=dev-haskell/scientific-0.3.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4.0.1
+	>=dev-haskell/cabal-3.0.0.0
 "
 
-src_prepare() {
-	default
-
-	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
-}
-
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-dev
diff --git a/dev-haskell/microlens-mtl/Manifest b/dev-haskell/microlens-mtl/Manifest
index f1c530f24e68..82e306e69587 100644
--- a/dev-haskell/microlens-mtl/Manifest
+++ b/dev-haskell/microlens-mtl/Manifest
@@ -1,3 +1,3 @@
 DIST microlens-mtl-0.2.0.1.tar.gz 9019 BLAKE2B 48fdd193522c239bf477cb289310d2d2c461a3d192f4d70218a2bf2013923fd1f06d79bff9ada29a2729ec5d01884c25f3fb13bf1765803d11b15f354be8baf9 SHA512 2153a38e637e33e426bb64986fe7e818a2be99e4005cc7db51b94a4f66be8170e20071bf785c27a0beeb48cab97da037f68a008fa157a21a70fbf9fd943f6a45
-EBUILD microlens-mtl-0.2.0.1.ebuild 799 BLAKE2B 3f1c966b0fbccce16da18f77e3fb9182ca9e23923619a7a5d9feb9518542d6cc92d6f9392d3913bdd89f3fcb50003b58d2aa29c4601ac3afeaf866b75745d072 SHA512 d8a3d8c616610418c52e8d44390f84510e4c166b4b7731bad8b87879adaef920fb8d605b7862dad8bd46bb382618bcd97cfe33f33c63eee303d182f99cde37ec
+EBUILD microlens-mtl-0.2.0.1.ebuild 806 BLAKE2B d1aa2162460f6961719a47cb5ea6abb8211113bfdd7e7ac217f97f2d380dbf0d893b97aa8572bb9ec275f6f4ea36a044d1a9a7811bb7b3689ac8df735ca1c475 SHA512 d82fcd678f977e63c6d6cdc10ba08c930c1bea14df85e6af950ddcf2adf27f692723615df461933995de010c66ca290ae427350ca7bb36d1dc72a5aa6580eeea
 MISC metadata.xml 610 BLAKE2B 594e7611a62264af449b194f01df459f7a9eb67c8a7aab897623a188ec2a6af949439ae49bbf1e8d9565e4021fbe8dc08c97d83d2c71d4dbbee9cfbf71d1a3db SHA512 75658a1c25e471d758bcb127789ac7802bd7cf96ce46bb59782833bc7ff86be010001767154e3142ec1613077efb4c8a99bfa4492773677b060b8fbdc4f48e9f
diff --git a/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
index 5e3dbeb42b78..e8c7ebc1b8b7 100644
--- a/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
+++ b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
diff --git a/dev-haskell/microlens-th/Manifest b/dev-haskell/microlens-th/Manifest
index 2144cc9b0ffd..cdf346cbada9 100644
--- a/dev-haskell/microlens-th/Manifest
+++ b/dev-haskell/microlens-th/Manifest
@@ -1,3 +1,3 @@
 DIST microlens-th-0.4.3.10.tar.gz 24189 BLAKE2B f763ecbe003339bd7102180a97f264c96dcf1e9097663a619e8044c3a03cf3d381189dfa94c1a0f6b326b7882e7017d5e07c12eb88a898592d806a0810dffadb SHA512 8c2c4984eb76ddfbde96b0a429a87fa2643c891fc680e6843abadb2691c2898eb7e89e21e6a82a6631e2115204db443346fe3459764d865b23854dbcd940e5bd
-EBUILD microlens-th-0.4.3.10.ebuild 769 BLAKE2B cf3404e5b66d108421d3117c4c94e7058089cc7b09d834858fe8ba48fd93a34a15ed2d0087b3cb9cc186ae6c73a078ea3f1fa39db21caf6c20f08c93f71f71d2 SHA512 a82ad9cd9249f37a6256af19a3e398bd3d7571b30c98929b47bcf0d6c81739c00e7a246277384d99d2604a029bba1ea8158d6ee66a70cc43f913db4549acc94a
+EBUILD microlens-th-0.4.3.10.ebuild 776 BLAKE2B a730bb2c41c849cbee5236bac110afdd5ec1c5a499daf1f0e1f51a0ea32785976fcc6ed0c63c48244859af821152f16920dcbab5d01a10dbff5ed754eeb1c81e SHA512 5bc2c5db90d7a03613c6cd51625b1d3fc32bcaddacc7040f240647bfbc01b7b1aaac079c1930cc0f625eb394a5dbb10788180fb5566d94da88d33d91dd6dd63a
 MISC metadata.xml 341 BLAKE2B 655e3ac63126d37eeb4cbf06b287e7d78e28a2c9651a216eba538d08131d0c7ddf7b95ee3a9ea7ee8066ea42435858c7650904d1399e6b876de7737a105e5870 SHA512 77feaad6fc702fad5b6bac8e72fe9f2391f2a5c916d7b401f52903132defcc06114d7beca2a4eb9cf93c6aecd4007f272bab0cf6a403a0c836ae7e5b0933f768
diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
index 45e2d090967c..9f0837c17703 100644
--- a/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
+++ b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
 	>=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
diff --git a/dev-haskell/microstache/Manifest b/dev-haskell/microstache/Manifest
index 5d7f9ffa8a48..3b57448f43b4 100644
--- a/dev-haskell/microstache/Manifest
+++ b/dev-haskell/microstache/Manifest
@@ -1,3 +1,4 @@
-DIST microstache-1.0.1.1.tar.gz 20449 BLAKE2B b4f0a6b13e5597ba2c90377032a8b248570977a35bb07d7f8b360add87eff6ea80ee8cbd40cee8e110ff913833b798234d0189e65e4c4964367b3643c15e6837 SHA512 28e0ad58a9724259df176092c125a4ba51fd2278cb0ab2e29bc24bf1e0f1c57a53e5983ff640569e3416fc7cda31b6ba0ae8ad832840a3040ba55fb85fb7f1a1
-EBUILD microstache-1.0.1.1.ebuild 1260 BLAKE2B 520809860f07c71763bf38a579576d51b8465996053a0816a668eaecce290fbe9829e36b7d841feef434962421912d9be4ab1311599429087565cedd50a84f35 SHA512 ba2b3b954769a23e585bcba98e8a24b933f9e06419019a94215abb2c5557057b3a25f973f8d69cfce50d33ee75b991b11d7efb11208b607b857d15155bc44260
+DIST microstache-1.0.2-rev3.cabal 2873 BLAKE2B 8d389ffbb9216b19f0d91fa690230e9bb2a79a74f4742394a8d7fe8ec2e0344c7485ebcd40b516dcdce25dd275ff16eae67bdc22bba0c60da54f7ff1199623ba SHA512 2c952588bbd355f313ae63eba4bb0cea38f36da8e0a7f29be6a841836e32cf05ef86d1bbc2b21bc871b218778ca521484ca146cf0f83e9053e0b00d821258e10
+DIST microstache-1.0.2.tar.gz 21333 BLAKE2B 05f726b88c96e47157e76705bf6961bf27f81cdee8f3c7860e9f24f368e450862d854a6a47492da179ed6830006059100470e029183f11164e1042766111cb6d SHA512 bbf1de864c88809cfd159a679ec1709c7fb523e2b3ac91232e2cabb9a4bf2eda0913666b3a6ab81b6ba9c2488ce1200cb6b43e21a7f475d2dc20f9854c47a61e
+EBUILD microstache-1.0.2.ebuild 1371 BLAKE2B 3e811b5b10f6ce9924a440a9c3ce15ba1f51daadb989348f5e49ec733b91f04fee14d58d7f6f7497d399ef90a2a374cde8c0b6d12aa7102590eb38cfd8165037 SHA512 d33d463ef67d0825fef1b68f3e7d5a85b3c2754eb24c6a0da959dfd68832b75ca56be2c6d8b82e464a41e56b0d4eb085cc867c1eaf53524156bec390ca2c8555
 MISC metadata.xml 440 BLAKE2B c504b582dc362e6d196c5c8380224c59f4d4187e897c088db94fdfbb8c6f30b8b52845febe124f3ec1a2f69e9e86f9b682cf92ca0b2ae258253918bb42441e80 SHA512 e18c02839a5758c8b5ceebc1d08d50d7f01ced758d93c38ed0396b1baa0547451f744ae5fa3f4f4fcfda8a02addf5437603b11f16d45bbe662c5decd2db3da36
diff --git a/dev-haskell/microstache/microstache-1.0.1.1.ebuild b/dev-haskell/microstache/microstache-1.0.1.1.ebuild
deleted file mode 100644
index 29864b976b06..000000000000
--- a/dev-haskell/microstache/microstache-1.0.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Mustache templates for Haskell"
-HOMEPAGE="https://github.com/phadej/microstache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-6.0:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'aeson                  >=0.11    && < 1.3' 'aeson                  >=0.11' \
-		'containers             >=0.4.2.1 && < 0.6' 'containers             >=0.4.2.1'
-}
diff --git a/dev-haskell/microstache/microstache-1.0.2.ebuild b/dev-haskell/microstache/microstache-1.0.2.ebuild
new file mode 100644
index 000000000000..860ca461c704
--- /dev/null
+++ b/dev-haskell/microstache/microstache-1.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Mustache templates for Haskell"
+HOMEPAGE="https://github.com/haskellari/microstache"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/aeson
+		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index 4067ffc7a98a..e8e3f5b691f0 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1,3 +1,3 @@
 DIST MissingH-1.4.3.0.tar.gz 107358 BLAKE2B fa6cf7efd1a60defce6ec0e6bbee229b71f5afe4140cca31dd47c54fbeb8a2a7b0f3e41e4ccba3e010ab85c21fad4d9bb392bd4481a01a945a77de7366b6eae6 SHA512 eb42ad9fd09347d2ec661f8181c6d2c95fb4f9f05634373ac27b377508056afd909b4925f725b9e11441ee9877b66b46038005e469d0b754f8f6cb1cda66d1dc
-EBUILD missingh-1.4.3.0.ebuild 1802 BLAKE2B a9565127b5c652ca83e79bac95d7c8ba673c539b3e60288086904c59eccf8d00997bc03a0ed1e91675de8daaed5c15115e3c8799673f8acfa3a2e1b57c381281 SHA512 0bf184d531fe9dccfa00557550d3356f17b00fd563e41b3b952b4c2bb2dd5410e42dd903d583f97b54a468d3ef218c46de77520c017b69be68af587ef71f93f0
-MISC metadata.xml 375 BLAKE2B eee19d2ac2e127d4cdf73b7208ed1aae0db0f77de0e9fa97e720bd112bc982de7d7ec6af924ec5e99e91cfaaad9c2ce12190017cfce9f08ddf2a71e10916ed0b SHA512 c47354834a6763e1b5c69290d8aec9d78b3f2232828cea01b160052bd2d674fa5c4b25477e40ead35c8cff5f1d4545d001048167836d0a3d830008417ff749ff
+EBUILD missingh-1.4.3.0-r1.ebuild 1770 BLAKE2B 35cf8eabb4c5eb43c09c2675c08e773032f2d11a8e529ff72396897fde5a42684d35772dd949ad6da6f598cde3cdafe6b047b66abcf6aff893ccb175229590de SHA512 a62c18174577d1ed927fe8e5890875a748e993af9fb39749a9f5ec5c869b723276bfbc9901542bd624c21bfe4800a24a10f5948cd1de967a869946c63b5d8637
+MISC metadata.xml 544 BLAKE2B 998eb783069a5ea57ad421980aeffae4c10de64bf30a6626e330a371cde2bcfb32a496840c5708e86a97a202e9bb9abdff93c1ff249ee09f1691ca55b67a54eb SHA512 99aaed1f41668eb70a2e848717e6dca89014118a669d6a93e4fd71b9639262b8a67659df1fcae49f898106bb965b4831ad57afa9d9b5bcd573a7dd25e151be24
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
index 2139218ddd52..a15becf07ceb 100644
--- a/dev-haskell/missingh/metadata.xml
+++ b/dev-haskell/missingh/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="network-3">Use network-3</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">jgoerzen/missingh</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		MissingH is a library of all sorts of utility functions for
+		Haskell programmers.  It is written in pure Haskell and thus should
+		be extremely portable and easy to use.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jgoerzen/missingh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/missingh/missingh-1.4.3.0.ebuild b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
index 102bc03f9c1d..a307a2039f37 100644
--- a/dev-haskell/missingh/missingh-1.4.3.0.ebuild
+++ b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # ebuild generated by hackport 0.6.4.9999
-#hackport: flags: network--ge-3-0-0:network-3
+#hackport: flags: +network--ge-3-0-0
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -18,8 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+network-3"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 
 RESTRICT=test # tests are present for removed modules
 
@@ -28,12 +27,11 @@ RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[
 	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
 	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
 	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	dev-haskell/random
 	>=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
-				>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
-	!network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] )
+	>=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.12
@@ -43,7 +41,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+	cabal_chdeps \
+		'base                >= 4.5.0.0 && < 4.15' 'base                >= 4.5.0.0' \
+		'random              >= 1.0.1.1 && < 1.2' 'random'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag network-3 network--ge-3_0_0)
+		--flag=network--ge-3_0_0
 }
diff --git a/dev-haskell/monad-logger/Manifest b/dev-haskell/monad-logger/Manifest
index a153d5e13bf4..94fa3ad12d54 100644
--- a/dev-haskell/monad-logger/Manifest
+++ b/dev-haskell/monad-logger/Manifest
@@ -1,3 +1,3 @@
 DIST monad-logger-0.3.32.tar.gz 10984 BLAKE2B d03a94f9b207e5a64a150140d9b4dcdd56e6ca28db1f371c08ffb9d35168602b8cbe478b19b47fdb38e69f0d08431f3a2a98b7ea916448079d27674bb70cf454 SHA512 d65fad10fc4bcc5a597c7a9b03b9e275c40ef7c930d1b7f703115c2f18b8bd3c5a42b4c3cc445889e0878e62709c62fdf5f0b2b60d1a15430064f11853b01ef3
-EBUILD monad-logger-0.3.32.ebuild 1457 BLAKE2B 965bac3b16376b407cd5e5bba4e7265c4c036eda880c802af50ebf0c1c9e7b35d28358af21a43da5f5048871cd97a2d3706c812104c1c630f189a3eb9c7784e7 SHA512 d2f73d2cc4492bf921d2b91dd40396711e069f19ad4f1abb7804a58f4142ee9c0feb0c568c1f2174d1952f985d5ee84efc9296dd41f044545848f2cd41c78457
+EBUILD monad-logger-0.3.32.ebuild 1464 BLAKE2B 5415454ebe8e6194ff7d7acc4260ce71e4f78c3e85415c2b282097d83f5076ad37e3245b41e002a9e73c0ae58e8c77da48878aad8f24f0902fed4df8fe805d53 SHA512 cc4a766179ad0b9b285064f8f8fe6c7abc40fb0adb223d09c5a853f21a9e8207d9e4d25fa62a19269337db9b2af82d2b96f9252db160baaa4a6c6524d172b084
 MISC metadata.xml 422 BLAKE2B 0ee7ac74f2d01cd7490063f91f82ebffd26fa9ac8591ae3f79975453d8749216a5c966a4aae38e232cf472d8f61a3b5d01939a9c224d562d30447660b3776b38 SHA512 1b376a65b190af5038f449f4d648fb5c689c38f5a93db7e116880c353ffeb2c941abbe528c19ba240e360262d860a471c12ff695e2421acf8d1c2da4ea60db9c
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
index 1259e939884f..a525cd514635 100644
--- a/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
+++ b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+template-haskell"
 
 RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
diff --git a/dev-haskell/monad-loops/Manifest b/dev-haskell/monad-loops/Manifest
index c8a0a4cb2d51..f970ada80625 100644
--- a/dev-haskell/monad-loops/Manifest
+++ b/dev-haskell/monad-loops/Manifest
@@ -1,3 +1,3 @@
 DIST monad-loops-0.4.3.tar.gz 4996 BLAKE2B cbe025073cdf7ce193854de927ff34981709a206ee1061cd0dbf26b09a533fe5c3da961e9c5c77ec63bca9963eb4104399eb5d38eaef416df13138a4372dc562 SHA512 41a1314777661a411acf62dfa25cbb1a59fedd5d60d1a2b8566a3dd64dec361ab1fe35827320529a723a612e0443571ce38b17fa900eb8d5289bc52f653d47a5
-EBUILD monad-loops-0.4.3.ebuild 590 BLAKE2B 4a9c4c80165165980c2ecdcf7a472cde5a876e8399a3d48065a107673759f04320f690dfc553e9859ee7cc75b042f9a55d93ea5ffab14baf92baf0899d1c2e0d SHA512 71b9d53e380dcbfa725d64229ac3f17d7648f251822514f520b5a571c022fda00115b52440381dd020a3ee1e1c79b2797d70ed6e750689e176b95679dd2f7d83
+EBUILD monad-loops-0.4.3.ebuild 597 BLAKE2B 4530cdf292cf51c256612984eb561d7b507d1882dc0f7d95eb1bdae0f1fa8069308ec818204dccec24c7deee631f9e0cee18b91a9f8cce63520fd02470c6714a SHA512 3083763c327b8ca64034c88470b8595798feca0b00aabc39739e62b86e25779d03ff01760f126f2ddc7cba6ed5ab7a916d02b8823e6ce4ed3beacfdc25ec6a55
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
index e4dfae4f064e..3cf60b5c346a 100644
--- a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
+++ b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/monad-par-extras/Manifest b/dev-haskell/monad-par-extras/Manifest
index 88736ce04899..7566ac497acf 100644
--- a/dev-haskell/monad-par-extras/Manifest
+++ b/dev-haskell/monad-par-extras/Manifest
@@ -1,3 +1,3 @@
 DIST monad-par-extras-0.3.3.tar.gz 9146 BLAKE2B 44c0bcb007086fb478d287e3ae53a7aab0d30a7b1769e5b553634fb9bdc043917c80f6889fd79d37447afe5210ea54d226b8b5b9272c09a3134c007525ad9730 SHA512 89811cbdb6ab6654f31a8c327b4d0299c27938b226e0e12b0917393b610d02ea5a62182bff513cdfd19c21165658f0f1ef1ea00bdae114fd84d524051dca4fe0
-EBUILD monad-par-extras-0.3.3-r1.ebuild 748 BLAKE2B f0e8fce989650cd083b8f70a386451d336005127138742ace6d4ac5cab26ff918a325a09be78af7e4b22935f1218dc0c558ae7d8a95cc122fa6de116ac68997c SHA512 dae81a18bf2816efd245d0a3c91c1fe5f0aa478ea9334faf0e4a617f98c0c7cfdd0edfb0ba0e9319d3b7a76afc8f6c60a12f1a3b5f44dac3886a48cd74db28dd
+EBUILD monad-par-extras-0.3.3-r1.ebuild 755 BLAKE2B de4cb45a65713b60eb3023ad088b81da40b439bee55b4005c921b670af4279ba6c38f53e2d663b35ff14daa43d364c896157cc28d5fde1546bbef4e2c06214f4 SHA512 1760b945b33f51176c2b4899eb8598c4ab2642b3af3efd084571ebf36c6dc2b463f7dad38a9a7fc9ade04d9d5f8a8ee36c3a8f8565e580ef9a183e9319a9e1b4
 MISC metadata.xml 537 BLAKE2B 93551c2f409d8d8d839f9ce7b4fed3d3be19a73ac32dda8207991bcacdab477b211cfe65cb22c889bd11f3002810caa0f0e0e6de73d691bf765b4fdb1e69b5bb SHA512 5489b4f0c16797c2049495d7653092437597bd3945b2cfe7b3db19e18f75c732f18636b63203111560a0585ba6c60cbcc21eef0767dfcc2edd6e1eaadeae98ec
diff --git a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
index fe9fbbfa59c9..138441aa1516 100644
--- a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
+++ b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?]
diff --git a/dev-haskell/monad-par/Manifest b/dev-haskell/monad-par/Manifest
index 4f11ab38cade..ca3a53508719 100644
--- a/dev-haskell/monad-par/Manifest
+++ b/dev-haskell/monad-par/Manifest
@@ -1,4 +1,4 @@
 DIST monad-par-0.3.5-rev2.cabal 6536 BLAKE2B a9181b9df868e6dfcde1faa49cb0761ff79b28b4faba19213b58243fbd4e9d19f493beda6e8324ca6eaaa3a710d64e489a31e0b391d35f6f3996cfe16999127d SHA512 033b672b05222115e5c7d6c22f2333f7482fa7d4eacbc60b59139eb65e5b1fe9ca368d83f0090f0021297e3bbfa660c5af32189d3cca9af4679b6919d7883a57
 DIST monad-par-0.3.5.tar.gz 31675 BLAKE2B 02299d3a6813618e43d2786bb6963d1fda74fe50f84f2ada86890e87b38803ef1a1042dddc83c8e813cd9b1461710991a37900ee059222ecf65dc7706ed99450 SHA512 0843753f5a1465f46ade4c60b0707a07e996f12b13f8248e4c3dc6eeb5f0b8b4a321acb4dff685d17ef52d36db32cec5564e6492f7027c9d93f03c5780895b9c
-EBUILD monad-par-0.3.5-r1.ebuild 1072 BLAKE2B 93bb64ba9449209cc8256cb9ea09074c104bdca64d5391b4e91ab56057a6b181007d634621df5fa67b8d5d34d29ee6d09190b7d14d36f776ba4ddb924c076078 SHA512 d5ebbef1e998d6dee2047c1b55b570d14f8716c3be215fa6c38701127ef83291c0f5027dae0fef81b7bc3eaae963fd3ce710f60ab80f65fb90583b1601dbc15b
-MISC metadata.xml 974 BLAKE2B 9890b1191b0c953bcf8bee945fa7e8be8c31f02d533206f5078b67977e9c949eb13348f9708efcfee436986cca35463ec7170f9b532a97a36d64d189977d00c2 SHA512 cfbe8e5c4ad4a4b2676bbbadeadb5adfff0c8c7930df3252ce048247dd99d015cd303cca73e68541e726b56a55aa96ab80477061678547e87e40ff95f331bbff
+EBUILD monad-par-0.3.5-r1.ebuild 1095 BLAKE2B d0a40aadf90326cc2967147916b3aa524b5098ec195dfe539e106d4426eb2c5edeb991d20790d10b258ec0fa1d0d4bafd78556b8c1d57eed87dc321bbc049960 SHA512 2a45e2be1bd7e4f5fbffc4599b8bfd70c8e23e2ce3929b53d248ab2e9b929b4c2b5b1c1b673f317235bbc6b1c7052f72b5e4414be73f1c3095246840f533cfc3
+MISC metadata.xml 1072 BLAKE2B e693f1bf44d32cc1425ae87d350f933341f47db2ecca3993b95ac33e3175b2e5357acf9bf3b9aad9290b6a0d19528d74afeedd83b430088084a1aa6d111fc734 SHA512 3d8ed6dc1337288306cc51168cccee4d3502837099b92918ed3bf7843f8d84a1352a39488b3ab9a7a94d66350e431f9f6b937915d5b2880807412016876bb3fd
diff --git a/dev-haskell/monad-par/metadata.xml b/dev-haskell/monad-par/metadata.xml
index 08cce6fdd88a..31e4f277f2d8 100644
--- a/dev-haskell/monad-par/metadata.xml
+++ b/dev-haskell/monad-par/metadata.xml
@@ -20,6 +20,9 @@
 		Examples of use can be found in the examples/ directory
 		of the source package.
 	</longdescription>
+	<use>
+		<flag name="chaselev">Use Chase-Lev Deques for higher-perf work-stealing.</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">simonmar/monad-par</remote-id>
 	</upstream>
diff --git a/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild b/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
index b10ba5827d4e..c9ac44239d6b 100644
--- a/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
+++ b/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
@@ -16,7 +16,8 @@ HOMEPAGE="https://github.com/simonmar/monad-par"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="chaselev"
 
 RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
 	dev-haskell/abstract-par:=[profile?]
diff --git a/dev-haskell/monads-tf/Manifest b/dev-haskell/monads-tf/Manifest
index 6821710d45e4..3d64de0ce3ed 100644
--- a/dev-haskell/monads-tf/Manifest
+++ b/dev-haskell/monads-tf/Manifest
@@ -1,3 +1,3 @@
 DIST monads-tf-0.1.0.3.tar.gz 14159 BLAKE2B e77b87e274ab8a29af6033fdc69a965b4013f43556bbc65e16eea35d49899e022294a87196a8e7c086659874a939010449102f5c9fa2f17b128212e567bcd588 SHA512 e1be602c584b42390b617cee164c8cb1c4bb17093c44033275924f273c94212e53faceb35aeabadf43e68f9631830e41266858daa10aa2f3af6300ebc20f3ea4
-EBUILD monads-tf-0.1.0.3.ebuild 633 BLAKE2B f9f48bdb8f205190fcac4fa2fdc8fe633d7d54acc6a0818b2a0b22ca7ec48e06e19965edcfb4149405370032588c9999a5aa2a3c22213b7e48e9aaa6e47d527f SHA512 ed626154aa76b2b0bd05c343d13d1e874a848504bfd160aad9dff8f02d63862bf1da6b60468cf74523b6af0f813f5348cea9312ae91b956c39b222d4818a2946
+EBUILD monads-tf-0.1.0.3.ebuild 640 BLAKE2B 57944ec0332ed0c70a429c907665fe408f1c4bce635529de4d24d577068e12bcc7c2b9f384ce4555e924554a9f219e0cc4fc1e6bd455ca0f6137c228c5c4aee1 SHA512 5651e5aa13867bd06a1543c5d63d2b4e33499a1cd6b8caae600276608990080626ecc277bf21bcbab384d655485abcd6133299b3403042756ffb053291bdd0f8
 MISC metadata.xml 688 BLAKE2B 613f93fb297cdf8f25e7898d03b7a80e66338243421920e3e1b3d32fd282cee03d4e428e5956356a5824ea3a7a3461bdf032df17d78329259b9b37c7c76f360b SHA512 18c8c690d8acf7c6fed7b1e0f092a48ce7d519302343264a9205f3aa1842f9bc9a0eb29d34439a70b84117221786556ba5ec9571a66ff3cf9ed4ab195a5341be
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
index 2eeb9379e7cb..1487134fcec7 100644
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
+++ b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
diff --git a/dev-haskell/mountpoints/Manifest b/dev-haskell/mountpoints/Manifest
index 623411216e24..a4403788d7b1 100644
--- a/dev-haskell/mountpoints/Manifest
+++ b/dev-haskell/mountpoints/Manifest
@@ -1,3 +1,3 @@
 DIST mountpoints-1.0.2.tar.gz 13505 BLAKE2B 137b4c66e6a4ab27e48eebe52607ce6ad71cca1c9abfe5ebd0ae130bbd857b8fddb22575f356f30ab58e171a549d0a726b4ab41287658d35860df300c7c8dcdd SHA512 763b58944ef4422641d4ce92d7a61c79fa95cdae9795e48db194ce10df622a3e079670099daa35f7bb51d4d10ee54ccc411105eb918bab2327d54571d9bd9060
-EBUILD mountpoints-1.0.2.ebuild 533 BLAKE2B 563c4d6cd978467e29a94f91e4539369ce6ec66b4691fdd1bdde6bbfca02c058c1b6967825aa95679df7cd9e2354104d79f7a2085050c6af8a7962d90aa15a42 SHA512 4b1dc2623b1d1ea0118743b3ecb9a3f7a5ddee21d55166ed5e24e7e4b51b398bb14063f21c4f8e14a6995c3f7690efff7d8466b3b38d696ee4bd88f8efba9f7d
+EBUILD mountpoints-1.0.2.ebuild 540 BLAKE2B 4b6f75bb15fd192fade381e924fd0f632c66b73541770bcd2ffc204af7efca14d522e93a7a8ee2004cf96cc162ccd3db074df8ac35bdad5de28b984dbd93a343 SHA512 85875cb84ddef77d3b61d90ceaaad399e566ad8b188e0eddbfa75225ee7f13a2f8477939e57baf38c88d9d2cdb10aec225b1929d6b59c7e76bee253086db39e3
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
index 83dde002844a..2e2856a934e7 100644
--- a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
+++ b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/mustache/Manifest b/dev-haskell/mustache/Manifest
index 3d0901e42a6f..d2b4f23b0ebc 100644
--- a/dev-haskell/mustache/Manifest
+++ b/dev-haskell/mustache/Manifest
@@ -1,3 +1,3 @@
-DIST mustache-2.3.1.tar.gz 20207 BLAKE2B 87691b14e85ac5934c08d1b3f8261d6e7bb3786b808d0f1a04630b96b4f2ed4aeae4d049ccf0e408b47586e990db2bbc09e3eac56af67922538e73250ef486d5 SHA512 162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3
-EBUILD mustache-2.3.1.ebuild 1123 BLAKE2B b99008b9059701ea7994d54612bafc83ad6ec0d9b45da5bfc0a2a8508f54ada4a2aff60ae2e6577d84cbd763a3df6d151a097013a2f8fa182703a2de0d92abe6 SHA512 d6c822d2a7b0180b92ad89d1c8a78bf4427027658ea6e1e3296b4eb7379c77a1696b99b681396e06c1f8e9e0d650592beffa200d6a678a7527f9b471b60025cb
+DIST mustache-2.4.0.tar.gz 20434 BLAKE2B d38261bd5ca0e3336c7bfd32db957f1c50d6146a306ff5983b7b576d820d8626e60c5197181cdf14907cd10c8719d970f68cdfcbd21e39815d03945863af086d SHA512 897cd682648a363a4fe4225a65f782f743fb9631dc9e58d99eb443931989975b42bee0815037ee839fc70e1a40887e5417a05b105e4ca79565e2bd52b5fcd385
+EBUILD mustache-2.4.0.ebuild 1127 BLAKE2B bd14bae60ee43532fd4362c2a2ce21b913c5b24b9c63a02d7f1b4aacfb577238b60d2a39bc07c8db0a626cc9a50f78cbd3dd2cb7072372d224319ec9eed976f0 SHA512 a0fdcc5e43dd7a309e53562005f1279f71b14bd1caa83758e6922dd0a02bc3b3b27184d006ebbd531868c4e1c2b621a3c40aacfec7d83fe2c8f159bc41fe3152
 MISC metadata.xml 577 BLAKE2B f746deebec79f73042cbaddc5cc8461ab59ba6b903e21b533181df1f6d12a3775fcdf6261f04ce894fb8aed78284e475011b3f7de94f1faff6f5a93be8f0b795 SHA512 76e51dccf22dd2c5d134f0c6d263f27be973ebed6506b18513ca4dfcc525be78ed1451fc2fe02995a743e3af5a16f245fe25953d219338894db87ab49280472d
diff --git a/dev-haskell/mustache/mustache-2.3.1.ebuild b/dev-haskell/mustache/mustache-2.4.0.ebuild
index 23b768a9e9d5..dc5e45cc2bde 100644
--- a/dev-haskell/mustache/mustache-2.3.1.ebuild
+++ b/dev-haskell/mustache/mustache-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.2
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,25 +15,24 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RESTRICT=test # tries to access network
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.2-disable-langspec-tests.patch"
+	"${FILESDIR}/${PN}-2.4.0-ghc-8_10-fix.patch"
+	"${FILESDIR}/${PN}-2.4.0-unordered-containers-2_17-fix.patch"
+)
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	dev-haskell/cmdargs:=[profile?]
-	dev-haskell/either:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	dev-haskell/parsec:=[profile?]
 	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
 	dev-haskell/th-lift:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
 	dev-haskell/vector:=[profile?]
 	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( dev-haskell/base-unicode-symbols
 		dev-haskell/hspec
 		dev-haskell/lens
diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
index 7d008b8c3859..07b6b4ffa4ed 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -1,5 +1,4 @@
 DIST nats-1.1.2-r1.cabal 2749 BLAKE2B b0b7406ce0362cfea14dd8cc492b9d0a5a1e34ae4cf5c4aba78d3cd7052a24a3be1c742287d85e6f9699fecbeee491a0eadcdf1994e92ce86e559c6965774cc2 SHA512 0702e4a69cbc368de33993ab49ab5aa458202df538606b73dd9291a6cf61f82ab44e4b12e3e82d2690ba151fe8b1c65e8791ac0f45a24a7f2534abdebd2e87cb
 DIST nats-1.1.2.tar.gz 7776 BLAKE2B ae2012e1e8a433c3802b7470f95a7e4b391f9c7ee50f41b94d2ee9d20b630820e550efa76fb5d64926942e87e761db0702ae4310573d0bca38f52fa419a93390 SHA512 596f11e98fe57893279ddd1f5af11a12e747e0d5e87000c7e20d0f5c2da0f0be9a6b8d19c8d5759716a7fb9a3e77d0e999380af3d5a350fe32a5492dc6077450
 EBUILD nats-1.1.2-r1.ebuild 1013 BLAKE2B c8793cff157b015ae4019a4c102ab8b0324ecd5b520fcd6e628cfc9f02ab66a14ed70f39b141e30ca16bc3a5be6d5b4a674284c9b221b7e32b2cc7421056a535 SHA512 c82f2e5f87272dd6ffed70d6ca840c2c4ef2819e34a6e6dc40f563d15295c5103773efe941ddebb80f2dd9debed2c406bb30c5a8e644ef09a6fd481d708ab336
-EBUILD nats-1.1.2.ebuild 1052 BLAKE2B 2f34b11319aac60832ad4ea14055bc4cb4a6d993dde55c6b7572ed64f989c72ff8e034f2dcd04465b0a9cbd997464754cddbf8c4e6b7efb75db7eddd2436caac SHA512 a314695beff0fa1ed747794584185a3632ab6f9e533f83994351d315469bea23592a6be0676d4051eceac212e10b3e2ff2e2979ce57f8088b17cc6e2c0b09040
 MISC metadata.xml 438 BLAKE2B b1959dea4d16b4876e64792dd32aa257b12339979db4cdffc47280d87b91b64ddd28f3f937877d36356b0063a89e034a2cd221892e13d9c66358d0f0b45e3201 SHA512 b84958bacb4e1709f3c90de7e8c307ec09062ddb11864f0c72e78d248d3f29fdd8ac597406f6e1c49f62dd2d738ce6622d9a197480ae10600ea2a0b9e4626fb5
diff --git a/dev-haskell/nats/nats-1.1.2.ebuild b/dev-haskell/nats/nats-1.1.2.ebuild
deleted file mode 100644
index 5b6fa802bbcd..000000000000
--- a/dev-haskell/nats/nats-1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+binary +hashable +template-haskell"
-
-RESTRICT=test # avoid circular dep: nats[hashable]->hashable[test]->quickcheck->nats
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] )
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag binary binary) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/network-bsd/Manifest b/dev-haskell/network-bsd/Manifest
index 300e8ee10590..62c51ded80f1 100644
--- a/dev-haskell/network-bsd/Manifest
+++ b/dev-haskell/network-bsd/Manifest
@@ -1,3 +1,3 @@
 DIST network-bsd-2.8.1.0.tar.gz 8584 BLAKE2B 9864cdcab82d77592574983c70ddf262a4e836807d9141cacaa638d109f423e8332d9cb0b7d07661121970d9bd0b0ef9dd292d7e57010dff106a62003592d738 SHA512 b2f66c6705c490e1cbaab6ca88444294bc90b3711da4039046a9279060ed41228ab855b40039f56bd02eabcc0351200de3e043a108a0cdc98192d563702de7f3
-EBUILD network-bsd-2.8.1.0.ebuild 695 BLAKE2B 595c754b501c69374b6043bdcfaa648c38c1d75f5a8d5c05f24a3012a69bf4868611e1fa2ba2dab8cc4795d2789469423f69d66721592e4a7d3ba05e90f95b3b SHA512 ca740eef3e4e2d8372dfd2f6c39f1576ab79868075034221e5d80cda9db0edbc024f711080e140a96591fd9a47102bd40cbdab717c641d8ccd46d16b60bebeb3
+EBUILD network-bsd-2.8.1.0-r1.ebuild 700 BLAKE2B e58bdc1b605e420c26515819f1d61b62e04390c19054fbb3e7e2ec0e1a76da83abba0836e2c5f03ae9e56b7e536ec09835e4e7643a7429ae62361da6117ab786 SHA512 4e71a831222ea69c4635cc30a49a432fde0bb38d8f1371cfda1c31780ad79bb6c6b56f233a2d8690dcd451fa4d642f3ba03f58dca8b773a174ecf3cb0699d311
 MISC metadata.xml 556 BLAKE2B 509cd839da9f38223c79b71bffabc2012ab3edc5b794c7705dd1deca6303218695e7af8a7ec8f24385af4e2021cd2aaf4bffd3e2b55713f93dc012d9c92b4716 SHA512 4616cf5781b042e43497e382e43591a4d4982c9ab2b8a21a25860e28dfacfa62e2df524fc07d29df06d4ac24ee937e021883e9a7b9cc88618a49d29d165aad2c
diff --git a/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild b/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild
index 0681ee2efcf9..ded5b27ef522 100644
--- a/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild
+++ b/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.8.2:=
-	>=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?]
+	>=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
diff --git a/dev-haskell/network-info/Manifest b/dev-haskell/network-info/Manifest
index 364a8287dc1c..934b310864e9 100644
--- a/dev-haskell/network-info/Manifest
+++ b/dev-haskell/network-info/Manifest
@@ -1,3 +1,3 @@
 DIST network-info-0.2.0.10.tar.gz 6278 BLAKE2B 52cec7dc2866ff0aad9f0180391c2e093d3147f7de1dd96baa7ec1f9d149792aca371d7f5bb3a32d254f2fd3a35f6a6b3fb479967ad7cb0a125944aca7eeaa88 SHA512 d578f64860fb3c04d11a444d9636bde57402b6728529e73c7741b056ef0d8f68cb0958118212f2d47826dc28ba9b2bfcc9aef8b5b2e9fc3da8eaadc796160895
-EBUILD network-info-0.2.0.10.ebuild 557 BLAKE2B 48de2b400bfc2fe088e3afbcf5672bb92c8e89f4bcda6d3cd6814c1d19e5ab4300c5bfe9feec8b2779cd9e8c80a35d3d8bab27f63a647972b513a884268f20de SHA512 fec397f93ee828895b3d8ef72515d1fb55ce8905e1f3b2c6c6f7376ac8d66b2b7fd6f14a7af5286ab8e918f5d4d506608683fade8de0105b593c1ee609756051
+EBUILD network-info-0.2.0.10.ebuild 564 BLAKE2B f2c6c62a61512a72db67817a9803207a80e5e2b065497e716eacebb86f0bc95bfeae98e2c4fca43eeed0a5c1a9be0dd33514b462d2ce8530712a4d4ca6723d01 SHA512 cfb9afd67a91282ad918ad392e8cb07163f29544f06d21531c72e799787f5acc15349ab2aa75f79df392a72740afebc9ab12253edded2725eb9caba7f4adba8c
 MISC metadata.xml 808 BLAKE2B 34da0d30dfbc8a81c91253a04ab5fac96ca968f3573b28c91567325592e8d973ac4c5d36294b65b0d53506f2be4cefe690ba004ef3a3424d2d95e9376548c3e5 SHA512 51f2ea6968897b3184bbf5c4fa9b1d0dce741c567993fff91d1af3344cce39a000c945855593bb71a7cabedbe2e1019f733505f1f23c6dfe7c21783cac195068
diff --git a/dev-haskell/network-info/network-info-0.2.0.10.ebuild b/dev-haskell/network-info/network-info-0.2.0.10.ebuild
index a44f81fbfdda..987f6e799bbc 100644
--- a/dev-haskell/network-info/network-info-0.2.0.10.ebuild
+++ b/dev-haskell/network-info/network-info-0.2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/network-multicast/Manifest b/dev-haskell/network-multicast/Manifest
index 575c6cff5be2..02c6344da46d 100644
--- a/dev-haskell/network-multicast/Manifest
+++ b/dev-haskell/network-multicast/Manifest
@@ -1,3 +1,3 @@
 DIST network-multicast-0.3.2.tar.gz 3352 BLAKE2B ffbde4c01b286fa5d06382bddbab5bf820f029f371114948ba7e3ad3e26b23c0e94afc9ecc764a481fc7fc2dbd1f13f2252274091a30656ae148de2fb3596f99 SHA512 6308b09e882a3b99ce762cc30da790d6ff83b777d322842d342f555a307c59f0110b9a46557559e9bb5bfba258644f25ebfb9007f33e62cf6855dec8fd48da99
-EBUILD network-multicast-0.3.2.ebuild 616 BLAKE2B 3130485a77b011810c460f918cc470073830c9fe23b78ddb625fa440300137efa8d3918b48ddadfe7d89217f20aab853b1a184e357066398c603f235df08693a SHA512 0e0f66310d63f1f751387eb3c1da7047ed35401c821547422153d10d489799428761f9c51a2cbe971336c6f90cbf4036cb78d63c8cb18a7011896915c4e05370
+EBUILD network-multicast-0.3.2.ebuild 623 BLAKE2B 90f36851daa23d0a30ca00747f7227b5a636f0b0fe6b5e3776a95d18b942692376158460c13622409129c4869d1e14f82539d287f5e790500127f0bfb65f18d8 SHA512 f0ebe62364de92599dec72dc2184451d8547c1207572874b63aba0f014711119649a3e45990c14314ea7dd5d9fb181cbcaa58bde2687d6efb429e8c5f9c77f0d
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
index f435fbf8a7cf..6fa16618f149 100644
--- a/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
+++ b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 068123281adc..8ce513f8f5be 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -1,14 +1,4 @@
 AUX network-2.6.3.1-no-LDFLAGS.patch 419 BLAKE2B 25519c4a7e4fe8e4fe0a833f4beef41c90e27e5602da7510a023f646321d5c6983e75964442b172726d3cb854cf98e8c5c3dde847a18a3c1cecac2673318143a SHA512 4197173760689f0b141edfc5242abce1ec8a7e290b0bf91a8e71f81f8dec7f1d259f84458adf5a2426678c1c3c1e0aad95041096562d9381bbe1aa7ce40b9359
-DIST network-2.4.1.2.tar.gz 140424 BLAKE2B 7e9d3036caa1ecdec1ffbc684310271cdd92998cebc35a51d65b858975ab8210612e445bc26071bebc67bb7ece5af31a6082de46932724a4afca63fb68238791 SHA512 a9a0237477fbb484ff8a66121a7808e35d4df68552c18cead1f96243f945e9517583f39c769c3ecbd643ec86a253bb3cba638ffb780feb503d60595ad7c4c7f5
-DIST network-2.4.2.2.tar.gz 141558 BLAKE2B a2e9137b79da5e9d136a9e10eee796b2aeaa81bd38cdfa5b4a2822711a9ec2fed3019ecf91c84f2ca6dc00824455814fac53c6a75bf7a5af89ec733ea4be0c6f SHA512 e1aa5caa4e3ca368f8499ff9ed337e6827909a6d1c622cc2133871eac3b9d257d982c421f40d4d0118e50a5a421102f084d95b4e98faf91599b6c002988b1466
-DIST network-2.5.0.0.tar.gz 141768 BLAKE2B a7da62a236f87d4afb48e1289b536d924b04179b1608b6ca55f755dcbe08a468546a52c69f2a3f681e9e2ff05a952d1dbbd87831dd03e3a8a2f911eb17a379c0 SHA512 37048752b5d4d68f9ce57f9c7a3bfe2657a207c5853a6ecaae74ff9c8f9afb2ba76c9e517bfd955c427cbfccc39d921a1849c5a8094603ad5081012d9f5bb47d
-DIST network-2.6.2.1.tar.gz 118092 BLAKE2B 38f5be09b44ef90e4ecec2d73809abc8bcd15f55b95f6e390d925634e9e56776e00fd0bb5d223d26c85bd31d318ec61553918eeaf8b9c15258aaa70a41e6494d SHA512 debf0a05e1b9d048b7212ff21b92895da84c864bf71c3c5adee5070402c94a38f6722fbc11cfb15df36fe9bfe092bb0c29a0f3f9475a319f38e0c0659989cb68
-DIST network-2.6.3.1.tar.gz 120418 BLAKE2B 5e48e61e3f8b3ac9d9fa5bfca37929581291941d1f55f332614bf61552354a31e1f565092e4f83e67181384553b5efe2040d12882f85fe03d2377b93233e883a SHA512 3c23ef0a1bf5383cc2479a517875037f9de38c79c1293734cc723111ab880a5842e091ee91a612090d0a2e422d53028d17cf5b0800af0d1d6c983d564197b9a6
-DIST network-3.0.1.1.tar.gz 114777 BLAKE2B 05ced39ff17eb68e5e70ddb1036770413224839d5a2c84ee568823feb364f1da898bdc56ae7e64f0e24db80dbc2ec739e42763708b3373f49a85ecf911c72621 SHA512 faca3b25c8724a0c832b6e12e21381fa9642a60bce8a01ea7b570216cd429b2332b14903011f4a554af227de5e502f9619860c230a8f2a69cb5e2289b1947e3d
-EBUILD network-2.4.1.2.ebuild 753 BLAKE2B bfbf210d877000e374afbc43f98e171e987e569db8302c47f5973babff25a09e051e85fd9b212d1e1ea920d8adf7e2cea1bd7e62e8c2b18489deecd6a5f42198 SHA512 4751a9457300845f8e1f8af746a48c808897ac84acec9351d29d704f9fbc1ea9ca820d23184af4d7d3ebd613c880044a48772cbcb7218ba0590dc7ca64a03312
-EBUILD network-2.4.2.2.ebuild 747 BLAKE2B a5dad21330eeeaa26369c5c066fcdcbbcdf2ce571e3e041f81639869154791d18ecb0a49e3618d76a8f5d1df05553c00bfed7f7da6001ad2b5b098d959ad71ad SHA512 1446634a87b4a2279ccf70d1a35108dd235c469db8a9b03460a629af5af64a92a8548a013bcff90d7d32a33ad23a1c1ef6fe30b8ea3a63c2e872dff3ce57f5ff
-EBUILD network-2.5.0.0.ebuild 744 BLAKE2B 3d9558cf51ecf2eadd67b4b79368acdcb0cf2b354c305d985d16a10a5afd5b19572a63d4f4cd423e80ab2afbf0195299b926624f053dc3b095a66969bc80d9f4 SHA512 3195af8cce7efff13be0768642af5ac5ef2e2adeb377dbd0b4a90f146dd09e6fe0d74cff24ee6f6d7ad2daa028c68a2c74429d4ceac10f932c221399023cb88d
-EBUILD network-2.6.2.1.ebuild 667 BLAKE2B 819a0be09a5b63784e0bfc324bd4ab2f6769d96525943882fa52a00e671e2bf9325817c3a2bc3a68b2f253a6e98896b3cb76df6e2784e3148ca899fbdc633a09 SHA512 ea89572dc9eb06763504fb51fa0fb88e1f24c7b38006b24aca33b077cf4922656a26dc9bbcb56d8aabbab833cfccfabc0a661bb4b8d07453566e6848807fb940
-EBUILD network-2.6.3.1-r1.ebuild 778 BLAKE2B 59582d19b505304d607bcd1a4f9e419e943637041dc59e4152cf9dca87cfc3662824f67d9baa08f49570d3c89bd699e06d805573d4c8abf4e8470e39b6ce86ea SHA512 ba43a8a101e94807172e26c53a112cd6987f64fdb036b3dab110273859353570b1a879fc78a4ab6eec61f52f7bbdddd776aecbb4b6263f3f80e92b27342dd519
-EBUILD network-3.0.1.1.ebuild 664 BLAKE2B 33f60672ab54a6a7c3bb0002a406527c8188dabf722e44ea89e6bce25a510bd5534217c4312fd6f7cc4a7f21cafff3d1f82d4a875d51f8549dc97f00ca56386a SHA512 76d2c6faea6cd7ffca086f4c53a167ff4d9ca385c1094c8741ddaa5b42c7568e8103f4ef6aeec35ca0877b812894243b2f9eb902f33dd09566575b475f3346d6
-MISC metadata.xml 340 BLAKE2B 27b3fb59787be760e5c68d64dac0fa02e9356a34d06619cc21c9a9b0f726b0d000ef3e1bf60f65397b97002faaa31fc237527f3ac8ba2a477f673b617c72e9a5 SHA512 4d9c6ad650cb7115c21b1f903c71aedf61d8c5482a1a8568407ebdeead5395b64772ee1924f497ac1d9c6e7349dd17ac63a28b20be9a000c547013c793bbe0a2
+DIST network-3.1.2.5.tar.gz 139267 BLAKE2B 682726d42db1d899810fbe6c0aa89f1b25770a46041a9136260d104f658611bc747c4695f403ae52234ac3506221619d7741e75bea987d0cc19e6a5066172f9f SHA512 671429b18f11285b157c70e669051f57a30bf5e85ada1134464f80dd978f71878f8b4d2564242c9ff4bb100b49af771e449c556654486f5eb433f39401ec6c00
+EBUILD network-3.1.2.5.ebuild 761 BLAKE2B ffe42d675abd7ec429907554cb7ac974a8b3c359f073f7637d55ec17d55f428b47d31887931701e732f377cbb097499446102d97334c262368efc129e8452632 SHA512 7cb1ef6d4908e4252255e2b23279b9adf89bf8e77ad3768d5c6cf261b4f19f7d5aad5a7ca465105de15b05eaaa3879848ef678007f21cc2b88b7287e3e18c657
+MISC metadata.xml 320 BLAKE2B 1764bb3bd9d107ac422d07ac162a616f2b9c7024b1b5bbec4ed67beb6a6bc2d4670c78328bd2d1bc9a5366549322df1a466a88c61a801ba9c79972d1fa25dad5 SHA512 569a69c1108918a0a6b93b1269dc028c65f8fcd87c94c771178ee335473214a990ec09565f0c8463f643b46304e42a3cdab8e0f5f7401fe5233c043370d79610
diff --git a/dev-haskell/network/metadata.xml b/dev-haskell/network/metadata.xml
index 5d869e8ffe66..11c89adf9f6f 100644
--- a/dev-haskell/network/metadata.xml
+++ b/dev-haskell/network/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-    <name>Gentoo Haskell</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell/network</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="devel">using tests for developers</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/network/network-2.4.1.2.ebuild b/dev-haskell/network/network-2.4.1.2.ebuild
deleted file mode 100644
index b5f4686252ff..000000000000
--- a/dev-haskell/network/network-2.4.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)"
diff --git a/dev-haskell/network/network-2.4.2.2.ebuild b/dev-haskell/network/network-2.4.2.2.ebuild
deleted file mode 100644
index 0bf78717bbcb..000000000000
--- a/dev-haskell/network/network-2.4.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/network-2.5.0.0.ebuild b/dev-haskell/network/network-2.5.0.0.ebuild
deleted file mode 100644
index 12eb7390366c..000000000000
--- a/dev-haskell/network/network-2.5.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/network-2.6.2.1.ebuild b/dev-haskell/network/network-2.6.2.1.ebuild
deleted file mode 100644
index 4a93655738cd..000000000000
--- a/dev-haskell/network/network-2.6.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/network/network-2.6.3.1-r1.ebuild b/dev-haskell/network/network-2.6.3.1-r1.ebuild
deleted file mode 100644
index fde706ca8f3a..000000000000
--- a/dev-haskell/network/network-2.6.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # missing regression test file
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.10.1
-		dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
diff --git a/dev-haskell/network/network-3.0.1.1.ebuild b/dev-haskell/network/network-3.1.2.5.ebuild
index 2958a2f86aa5..cf917c3117a8 100644
--- a/dev-haskell/network/network-3.0.1.1.ebuild
+++ b/dev-haskell/network/network-3.1.2.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,14 +15,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="devel"
 
-RESTRICT=test # requires network
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
+RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/hspec-2.6
-		dev-haskell/hunit )
+		dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/temporary )
 "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag devel devel)
+}
diff --git a/dev-haskell/only/Manifest b/dev-haskell/only/Manifest
index 32ec7e853987..7e6698a3b4f9 100644
--- a/dev-haskell/only/Manifest
+++ b/dev-haskell/only/Manifest
@@ -1,3 +1,3 @@
 DIST Only-0.1.tar.gz 1960 BLAKE2B b57f48e58287c43395383e355ba9b2d42df4c8b65edbc268e7203853083524dc88540d63a052968b9776dc94064006241188b23e840e1e36872389f9e463d1ff SHA512 6b64178a433079449b6840b03345e70f2c5c03e322184a60d3ff2f4d0ae48be87042ff32dc1cabe1911b6c43f7162090ee067aa582c6d5ab56610ca4897a33de
-EBUILD only-0.1.ebuild 618 BLAKE2B d849e119cfb5edbc9a68e325b5b5d230dc61404d7e812b7345939c36dbb1303110ea6ef15ab90f568eeb41ecaf586960bb1ae2427392a3538c4b9c2da69c3564 SHA512 2591f2256f47584c93ebb60036f1be1b71ee5c182d2b621dec516d9aa4bb1803a192d0ba643ef8c2238b59c19c2ccb741ed15f660d1f0e54656c62fa0812de87
+EBUILD only-0.1.ebuild 625 BLAKE2B 8a79cbca838d0d78267b8df8ec14e084563dd054267b61e186cf343de17afbea6f73cf9a81e05a4b8e58477654588bf4f4dbb8f0fdca76a6e44fea83ddc1fdbe SHA512 2061ec33a3df3baebad53029a83cd9b350e2ce0a8d3132e37ec93e6a81c43f14d76798a0bf07925733cf7d7e26072285daab9c8b7e1f610192f778874b4dc1b7
 MISC metadata.xml 768 BLAKE2B 60174809ca2d7459661ec72b8b55e27100d2cd2b65b061c879f40b8f83e76e08ebaca90842f1e130dbd7bc7970c54be56bacd974d89e0ebb179a447a8d620991 SHA512 9f3aa6bc105f541af2a38757161f4a914b3138b5950dbd0fde78c511051c761dc5af69231acef716677656886f1c5bb8647a573b6facfe97d41e44661e36eb93
diff --git a/dev-haskell/only/only-0.1.ebuild b/dev-haskell/only/only-0.1.ebuild
index a6ad69db5abe..cf17243a3c02 100644
--- a/dev-haskell/only/only-0.1.ebuild
+++ b/dev-haskell/only/only-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/openssl-streams/Manifest b/dev-haskell/openssl-streams/Manifest
index 6a872e1b4848..e755e6f8cab1 100644
--- a/dev-haskell/openssl-streams/Manifest
+++ b/dev-haskell/openssl-streams/Manifest
@@ -1,3 +1,3 @@
 DIST openssl-streams-1.2.3.0.tar.gz 6304 BLAKE2B c957be3a5d45f8785220f1bf645ab49df17f3c21dc609810651bc345c9bf6e576cbbb3a35f46b9f979ed48b525caaf8bd6c75f1fc41a38407fa8948b2719f17b SHA512 86c5f9348af82ad0ac9e8103ee078c78647e61345ecf0c48b02749206147a82a3a798f681b9cd20ec866276aca75a3739965ca2b76a0b302da4792bf1fc4917e
-EBUILD openssl-streams-1.2.3.0.ebuild 1049 BLAKE2B 579fc190ea6578619105a0dd466fe287378c97f1b479dce497be4fa26ae7ae0b830774009e37e81ae2093634048c034a588ed7a452a6452ccfa49354906b9bb2 SHA512 e728dd2a714fc5283662a6d92308eb6feabb8836a948643af606e5989e394fb63d8718cd8e3d458ad1382a035aac66cb18411f54ce2929715b6332ec2d7e9504
+EBUILD openssl-streams-1.2.3.0.ebuild 1056 BLAKE2B 320ba3bc6d2b0d0a7066213115e9a6ae73716efc3b6b6a0e742dff176adcf61480ea86faaad509dbdc188ff8c12526067f97bade5fc438ab209804e1a5be02ca SHA512 3d21d56500dd2093707382cbc2c2a736948572f802d2e5ae51034a1d9b2522812f60bf1a309a6be3d7a9abe86e2e3024e33fc93f5c3d48db4a317d60177e008f
 MISC metadata.xml 504 BLAKE2B c7fb435ad093bfc55f08e1105953878444d28e3e78f6a705165e2613daaed75ecf25f37fc60c0f5b686b626e3aacedd6ee9a2bc7b21e5c2bf8facbce26bcae2b SHA512 d3f5c04a7f795e8a1ac32a815d81ea66166a66e2c76a1b733ee1896130d8c790fc2fbae8ba5c73a2b7180f77df81b47a743d02648078f745e89d17dff8b5f968
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
index 7e5e5490e1ff..9aabcb101095 100644
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # requires network access
diff --git a/dev-haskell/options/Manifest b/dev-haskell/options/Manifest
index abface55a88c..8eaf8ea013f9 100644
--- a/dev-haskell/options/Manifest
+++ b/dev-haskell/options/Manifest
@@ -1,3 +1,3 @@
 DIST options-1.2.1.1.tar.gz 25327 BLAKE2B 66611694e5beb558e185cd9a89e9368ebac035118360a4c1cb9bcba5ad2a0be74c32848e3983aec999b4cee6e3138c527fe31c869b52c84719ee89afe3aad232 SHA512 615a3767b74ca0ba2eae993f6e475963df2a0933f1e6c9bbfe35144c4dc6018af276144b2ec1b608b695dc7fca904784ebc63cd58a432f966588846cb36f94ea
-EBUILD options-1.2.1.1.ebuild 752 BLAKE2B 4fdea3c51d5f371c4fe7f7e396d0273ea1550237cafa7d1712d463e8c9f3cfcc1e36f73592c33dccca0c6cbe9386cec96433df0cf42772b50ae15f80e9f781be SHA512 c9b9e80f640d9b137b699076661599e1e878a073f60c9df70a1c10d6b80a1de28582ffc43f26f99785b47da34897dc439e2fc8aefd0ae51d55f62a50bea7706c
+EBUILD options-1.2.1.1.ebuild 759 BLAKE2B 4bbedac8b544d7d8ced205a95b6a79eca9dfb8e25593b7f1e390692b08fb7802a6e6aebc714352c994dc16c0555cad2a59d322d8c5b05f7dd13f0fbfda0f6f49 SHA512 631b4955da58602bcfccf9f0653c13b13c9e38cb36e3038f3c00dd899d45645e65034851bd98a51cb05cd2cc6cf83ec1c5c9a95bb7a4863a21f83073e5c38fde
 MISC metadata.xml 1804 BLAKE2B ed463a394c9fea003d56865cfad18d8dff43416a11fd2f3a5e81dd66025ff92f16cdee4d979a26208ab883b0db2476051e1e12de141aaad04d24c12a9d4a4463 SHA512 25c89b211c78d1563acc7425ca309449f50e1efd89880ba497a36b99f8cd6745f8d9974bda53dab2738fae18313eb53c3eb99a697e3d4c91939a8536aaed00a6
diff --git a/dev-haskell/options/options-1.2.1.1.ebuild b/dev-haskell/options/options-1.2.1.1.ebuild
index a6d4c06bbb96..a530f34fe23c 100644
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ b/dev-haskell/options/options-1.2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # circular depends: options[test]->chell->options
diff --git a/dev-haskell/optparse-applicative/Manifest b/dev-haskell/optparse-applicative/Manifest
index 56348cb487f6..bf0f104dcb0c 100644
--- a/dev-haskell/optparse-applicative/Manifest
+++ b/dev-haskell/optparse-applicative/Manifest
@@ -1,6 +1,4 @@
-DIST optparse-applicative-0.15.1.0.tar.gz 56203 BLAKE2B b4db1a96d0dbe1e4f1a4969e5fe1597ca314364bc71da505b9582b8cd0bf0025edc1dea3d1d39b84c108a7b38bea2c53ecd660d1d0b7d44c56b8d18dde14d812 SHA512 e7ab0a2b4812bbfe7802c2d51a45a4f5a5ea162b094631dc6ee4cd79e5def4101ccb04305cfa16942926809ed656f91aa6f68c4d98e93171ca9be99ba40cc51e
 DIST optparse-applicative-0.16.1.0.cabal 4982 BLAKE2B 7e9fed3ff6f09f8b7994d4fd2177ade79e62bc2292dd5fa78bfdf15b0b6f7af0bd696d61ef02ed358460a61f0e2f960d01455091168687f6d2db0b07caf182f6 SHA512 31a1e01b4d0a247c10b1eec2f5bb40e518b447527736b8692846980d182ef2ac4d839b4a24b3d17414fac28700d43d0317deb481c1e0c7ac2b7b38aaafc654a1
 DIST optparse-applicative-0.16.1.0.tar.gz 58315 BLAKE2B 3998ef8594abd3f0f1e85cc44a3efa19d78751f5d17181e1b203504221c219ebf3fa36ccde7351e5821fe1c4a4c0c16a20fffe92259710dbcc7656f4e3a83c50 SHA512 46bdb37b1328a6dbf271dcdb3483266c0c8412fc489e68e32b114745d9cf0108dd49df6cb565df3470121931a769f11996f5fd9fd8e9e38ed6b6853faab56710
-EBUILD optparse-applicative-0.15.1.0.ebuild 1004 BLAKE2B 4a1d443800432c3e66cb8199cbef849a6cf9374ae83b60dc26a32efa728d86c1e5a261027a018972921ae0a8d9010f0f9e6278bd7d28114bd0cc7bfbb2844ee7 SHA512 152d00c0d5335b93c4078ed8ca41844cce8f15d583378b89840f85298c6f3f95134fd9cdd2c44592543f097dbe79e43dec63ae374fca9fb836a69d69c12eaf8f
 EBUILD optparse-applicative-0.16.1.0.ebuild 1217 BLAKE2B 0497caecad96f52daf3bf9859bd34fc39cb5f7a605786b07ff59b835233dadd2de27fcea17f03f1f0dd9158b6aaba53895d6207c62496ae963da59746d429c9b SHA512 d80d5c81ae06deaec36ce365265d85513ea529e6d060a19d6522ee7425be9e096fd31347c747b47f174ea741064121c2dfc671bf89685387a7331d2c85a82e1a
 MISC metadata.xml 2420 BLAKE2B 18d53d68d037fe663e65808a60db600c8cdd7357289a5b66e5dd9ee0c476eab5b48374a09bb8d37e12be7ecbef24c513affcef60536b30708416918a14b1ccd8 SHA512 12e539b62236e27fa287f8844ac7fbfedbf6959ab9acab57df0faeacb2796a630e2d4b27fbad2dea6b6067072ce057735ab48fc520ee0b1ddf83c6b0b13d6950
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
deleted file mode 100644
index 4e1407187440..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index d9da89985acd..3dcfdd85b19d 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,4 +1,3 @@
 DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
 EBUILD parsec-3.1.14.0-r1.ebuild 1331 BLAKE2B c6fbc2ebaa3c43f8aeaeef46226dc1897537318b34303b81cf1ba0383f6eac5fc77459ef7a239665181fd0ec58e2ddce3a5e5518a8a748b5a4477c2b19d17486 SHA512 514b2acd3a3efcec9d4dfb6a2b3ebae080d87f1e8025c9782e77647bdc67901dc3758df8b9297b677b10a24871a0d6a0174d2b18cc8d6045d7d39cd7c8012b95
-EBUILD parsec-3.1.14.0.ebuild 1328 BLAKE2B a0f0d1ed8373ffb1b1df7b5888cacf9e53bb386ad7fc186559faf62d04e949dfa6f21778a7098c82615f0c860b74d3ae0361e37aff233d2d9a6439678a6cdcb6 SHA512 4a2b4f2470e8187466ebc0e506843df67c09d2417e37511c2332198b75b49808980466884af0865e79ed7b4fa027751c651a2f36b400f0f7d8e110f596a2c57f
 MISC metadata.xml 637 BLAKE2B 8cfd213e06fee18de6fc0c74811c3d5113812424f6801f092fcb6803f606a6e908235fb9e1c1626fecfef39dcf02360345c54108aea7471caca132c645870299 SHA512 e09035acdbb6ac200d49861c30f6207707d29c33810c16cc77070e2baf97afb8577fc407fbc938bcb0b329249f405d3553fa430c961d74106a2cba58ec9866a3
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
deleted file mode 100644
index d2120fe88cb5..000000000000
--- a/dev-haskell/parsec/parsec-3.1.14.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depens: test-suite"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/haskell/parsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
index f015bcd6f432..68426a8ea7c1 100644
--- a/dev-haskell/parser-combinators/Manifest
+++ b/dev-haskell/parser-combinators/Manifest
@@ -1,3 +1,4 @@
-DIST parser-combinators-1.0.0.tar.gz 10349 BLAKE2B c8b21ab8c1afd8fdc931f60258245596a70adb404366f5926743b61b6c7b802558436e7869d012dabaaa8d36097028269cec3c99f647958d0b15d14402c05c6b SHA512 308b38faca865801c2356b9eb0128824956f00a31d98de075166018b34d53a04bad0dc7f1afabafa9946b307ef3fb77df303db78ac7bd6ff476c9b96a3020e9c
-EBUILD parser-combinators-1.0.0.ebuild 746 BLAKE2B 770ba4532043bc2d4eefa221aead6a2d701d857356b93e51d179d76739d298ed1b85cdee2c2f23b7aa8fc3ae6324fd174ac8f589ecfc28f68d2f75d588cc815f SHA512 23f3b5ae61aea7ba680b0edb7a100dcdba1d1396016226fcbbdcd3054dbe0f087b88c87f8a4b5312e14bcc36b126354000fe117acd7b2e959b8150b1fe3e7651
+DIST parser-combinators-1.3.0.tar.gz 11699 BLAKE2B 0a24e95c52627a3219cc8e89ed49ebc12e759a487e7daf333f3ab788837576aef88d295f585aecd0831866319ee0445369cc3cd26255d6ef85d602f44d7767fa SHA512 f7a4581d229b788e841d844003e058a6c63827c5cadeb6fe8f1b94e2a920b11d3b08a8a7a412fa95e1b75bca24f6957f88162f8d1af5bb174ca7f91ef47c0b71
+DIST parser-combinators-tests-1.3.0.tar.gz 6860 BLAKE2B ececd5d8a47501a90e68ba77da679aed2c00da225c234f8afeebd43bf4cb821c988cd5612e8411e70179b39f0fcf8c15fcd93accd81e42ce1b8999d0cd8c7bdf SHA512 ac863afcbe81ea83c20cbab3229c5321860d1d45b4b04031db1a8cc493239096aef80d24148fe3cd5a18dfc811d806855386736be94e32cecabab3ae656d5389
+EBUILD parser-combinators-1.3.0.ebuild 1681 BLAKE2B 17242e0cffb303f26ba44daec6666eaae676c2023e2b129b2500744a3fb17ba29177f2b8966da50f189a9e33e209e8b3a83f30bdd709e0c2dbf75e8dacfb4a84 SHA512 3cde3247d462d4f95765d097ca90eb4168105403b6c2c223c69b56c268c01aee78387177c405fbde43f213fc2a6b32167257620419cd5a4e5a253501633ef783
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
deleted file mode 100644
index e5d497098a32..000000000000
--- a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lightweight package providing commonly useful parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
new file mode 100644
index 000000000000..fc3e4a9d5cb2
--- /dev/null
+++ b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+TESTS_PN="${PN}-tests"
+TESTS_P="${TESTS_PN}-${PV}"
+
+DESCRIPTION="Lightweight package providing commonly useful parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="test" # tests only work if not already installed
+
+RDEPEND=">=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
+		>=dev-haskell/hspec-expectations-0.8 <dev-haskell/hspec-expectations-0.9
+		>=dev-haskell/hspec-megaparsec-2.0 <dev-haskell/hspec-megaparsec-3.0
+		>=dev-haskell/megaparsec-8.0 <dev-haskell/megaparsec-10.0
+		>=dev-haskell/megaparsec-tests-8.0 <dev-haskell/megaparsec-tests-10.0
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
+
+src_test() {
+	if use test; then
+		./setup register --inplace --gen-pkg-config || die
+		ghc-pkg init pkgdb || die
+		ghc-pkg -f pkgdb register "${P}.conf"
+
+		old_S="${S}"
+		export S="${WORKDIR}/${TESTS_P}"
+		pushd "${S}" > /dev/null || die
+
+		haskell-cabal_src_configure \
+			--package-db="${old_S}/pkgdb" \
+			--flag=-dev
+
+		haskell-cabal_src_compile
+		haskell-cabal_src_test
+
+		popd > /dev/null || die
+		export S="${old_S}"
+	fi
+}
diff --git a/dev-haskell/parsers/Manifest b/dev-haskell/parsers/Manifest
index 8963b33945d0..eb33a133ffb4 100644
--- a/dev-haskell/parsers/Manifest
+++ b/dev-haskell/parsers/Manifest
@@ -1,5 +1,4 @@
 DIST parsers-0.12.10-rev2.cabal 3428 BLAKE2B ff4fa52451f5f85a76dc8a3cd7fecfacfd74bfc5836b46b1c463ff7d021c0f680feedb5816f0cc1e66bc32fddde491c58108fde60d7073bd150b33185c218c76 SHA512 3861ecd2139dadc721b3e3a0ae45f83e488c48b067fc600cffe7b194102e9ac135ce1bbdc8094f10d670367dd5d2571c88b2943be136a682b53d0408d50836b8
 DIST parsers-0.12.10.tar.gz 26215 BLAKE2B 35303f6f4919e07b77490f5bcbc2a45efe8fda5edf169ade7dd7cd3bd080f2d24d5470ecb47f8a6428be1176faa8d138616e8f2635f9974ed473c8a61145e8ee SHA512 99ff90de4e60be3c03c8e1e5ae7902a37424c3139ccf566ff1cbc363d176787bd60bb709ef6c56f5b446f1f1b7eca65aa5d431897a0f82a9d6f7fe77fd2ee49f
 EBUILD parsers-0.12.10-r1.ebuild 1807 BLAKE2B 2b00e0b2a40883a2b74dec7bcddc3b96ae79489f836a21de00d77fc9190f1bd291d6b1208f3ae37d0c3771cd6e2feac6f679b9424894b4f1b18c92cae00fc1d7 SHA512 1559179d91ee26f91e2fc5393fcb1cca4bec5d2c5b224a00d9de4ddbf8baac0150e639a4d654aed2812dce2cbad788c98695e3d44517e266ad8312431108fe3b
-EBUILD parsers-0.12.10.ebuild 1495 BLAKE2B 588843cabdf6475f83401d8d51362fab3aee8fc2336842d13d6d46daf0eed227ee1fd0884055c9d65765baeceb64423ecff28e1051d682ca796faaf425c478d6 SHA512 fa02af09569303b982010c73f64c5d54f7f42444ff08f6172528239a07dc88ecf1cc1b51a929a413cd1f093884593fbba50c28b117083cd184d76ff29a3fc4e9
 MISC metadata.xml 929 BLAKE2B 533ba942c0547f18058c182ee9dbfaabc41ace511ce62e0eea6286042ac445c671e15b64a8be7662a4759fa7e614f7cd6cf148939d50540a522ed040c7dfcaec SHA512 dc78e8b7225f799768c0a4e825decd4d15815cd6a8f4dde333d16ec99dd247e0194241dfd74eeb014d59c66ddbf4bcd4b5065da9d33e08044473c5b9981d8140
diff --git a/dev-haskell/parsers/parsers-0.12.10.ebuild b/dev-haskell/parsers/parsers-0.12.10.ebuild
deleted file mode 100644
index a262cb26304a..000000000000
--- a/dev-haskell/parsers/parsers-0.12.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing combinators"
-HOMEPAGE="https://github.com/ekmett/parsers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+attoparsec +parsec"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] )
-	parsec? ( >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag attoparsec attoparsec) \
-		$(cabal_flag parsec parsec)
-}
diff --git a/dev-haskell/path-io/Manifest b/dev-haskell/path-io/Manifest
index ea6e71f58493..4eb804f50a7f 100644
--- a/dev-haskell/path-io/Manifest
+++ b/dev-haskell/path-io/Manifest
@@ -1,3 +1,4 @@
-DIST path-io-1.6.0.tar.gz 20848 BLAKE2B 89236aca7c41b5095bb989c7638640ce6735843db36028b2b9d4f0427b0bb94403d915eb3abdfd34cf02f5b6b02cb02e57525eb9e056c942481802b24401117c SHA512 dcafbbfe1531d7b00a9df751c093e6affdefafe7589c0243530579b9f5733ef1357b1085cfd88bf53ff9794accddbc789b927a199f4c4a2b7778268cf1719477
-EBUILD path-io-1.6.0-r1.ebuild 1123 BLAKE2B 0b6e59bb818133e2abaa74c1473edd8ca49a0d0da9f39c56733e4fdbaff70ed4326e544f5a0f6aa87fc3614411dbbf7d076d7957bd6ac7aaa5f2c29a8b9f959d SHA512 d793eee11974caf22d844967ea174e5499029af55c7ecde88a048448272cd8d8e5a5f587d6c1978b03c03b6ce367742f6db943576fe9f622c108f290106aee9e
+DIST path-io-1.6.3.cabal 2142 BLAKE2B 53b2198802cbb77554140ba5a89bcbe23795e369d51fb6a78fb54208ccd2a4fe7f67ae1687f105a4fe8fe00c5919ce0901b7d48982e7fce036afb8f23eaa3865 SHA512 f8ac7360acf4c556c1b4d7cf9840e1e5fb71f7aac545ae59364a0e85e448482905e9189ddd3fbb41377ce7da5a51097e62a617a90a40f36a30713ad684e4a066
+DIST path-io-1.6.3.tar.gz 20946 BLAKE2B 2e2e6b2e8835228be9e984b03891989b3517256926b9e643656c2236befff262e03dc10131e1f41278c871c70b5f14599161708915837ae2ac9f61cd637cf95a SHA512 d9d4e0d3a0b74677b8e29608254b1a4b5f306378400e8ec6d2b96ec4fd5b340ca20652684af558ec5ec5c401a18c4c9203adf7afbb1a602df0786459bc5bc774
+EBUILD path-io-1.6.3.ebuild 1327 BLAKE2B 151a51366b575388df7e011f5a9d6a86449d9bc6e785749e854c239d19d66638cdbc5e68ac6e9069a6f04689299aed3b252b467f367c44346aa541377ad22d42 SHA512 9324e654c51d64cd685ad75133a6efcf31df165579e083f5ff12dce16e399f31134e7f80219b5ba453d6840af3c1b92ac1b63872dd0d99b904c751978a9280f6
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/path-io/path-io-1.6.0-r1.ebuild b/dev-haskell/path-io/path-io-1.6.3.ebuild
index fdde596e893d..ace895dedc06 100644
--- a/dev-haskell/path-io/path-io-1.6.0-r1.ebuild
+++ b/dev-haskell/path-io/path-io-1.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.7.9999
 #hackport: flags: -dev
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -11,30 +11,32 @@ inherit haskell-cabal
 
 DESCRIPTION="Interface to 'directory' package for users of 'path'"
 HOMEPAGE="https://github.com/mrkkrp/path-io"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HACKAGE_REV="3"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND=">=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
+RDEPEND=">=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-2.0:=[profile?]
 	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/path-0.6:=[profile?]
+	>=dev-haskell/path-0.6:=[profile?] <dev-haskell/path-0.10:=[profile?]
 	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
 	dev-haskell/unix-compat:=[profile?]
-	>=dev-lang/ghc-8.6.1:=
+	>=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4.0.1
+	>=dev-haskell/cabal-3.0.0.0
 	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
 "
 
 src_prepare() {
-	default
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
 
-	cabal_chdeps \
-		'path         >= 0.6     && < 0.7' 'path         >= 0.6'
+	# Apply patches *after* pulling the revised cabal
+	default
 }
 
 src_configure() {
diff --git a/dev-haskell/path-pieces/Manifest b/dev-haskell/path-pieces/Manifest
index 931ee88e6a62..4c0349f9fae4 100644
--- a/dev-haskell/path-pieces/Manifest
+++ b/dev-haskell/path-pieces/Manifest
@@ -1,3 +1,3 @@
 DIST path-pieces-0.2.1.tar.gz 3529 BLAKE2B e3b34a630ec0cf69531c46604060efcbe287a45e4fd5b0fb8f76768b605943957d5a99dd3ebee16073e965906ded52584062fbeb4bd4b635c6511b47565c57f2 SHA512 83b8bda16db42ed347e2caa1978f195faf161f53beaaccbf450d21b29b9ae9fc04bcdf8dd17a0db2e11eb9e5bfeddcb605237325c7aaf4ec5cc3402b859674c0
-EBUILD path-pieces-0.2.1.ebuild 660 BLAKE2B eeb90244bbc3bf95d340f31f5c517ecaaceaefbc8b7b1d58cf7e27839078fc4d07e2abb5be3e25b919c8345faca36923541283bf66eff3ec061a533d0fb10faa SHA512 b8e83d1082443f7f98e445be198a20cc6ea0286f238f82eacccc4baf484bcada687a2b7933d662073d0dcf052d790954cd5ae74e78819ca17b7bec157238a083
+EBUILD path-pieces-0.2.1.ebuild 667 BLAKE2B ef42b8bc3d9856f105f0aad8d693d2ef6a0d309c344986ef8727971fc8451f055a782b24ce8682084fb378bbfcec3c83bc1cd781052d13bb3ecbda1524aabd87 SHA512 88a9573c301e5e3997dfce1a16fb34c9deac018e48e5de4e01b3a0790243ea2e4c3ae88a17d28e717638eea815184e22a7d9df4ced4a0513396f1a7a9df3d82d
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
index e44cb79ef1f3..5ead29fc5bb8 100644
--- a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
+++ b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.5:=[profile?]
diff --git a/dev-haskell/path/Manifest b/dev-haskell/path/Manifest
index 2486411c92f0..21be63b346fc 100644
--- a/dev-haskell/path/Manifest
+++ b/dev-haskell/path/Manifest
@@ -1,3 +1,3 @@
-DIST path-0.7.0.tar.gz 24227 BLAKE2B b2f3347c29dfae0e7674f4de39f07bb7ee681735d1509c7eefd29cc2141dcf974212fc970095a783fdb47dbffaac9489097116768bfe996a160bb9b8886cc9e6 SHA512 b07fc95eab12188d49e4525ea5bbadfda9d5bfb61cc306d624730087d2fc1f946407e4861f7f66de48d9cdf2541591d4518fcc77f28d65671bfa65a963e18a9c
-EBUILD path-0.7.0.ebuild 1152 BLAKE2B 8b81e916f30b530b57852a14546a355918788d5ad0077ddacc9af4b73e971832d16524bb6d81941c64c1fd42628ffcae183dd6dca6b1b7ef3eeec30b85ae05b8 SHA512 0b0f2781f36ba9dbbc5b233690e39a010eec6ec4b3401845c9e5c11b38820e643b8bb1bf6c600ea7894bc99ffc777e589b193956efc5dab92cf3ade4678eed41
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+DIST path-0.9.2.tar.gz 26341 BLAKE2B d9c3e70034e980306ed0c56cb028e4fb9a858a0a27ca6b13081ded57fadca14942d45955f0f89f41ccb22f2fb981ac93de9c9dfc594216d679f64c9b80cbfb97 SHA512 5d53506e7698f3966d867df8e8c5cc30a997a87145dab80893134d01ee526404e9eeffa1ca6fa2f70b8abed18e0a0d77b14799fe3cac79188b048dac56bce4ae
+EBUILD path-0.9.2.ebuild 1170 BLAKE2B 0f870e4bd29032bd464fdc4dffdebfb33d2f1b12c5e913a8180fcb61efb85f1201bba2c04b543c97e61129a06775b8837ee8cbc0b939efeb1499a4d9ed0541e0 SHA512 7a4847f9cd2106ca18123f74899695c2f13788f81173eee8ed57b94aa8e45c9d2be8d2079122631b520ecd7435b5e282d4a1ee5bf3cbf5200367509898fab529
+MISC metadata.xml 321 BLAKE2B fbee91ad115e2fd989c0a30707a65cda17d2eeb7c7241ed9b8745ca64b3067e8143893ca913787240712ac81d2ff09c79433b177918a553861a5ed99daec5975 SHA512 94d812530caf1b1c80f1b8fec3918418895b8d0280439785f59758c88ef898e56164a3bfd9635d2c3073969018f6f351475e7b8b8e4b84177d2c713b1dfce6cd
diff --git a/dev-haskell/path/metadata.xml b/dev-haskell/path/metadata.xml
index 937381521944..ba268d0dfee1 100644
--- a/dev-haskell/path/metadata.xml
+++ b/dev-haskell/path/metadata.xml
@@ -5,4 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="dev">Turn on development settings.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/path/path-0.7.0.ebuild b/dev-haskell/path/path-0.9.2.ebuild
index c53f870c9dda..71683620a480 100644
--- a/dev-haskell/path/path-0.7.0.ebuild
+++ b/dev-haskell/path/path-0.9.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.3
-#hackport: flags: -validity,-dev
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -validity
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,18 +15,18 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="dev"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
 	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
+	>=dev-lang/ghc-8.6.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( >=dev-haskell/genvalidity-0.8
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/genvalidity-1.0
 		>=dev-haskell/genvalidity-hspec-0.7
 		>=dev-haskell/genvalidity-property-0.4
 		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
@@ -37,6 +37,6 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
-		--flag=-dev \
+		$(cabal_flag dev dev) \
 		--flag=-validity
 }
diff --git a/dev-haskell/patience/Manifest b/dev-haskell/patience/Manifest
index 6d58be7e50ca..00f1146fc714 100644
--- a/dev-haskell/patience/Manifest
+++ b/dev-haskell/patience/Manifest
@@ -1,4 +1,4 @@
 AUX patience-0.1.1-ghc-8.6.patch 914 BLAKE2B 840b9f375e4bc1725be57e55d2a7a6e27c8e075758d924597a34ffc80ab6c0a6f706cbb2247c063983c282451a4ff0832aca00b03a795d38898a38ffd03f3dc2 SHA512 d6a4bc0eb4abdbe8313d334ce5b60e18bf1b2d74aecc72147dcda53f6e724d2fe29d07a70c026f24614c36ab6d9132dcd6ae9ee44b5f2b04b6b317cb3121c47c
 DIST patience-0.1.1.tar.gz 4610 BLAKE2B 6ce8e959dec8493990f66c9cb7b5dc8aaef6cb4edc3207f19156ba527fd993112a29a9d39241a39c2d9c4af600cebdfd31f02833779ce6cbf74e14ce6305273a SHA512 dac94580d9b82023841b5406509f8cd0e58148756e4259708c21b78b480fb4fb67b21a82c81e702275f49d90bcd1d2b46d20bb96267131d4ff57334f110e14f7
-EBUILD patience-0.1.1-r1.ebuild 600 BLAKE2B 5d15979564563d7d9ecc8ccad4965a009fd1332c8fa41aeb7c981a815912d1e3e1bace62245aba952081a15a676c77419ffd00b1f7d4a600e1a557a10601c1c4 SHA512 b7309fede3fd11f32035294501613344d97e2d7f6d56c8c941d1f3c9f98e111d5721dc4b903f383655da0cc2834cc36a21e627c85c2f423632d28efc4906e10c
+EBUILD patience-0.1.1-r1.ebuild 607 BLAKE2B f6a088535d4de3c7e20d716b9a6728a8c3035f6462ebf5279cc108bc9b09ceca5b6b9b32cc70238a6113dca1eadc5ec3d99f04e1a50c211966c922c59242e12d SHA512 6196892eac5acc0f3ca30786f7ffa972e8340eac6404ab73c9c41020b71fd44823c20692b988e1fe779edf3b28032d1d1a4517f7984ae3a088bd4fdb3cb32a1f
 MISC metadata.xml 888 BLAKE2B 8cdf46571a418dba41121b8582c41a200bab37e1c50c8d81e49421402c902ec8e08194b95a65f47affe52861c57df0186a2f49e0624ef8b72e8f167ff54bccaa SHA512 dc44811ac8a3c8c774756cc91415eef10fef3221b39e88ea01669d160069b46d8c5a108436183a674ec9f0a7fcd0ddc200c960404ecaffb4105911d8b0aa078d
diff --git a/dev-haskell/patience/patience-0.1.1-r1.ebuild b/dev-haskell/patience/patience-0.1.1-r1.ebuild
index 3d1dfa9cc9eb..17aa01def1af 100644
--- a/dev-haskell/patience/patience-0.1.1-r1.ebuild
+++ b/dev-haskell/patience/patience-0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/persistent-sqlite/Manifest b/dev-haskell/persistent-sqlite/Manifest
index c8094ef86e42..09e135ffcab2 100644
--- a/dev-haskell/persistent-sqlite/Manifest
+++ b/dev-haskell/persistent-sqlite/Manifest
@@ -1,3 +1,3 @@
-DIST persistent-sqlite-2.10.6.2.tar.gz 2220390 BLAKE2B f146ec84ae45d0d4b4cb3c809bf694182c8592369e222029824f6eb6a39abbbb67acc6bdd2af4a9b8080d50ffcdc20968fa14cac237a475b220dcefe3329fc2d SHA512 b1db41bf77ae53b99c28f3224c9a2b7335faa4a78c96487270249959cc9491fa542e28d38dd63a2b417580f6a41608ffcee152e8609fe16392005c728862c7bc
-EBUILD persistent-sqlite-2.10.6.2.ebuild 1799 BLAKE2B ba520b1d5bef896e45ce4380d469433e320c972b0e51549cd95a1d3907d3a2a2bfb1c0de138e9dec6e5b7b11ddb3ef9a14fdff0cd8af740fabb44cae4a1d7f4c SHA512 7ed477b7b4339d445bc4fa444edc93b79183a933710f7231811ecb13d76b098bd6c9d785f6ab7da27a8b518cf3b1d228c2088f270919ffd60665a5e2b20563d1
+DIST persistent-sqlite-2.13.1.0.tar.gz 2276809 BLAKE2B acc9f4b0e351313486e89f695b69756ea165146fd8aaafcc2d3da8dc620c109cee8d922fe0246e688691748c18e75fa64f9f4a992ca2cd28e01677766d56326b SHA512 19842dcd867f57ac2f81d8651838f41f6a4f0074293c0b3a21a52d2fb96410c26d5340307983da21ca89170a01621da257320e36f33170657acb6890f70299d4
+EBUILD persistent-sqlite-2.13.1.0.ebuild 1664 BLAKE2B 25d6cbefd69eac6bb53e2fdb3691df5cf9ece458f62e9b9fd7200301294dffc016f6ef89c8ab7815d8554dd6bdca1799996ff49eb31e9ed31828c2f3210f98eb SHA512 e564b8300e76f9e411b9efc102e01735d5c5f179a8ea17990e50de2d7ef70bf4340efeb55a923a02eaa2da9c175f4410dac692c6cc62659878bcacdaaf3180f6
 MISC metadata.xml 534 BLAKE2B b3b926fcb5bb5d97b2b762fac6bb6dd7779afec31d226a8ce9e9115adb2f26cc1e1983c595075bd55764ebb3fcbed92167655053cd2248f541793d51f57ea3bc SHA512 b91823e3007d52d28050fa7c4267ed36467aeb4231c9512e6e39e83e16de4ffcf9899ead3229019910167a0f288202c07a63fabb1be4f6ac490029bcbd9b7921
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild
index d00865d77b15..a6074951786a 100644
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild
@@ -1,44 +1,42 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1,-use-pkgconfig
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Backend for the persistent library using sqlite3"
 HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="build-sanity-exe"
 
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+RDEPEND=">=dev-db/sqlite-3.0
+	>=dev-haskell/aeson-1.0:=[profile?]
 	>=dev-haskell/conduit-1.2.12:=[profile?]
 	>=dev-haskell/microlens-th-0.4.1.1:=[profile?]
 	>=dev-haskell/monad-logger-0.3.25:=[profile?]
-	>=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	>=dev-haskell/persistent-2.13.3:=[profile?] <dev-haskell/persistent-3:=[profile?]
 	dev-haskell/resource-pool:=[profile?]
 	>=dev-haskell/resourcet-1.1.9:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
 	dev-haskell/unliftio-core:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	>=dev-lang/ghc-8.4.3:=
 	virtual/libc
-	>=dev-db/sqlite-3.0
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( dev-haskell/exceptions
 		dev-haskell/fast-logger
 		>=dev-haskell/hspec-2.4
 		dev-haskell/hunit
-		dev-haskell/persistent-template
+		dev-haskell/microlens
 		dev-haskell/persistent-test
 		dev-haskell/quickcheck
 		dev-haskell/system-fileio
@@ -47,7 +45,6 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
-	# most flags disabled since they have no effect when system-sqlite is used.
 	haskell-cabal_src_configure \
 		$(cabal_flag build-sanity-exe build-sanity-exe) \
 		--flag=-full-text-search \
@@ -55,6 +52,7 @@ src_configure() {
 		--flag=-json1 \
 		--flag=systemlib \
 		--flag=-uri-filenames \
+		--flag=-use-pkgconfig \
 		--flag=-use-stat3 \
 		--flag=-use-stat4
 }
diff --git a/dev-haskell/persistent-template/Manifest b/dev-haskell/persistent-template/Manifest
index 304fbe27c6b4..096785cb1724 100644
--- a/dev-haskell/persistent-template/Manifest
+++ b/dev-haskell/persistent-template/Manifest
@@ -1,3 +1,3 @@
 DIST persistent-template-2.12.0.0.tar.gz 4506 BLAKE2B 1246629206981e4631a48055d23ab2f2a5851e7c200c0c809117217d3531d1b7ccc36cb27cb79ab33abef14f298ea80e2ccee9e4c115d362b132e0bf980f4c34 SHA512 5098c88f92d5e8609de62f6571d8c7f1b2f08d0286974f1ba5eabc01e3479b48a2ae1a0e85e54f1e9956902189142c5d04a4b314a1945341f4e76828959405a7
-EBUILD persistent-template-2.12.0.0.ebuild 552 BLAKE2B 83af8fed88e4ef2acd5adfed90a3f2c92375462e2eee18c49ea6fc223a83ac2b1bf6081c287b8fd03093404598effc1eb276ca2a403ba9ccb54161a7a142ca00 SHA512 4a4477d26c8b29d951373dce9fee4e403505edfe9c4e0023fff055b96bac01280d94eca7e79eab127fc498a5b5526a2fcf160fc6a4d0545942453746e0f912d7
+EBUILD persistent-template-2.12.0.0.ebuild 559 BLAKE2B 8a9216b7980425a1dbb84b94b2309ab7462508e96df178430be67d343204bb3d9232faa50ad8d3e167ad4a6c30659127948d15435446b839d83788979e22ee1b SHA512 12b0ed22f327f7be03059f9f978dc65714e876cf52f3546501ed09d3049e86840d0ea199371ab17698170d6aa88898a23fc074026d504b45f83ac11a3da0935b
 MISC metadata.xml 424 BLAKE2B e77c029b89770cc4dd6187538a0ae39f7442e8a94c6b7ac3f5f97a7609539d2f075bcc41268173706c49e76e1b52459b42b586e2578542a2d5d53744cfe5b6bd SHA512 321a2ef9f9834b1c5f488d2cb16847b642c85c3a548553557f31206e3db470af5f438b9f508f0345e13fc0e8bbb61e3faf9bb53af278e069b61e81cde5ccb369
diff --git a/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild b/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
index 39533f112d60..854030b0188a 100644
--- a/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
+++ b/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/persistent-test/Manifest b/dev-haskell/persistent-test/Manifest
index a7f41262a9dd..99f160dcdfdd 100644
--- a/dev-haskell/persistent-test/Manifest
+++ b/dev-haskell/persistent-test/Manifest
@@ -1,3 +1,3 @@
 DIST persistent-test-2.13.1.3.tar.gz 32262 BLAKE2B 77bfae47292edd08cec0504d4006f44f349ba6fef2d670833d5f2c339bbe75f5d5e5afe924793d2f4ae9afb57f018d1e32a11b2cdecfe5c451f5aaa94897dbcf SHA512 906df4039bbd6e054cbcc18b300ea293814b7365c6267348a88abc9902cd30d60bd314b42331a1341befe787f566bca311ca7fb398594ae56cbc2e764d5a8ba2
-EBUILD persistent-test-2.13.1.3.ebuild 1281 BLAKE2B 9157086572ca9ae8c360334c99722477f0e510a09972506fe87c074d38a96ffd62b61fff34c3fe575622a516bc9cb57829eaab1acc05a72b1c4584d439af7214 SHA512 408a706774846292170f7e89adcaf3aec3a4941c9df639818269adf52825a3169f27399f68e6d8554b580f9c783097296fab38127b89f1fd5e24c95e4ceb80ba
+EBUILD persistent-test-2.13.1.3.ebuild 1288 BLAKE2B ebd3b482eb1974dd946002e797567ae04383d4395952c86ae98766e7a9a0dfd266f6e9bf9556c1937696de50dec30965e79782219e2b7de7dc72eebdb7c132cb SHA512 1a2d4acb1217a77664a325223f4d8a60a31e6315cd7f5834821f89703729b5e2d040e678e42bc2cfcd1639bf8d53a5f924bf55a979cd1e080792ba2d28a373ce
 MISC metadata.xml 468 BLAKE2B e29b0252566a2d9f69a25176760331dba848c675da846b9edea632b5f25763fafa76b879fd2eb5f8b07c11789670296a6c4cb0ee089091cd3fe5bd192f0e5ffb SHA512 f6a98cd3fc90ef4683a73932607143ce0e303031b2d29a3527b720ecf5f9610cdaf2a77302903efa5ec69a1fa3691f978fe007c3797540efe4c660a6d3466cbc
diff --git a/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
index 56f47876d066..c0a47b6c2bbe 100644
--- a/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
+++ b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.yesodweb.com/book/persistent"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
 	>=dev-haskell/blaze-html-0.9:=[profile?]
diff --git a/dev-haskell/persistent/Manifest b/dev-haskell/persistent/Manifest
index 14a32f5ba0f0..13029f6cd33d 100644
--- a/dev-haskell/persistent/Manifest
+++ b/dev-haskell/persistent/Manifest
@@ -1,3 +1,3 @@
 DIST persistent-2.14.0.3.tar.gz 171536 BLAKE2B 2659ebf0acd64a4dde77f8d17f0081676a4215093eaace2f847d8aa7bff736535ca15fe0a7b023a4ec145f4091fa4f3ae9b9dc3b8a77086b44d61d6968ad006b SHA512 63256b0a4e32f5b229e4924f787db3ffa18f40b4101c4610ea51311d6f0b5ac295abfea632bc8cf095de858f19bfe0649c2d2c07289e50ac845e6c945ac172ba
-EBUILD persistent-2.14.0.3.ebuild 1664 BLAKE2B 41b0544cd1d984a60d8c6bfe843515e2709dffb18bbcc27cc88f77225a98c677ea890ac70b762db256a986118d46def9a6cf6410950a9d862d0bc3e2e5843117 SHA512 2a323e786644cd128beeb9755f4cf8bda9790a3a6ebebf0ff56580b38e5e8fedbf0ec467fc0bb146f6c288f2c0d5b1e8ec2db298c36af8f7ed2c0d5b9b6f73cf
+EBUILD persistent-2.14.0.3.ebuild 1671 BLAKE2B b6872c439ddd35787e253cb478bca6f56723cfacc5d31491a0059952a6e131ff928d1731d093d31a4df100ff694553a6b49a3464915f6061a6b0bb9e6e8adbbd SHA512 97cf650527283a578479c2f1c4cae99c00a9618a6f7a16f108b2638c98116f2ac750d0bb7b2f6bfa16d6a62bc45dabdb357507ee9c6bac9321831f9628e75fdc
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/persistent/persistent-2.14.0.3.ebuild b/dev-haskell/persistent/persistent-2.14.0.3.ebuild
index 0474df092964..26abbefcc085 100644
--- a/dev-haskell/persistent/persistent-2.14.0.3.ebuild
+++ b/dev-haskell/persistent/persistent-2.14.0.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.yesodweb.com/book/persistent"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
 	dev-haskell/attoparsec:=[profile?]
diff --git a/dev-haskell/pointed/Manifest b/dev-haskell/pointed/Manifest
index 438b7cf5b2da..8989023c8e90 100644
--- a/dev-haskell/pointed/Manifest
+++ b/dev-haskell/pointed/Manifest
@@ -1,3 +1,4 @@
-DIST pointed-5.0.2.tar.gz 7236 BLAKE2B 573a771f30b170cd1c394faa3ae5115b648c0c140bfb3253c0ecd790109c2a860ec1c2374ea2e55e76bbf2362c737f7725fee8dafc255e20d8bfc8f6411d297a SHA512 dc1c60108cf13f089c66511c6cc6cc695de3614fcaa93be54f9b71eb2ed07d4b3b8d9a550e9ba4d73322445eda36679d7abc554ec807755a2e13722cc68627e0
-EBUILD pointed-5.0.2.ebuild 2045 BLAKE2B ea4f8711a2dd1c43cf9b9885182e46a308f461b27a5231af9d3f8a5b76c0ce67805d2c2e970e70e90cc8495eeaedd8eb9050ec9fb596063fc55ca51f9a2b6c25 SHA512 2c930591f3d739be5903ce8c116b5bcba422d1095d39be6df1b0850b1e9e1f705ea4e78d4cb805b53bf1ca6117d65804fcc4498b391e9b2dda494dae3173bc49
-MISC metadata.xml 817 BLAKE2B 66724e4e1b15f63010db5089499fa3c7b406bfb44582e53e6d516ec8dc23d5b09fa76fdf16b3bea8aae9959ba827ec9974d0cfea540ac5b0d9ae1db2f95e6547 SHA512 b2011445bb4a3f4f8315031e5a5bd6478eeffc2e255d7af99734d9019e8f5f29b386304ea1f1b9634f125546d2fcf64a5cf9dab2e518279cf1236e889849a527
+DIST pointed-5.0.3.cabal 3343 BLAKE2B 9920fe549ab82e1903b998853400ac5e7f316f18fe725838df5c0d0bf17616e5e2bd19647aef8efaec6f3c7a225458eee3dd45c2822679c602ab5312cd5f3c72 SHA512 91d7218999ad94b132e3af1a8f844856ee403d6a08805d707ebc59c8466229aca2dffa7c18f06746cd221e55eed5382be8c0b9a8df0f6d9cb79bf8719f65828d
+DIST pointed-5.0.3.tar.gz 5128 BLAKE2B 83389eeb4a9de7ef707aab35eea847b75970ccc9b223963b4e0cc8fc3a6806cc9e97383a672b757b2c97f8e2cc66595b300870c4b99b55fb4ad8eeff7b9ad58e SHA512 e68375506d08002c5f0a76c24a40bdc7b28fea0e447f213c441bc22571846c3685a4833f19e224406f975236fd0bbaacecf6ea0ec1ec056254863f2b65aecbaa
+EBUILD pointed-5.0.3.ebuild 2424 BLAKE2B d850e99ed8409e83646b37d55d8ee5347436b83cc4ba019a4f4e1d455afbc26ef536efb5b5b97fca0ee352b658d626a6424d12ad8d14a11d95a53641b3154b06 SHA512 527b0581c93551b50349f144c804a51a4f2ec104226077b3009ce067a739cff9d8c82b64e90f48474d6a732f756d23984b8eef3286d90693e925bbc47c3eaa5b
+MISC metadata.xml 1149 BLAKE2B 352659d889259ca1499ba68794ceaf8a7a6e46d29716317785d079389deaaaa6023e25efb775665c832b0b7f31909ae9cc75156794444a20a5e774b2051cad0a SHA512 d71e91bc268e9c80bb444decb53d48444d22df14836091ebeaa3171bc5cfd59d2f5eb8d4301ee98164e08adabb3d4a372d37d16ee033487097fd11b1cb7e25c8
diff --git a/dev-haskell/pointed/metadata.xml b/dev-haskell/pointed/metadata.xml
index 7bf780270265..b9c5626a0df2 100644
--- a/dev-haskell/pointed/metadata.xml
+++ b/dev-haskell/pointed/metadata.xml
@@ -6,17 +6,13 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="comonad">optional instances</flag>
-		<flag name="containers">optional instances</flag>
-		<flag name="kan-extensions">optional instances</flag>
-		<flag name="semigroupoids">optional instances</flag>
-		<flag name="semigroups">optional instances</flag>
-		<flag name="stm">optional instances</flag>
-		<flag name="tagged">optional instances</flag>
-		<flag name="transformers">optional instances</flag>
-		<flag name="unordered-containers">optional instances</flag>
+		<flag name="comonad">You can disable the use of the `comonad` package using `-f-transformers`.</flag>
+		<flag name="kan-extensions">You can disable the use of the `kan-extensions` package using `-f-kan-extensions`.</flag>
+		<flag name="semigroupoids">You can disable the use of the `semigroupoids` package using `-f-semigroupoids`.</flag>
+		<flag name="semigroups">You can disable the use of the `semigroups` package using `-f-semigroups`.</flag>
+		<flag name="stm">You can disable the use of the `stm` package using `-f-stm`.</flag>
+		<flag name="tagged">You can disable the use of the `tagged` package using `-f-tagged`.</flag>
+		<flag name="transformers">You can disable the use of the `transformers` package using `-f-transformers`.</flag>
+		<flag name="unordered-containers">You can disable the use of the `unordered-containers` package using `-f-unordered-containers`.</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">ekmett/pointed</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pointed/pointed-5.0.2.ebuild b/dev-haskell/pointed/pointed-5.0.3.ebuild
index 116cf93a1b1d..486b00d68242 100644
--- a/dev-haskell/pointed/pointed-5.0.2.ebuild
+++ b/dev-haskell/pointed/pointed-5.0.3.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +containers
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Pointed and copointed data"
 HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HACKAGE_REV="1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+comonad +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers"
 
 RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 	comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] )
 	kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] )
 	semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] )
@@ -26,17 +29,17 @@ RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-de
 	stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] )
 	tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
 	transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
 				>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
+		--flag=containers \
 		$(cabal_flag kan-extensions kan-extensions) \
 		$(cabal_flag semigroupoids semigroupoids) \
 		$(cabal_flag semigroups semigroups) \
@@ -45,3 +48,15 @@ src_configure() {
 		$(cabal_flag transformers transformers) \
 		$(cabal_flag unordered-containers unordered-containers)
 }
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/pretty-hex/Manifest b/dev-haskell/pretty-hex/Manifest
index 8334430a91a1..ca78afef7f3c 100644
--- a/dev-haskell/pretty-hex/Manifest
+++ b/dev-haskell/pretty-hex/Manifest
@@ -1,3 +1,3 @@
 DIST pretty-hex-1.0.tar.gz 2950 BLAKE2B 7fd2049eb42e4e596a54207820d66874620554e72d8f3dae48f5f42b7be089e2b9fe9c9e318a5b13fa4448630a54a7aab3eff593882e6e8df1ed2466a502f35e SHA512 a5ffdecf56b586a23b1243bcace040c7043cc67ced07c5f94d459a2e6a00cade98c70e1480be763ef75946d2aedf87e00d2b653a6f8f23d21cd8e9ab198ea45d
-EBUILD pretty-hex-1.0.ebuild 546 BLAKE2B 0186de2dbae3b7df83f2477755e66f6b9fb167b84bb8617f871d9b7676bc2504d2cf9847aad8e0dd5a303acd8211eabe3dd536ece11da0e03eeb59de272583f8 SHA512 6776684e70866fea081f321723421a4631d9e48d9650389d6a4660c1c21e5398a49556e7fa2356616c2335ff55cfafeac91053b5f1cface7476263f6105bb8b7
+EBUILD pretty-hex-1.0.ebuild 553 BLAKE2B b98a446ef4af0f54f53d6539dbfe82ea89947f06ad6956a6b5542b613d18c8682bac6ee8458b5feb641eaded684e4abcb094c8ad9cfc5662eb873442387c21de SHA512 3544de7d1f42c4f0d5904b79a4f6c28c00af67866c0ab88575acae1806b86de315eda15d779ebf5ff33ff7f5ac7957ab30c090da8de102fac30777e944931d20
 MISC metadata.xml 398 BLAKE2B e7ea1c0493b5d40631edf9cef501019395707bf5367c5fb9672768a0140f28031b8aab7895feb68a76072d9288704f69261ead5668dc65f61eb3e1001b9b0e77 SHA512 2936f8b042377073c144e30421eb0a7fc0f6538e58e7f04fcb73be2946cc1e242f1fc9d4fef4599c5d013bf126cac605a4462d30b6405acf33d67be8da129da0
diff --git a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
index ae36f580a847..e71c85163515 100644
--- a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
+++ b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/profunctors/Manifest b/dev-haskell/profunctors/Manifest
index c2e8c46cf33e..1ca7a588706f 100644
--- a/dev-haskell/profunctors/Manifest
+++ b/dev-haskell/profunctors/Manifest
@@ -1,5 +1,3 @@
-DIST profunctors-5.5.1.tar.gz 29825 BLAKE2B 6a2fb21790e7ad7edc1cced8fb14cd02dab080ad832926edbd81a1aaf95c3aa9590c8c6b6216265103d1be9977ed64bbefe49000d1fa350d26af29a850c98333 SHA512 6f2b3cfe7ab629dd224319eef020bf92068a0b6b66019ab11dacb0e3540a2581605849037a9f2c0e1bca4330a4bce63266c9378cdb1bd612cdce52e7dae53481
 DIST profunctors-5.6.2.tar.gz 28522 BLAKE2B 812692b257caf7443ff03bf0e9268df8b4b7cd6af4ce95addb7bba6a2fa198b52a98121f63847a4402719a50c95535f379a111f4e943aa9937840920466a04b5 SHA512 ddf33426fdf52dbe0ffea5c9124e1d35b79696564b8e88bcd7a015b8361634566e5d35135cee69c6dc2fa2bbb870d9f624710f98e122078f7f3a82bbdacad690
-EBUILD profunctors-5.5.1.ebuild 1102 BLAKE2B 8f2830db8478127e6afb3221cabb9cf5f08eb908e63dc94690343e7e7259ce47cb923e298506b70eeb9dee663ef6b65fe1c9ffb74a470f28ad4a2cd768f66927 SHA512 6654b1377d9d6326454bb0d2b630c1742c6d3befcf15a0a504c1896b182e9958958deca6b28be24f406a9260f39b99e4721f1dcd5a43df50be9187272adf619f
 EBUILD profunctors-5.6.2.ebuild 1050 BLAKE2B 3e0efdf64bb09d1b2e3501aee9b41609607c51890465465b068ced8913f7dd5fa8de38ffd1458697055b36afc2abddc264cf647a070330bad78cdf14e857a291 SHA512 79761233e90de1bc07eeafd18239cf64e7bc320a0d0581118e4ca90e27e470f013e7ed41a3f8b8cc8c38fc9e92745fe20e3252ab9cf41177c79e2e1df18e2a23
 MISC metadata.xml 333 BLAKE2B 893a6c9adc8815118c7f649a35514d857c85de868dcdc0a409c63e4878ff29b7e0aee51238532033d780ed27afc881e856fcdde6fa56bb71768c55a98b1e28b9 SHA512 56ce3df90ca39b1ada2abb019022383a7d42a9c59daa3ca3ffc3695edcefc4abe56e704ad54b7cf1c0b0e9942dd316628290f5750c78d58261bb2a8d456d5a09
diff --git a/dev-haskell/profunctors/profunctors-5.5.1.ebuild b/dev-haskell/profunctors/profunctors-5.5.1.ebuild
deleted file mode 100644
index af45db76dac3..000000000000
--- a/dev-haskell/profunctors/profunctors-5.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 profunctors package"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/psqueues/Manifest b/dev-haskell/psqueues/Manifest
index e6dc77993c35..6d165d45dfaa 100644
--- a/dev-haskell/psqueues/Manifest
+++ b/dev-haskell/psqueues/Manifest
@@ -1,5 +1,3 @@
-DIST psqueues-0.2.7.2.tar.gz 27455 BLAKE2B b9d69b445173c4b8972e3f4a0a601c2e1c9d96c02b4426c5fbdba7220274ddd4c45138bfe94b23744b99cc0b538d114fb045095c1e9d2cf1d7e1f3295466662c SHA512 cc70bc22568d24b8618d43be7a2261ab7b55005e7e68a49a4d09b323e03954c05fe8d4de2c344760cdfef26b04bc6937bc331f7e310e1bc9b6b512068eed3be3
 DIST psqueues-0.2.7.3.tar.gz 27328 BLAKE2B f237482c54cdbe7bdd69c119bca0ff159efa3a242e06bb503a62ae453a1445cd1c6216aa426fd7ae752f88c77e26401516b06f5a9b30a99e548b8a48dbeb1bf2 SHA512 7a089a68f8b99f93780cc05e1b3454c266077f47a453f139bbe368cdca889e8b7098aa2770c86fcb32eddcb15837a7d60c70da946ad5a234a72bf01fff017fff
-EBUILD psqueues-0.2.7.2.ebuild 948 BLAKE2B 4c12fd1438d7e2ca94cbb9aad9d3950154939d3b64a619a4099db6d35edccc6a6943853a8d12c4c0c41856814cb0fc2e93b104467029ec7dca2204300c0e8d22 SHA512 54595fd465044b8c5d3854754434146d3fb30b5990373ab97e5e24f14827b4d3f4f35808e4cc7da11ecc9e9172e3a3f1c7bc8eeafa93a2c1f86325a205b7836d
 EBUILD psqueues-0.2.7.3.ebuild 951 BLAKE2B eddb1f0201fad7a88f396f1c6cefaa10741031b43c0d7af92822e0673b67c63ae89dd05330a50bc33ebd2ebc613d2d2b676c2dc0a7a77e790bac8c1150bae3cc SHA512 1017fa63cd24ccf391f8923f8c56e90cd552866f3c025fda2536ebdfd227c7e724886b3d42535199cc81052c4a93dd80441a918d272cf799e90220c25e938838
 MISC metadata.xml 2190 BLAKE2B 862870227ebd1746114441cdd93ce1c7a1398371564e14bbbf89b0cabe6f52fdff579bb650460687f2dbcec7b92ee6873214737890ca3fa004aa70df4f40e874 SHA512 c0c523cfa34cf1c9a47eaff068d225bd602fe138626a4ff85ad0f1cf246ea9bf76e482b11ccf6668d1a6aad0ff06380efef23d5c0d939b7b0c24ddbafba08144
diff --git a/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild b/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
deleted file mode 100644
index 0b189c2996d5..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="https://hackage.haskell.org/package/psqueues"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14
-		dev-haskell/tagged
-		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/puremd5/Manifest b/dev-haskell/puremd5/Manifest
index 7a8145dc2233..efd6eb80c534 100644
--- a/dev-haskell/puremd5/Manifest
+++ b/dev-haskell/puremd5/Manifest
@@ -1,3 +1,3 @@
 DIST pureMD5-2.1.3.tar.gz 6719 BLAKE2B 7b315ee2d475e3c4d393bf02615162f04481c266af5a0d165bc1808cb446248cbae02c5b9b40e69b8027490201a92c39f8882634f3291e606e90136659a0b4a1 SHA512 4be26ab8383bc51aaefb2e22cd758945eab00d1ca9612fc0a1b6ba1a581ea7dca55580f50c11dd60c72aeb1f3c418c73c52df34a1be168d878602540394201dc
-EBUILD puremd5-2.1.3.ebuild 1071 BLAKE2B c8fb6cfe893cbb58c3e11a85cb09a71c0e08cfcecb0fad0344f1dc5e8340cfa622e2fa19de181d52d5c07dade4cdfa3f7b94287785f27148a9e812ff3605087a SHA512 7fa71422863a053e3ebe915bf6265977ec4cdc390aa0e34040279466c11008788335c8f9ec823bed441e7ec0048bf99943a056cb7f97f4fab5e2f034206b97ea
+EBUILD puremd5-2.1.3.ebuild 1078 BLAKE2B 5f0779e865f61fee5719bb1181463b7d6954ec5cf443e60fd557105c96043c7fa1e5b40b65036b6c6981e885a621fbf1bc0a71ae934b8ae3add4eec096451110 SHA512 d1e3f4bf4940655c2788b51995f1e7baacbd95fa8863e2ff0a11b36926d7fee9e9f86a6ff8973aa0694860c33f1bb4fd7b0cb1da468573ea3907f90c03b16e92
 MISC metadata.xml 410 BLAKE2B e94d8dfc9db5b237615760f6a097287bd298c7a1aa7fb5c3d32d5e0dea87381747d801ae411da8a85f36dd7bf3f67767d10b6ca334715f6832b26078a6b20645 SHA512 ee8f22b37ab9335e5383cc61d1c0edd66005c9643d4eb5ea99c3cde1ef06c5a72954619ce4d8505773840337921339692033b2aa18dfef6452ad60e6093382db
diff --git a/dev-haskell/puremd5/puremd5-2.1.3.ebuild b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
index ad628660c2cc..b82f654522c8 100644
--- a/dev-haskell/puremd5/puremd5-2.1.3.ebuild
+++ b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/quickcheck-instances/Manifest b/dev-haskell/quickcheck-instances/Manifest
index a9acacd39d7e..d9fbfe424680 100644
--- a/dev-haskell/quickcheck-instances/Manifest
+++ b/dev-haskell/quickcheck-instances/Manifest
@@ -1,6 +1,4 @@
-DIST quickcheck-instances-0.3.22.tar.gz 9939 BLAKE2B 329117de28253bd6319b84a7e51c6428b90fed4ca4f49c7bb127ed1676d2438ce682a80fb819d60df300d6b56c005a9dd424e3b9d7c858119cb0e871d19c06f1 SHA512 cd36e6833752fbc5501a4fe8459381fe3c07f73b706a438effee06bd1b5e17ecb12b1347fdacb65556e339de58ca8ac32480dc1339cb43b1416c4aeb4f714f8c
 DIST quickcheck-instances-0.3.27.cabal 4710 BLAKE2B 591e79f2435e7ae7d7f179b8b7f4cda7fd1f96cfdbf573e48e17393e2f2d47a44b0e86745128fb5be396d5736bf8ce7d70eeee3f735409f5e5697e412cdbceb6 SHA512 653e5b249d0138db38df962fc061c2df089de8ba43f2a13d2dc47282e35b9221844af8beb9d01bdb474e99e9736464b929a27c35a12fcbbc6a6ab3359cd78586
 DIST quickcheck-instances-0.3.27.tar.gz 12711 BLAKE2B f3424d88d4a41924a156bf00490f34b2094bde7d0bfadf375dc0316b89a4774d84fe45a7a964f64f5953deb10a6132e2cd745f67bfb6b10f991a5490d23bc433 SHA512 be2b7525a1433b3cd038b5bcc55c01cc1a9ab2fa02fb89b4cf0d3c4748b6ee4a384b0ff101727a30c6f788a2da72adf87a8c97a36a57ce626f9269e1464f3a90
-EBUILD quickcheck-instances-0.3.22.ebuild 2110 BLAKE2B 2105437e84db6c6cc7281dba467ea6d67496263bc5dfe7e7f8f4196ed5a13a6c6f2d85b3ef87e9ec6cb5158958d1e67ba3392f56042618dc7409168b26052436 SHA512 0406cd5a2ae210c807ddcb1134e031abee4ecc77c1731c97065738c175131a10583d28add97076bc07979ed36bc953e0c19e5bc618fdb3ce9bf1498939ebaa3b
 EBUILD quickcheck-instances-0.3.27.ebuild 2480 BLAKE2B c68ee70a5c6ca92c0e9d5bcabe94fb1a36c782ade34d8fe7aea78d22161f584fb18c951743ce8ee231115c8b14aacc4c665295c1c61b72560cd626785aa984c5 SHA512 dce85b3fa377e021e4f61556f3a5e9deb3a14c1bce2eec0f3f395b953e443bae8f8f5b1fe28374c3098ee97a3ac3767a9a6f1200fedcfd1e4634e4de0a5ab475
 MISC metadata.xml 840 BLAKE2B 703b3bf88b55b2c7a8df392029835a8ad6623d1d38b32fd60a4e17881dae3ed26cdaebe6b9ab6606e21c8a801043b6cdedea27a86387f678bd6ab7baa23de1aa SHA512 9859d4813143d8d0929c9e36523f3b1d9b27596bcc7463967d848e1372b22b5693f615403572751bc30e3f858e5defe5536a287b747d6ad25551f2d411672c85
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
deleted file mode 100644
index 57aaeb77b538..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/phadej/qc-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.9.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/hashable-1.2.5.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/quickcheck-2.13.2:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
-	>=dev-haskell/scientific-0.2.0.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.1:=[profile?]
-	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >=4.5    && <4.13' 'base       >=4.5' \
-		'base-compat          >=0.9.3   && <0.11' 'base-compat          >=0.9.3'
-}
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index be1749b2cab4..47dde3ca3179 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -1,5 +1,3 @@
-DIST QuickCheck-2.13.2.tar.gz 70427 BLAKE2B a2676dfd98f8aafa2ccc2e0dbe32d23d70d811e940ec8f6ae7e85b65feef07094d8edd66548961b6217b05eba30e19b6a76eed3b15cdd0293591d97252c9662a SHA512 d2c92caec8bdf9089483b1f256f17f3d50e066f57eddb630f1831a232c4e33a0d4f55a0f927aa433cd3379283fa2615fd2937941e6847b234ea00b0fbeb46b98
 DIST QuickCheck-2.14.2.tar.gz 75246 BLAKE2B a64ad51f3daa858a224c00fb785979460b638d76f20c7a19d95a6303cd5da61adaa40cb52e154dd15218adbf54fff184f16ab3b932895294cf37f24982a2b9cc SHA512 84decd354e6093bc72afd125410499dd4be3ae8fdbf0a3b466011b4dbcb5c5657e51ab75cfe22790e22bf4ac54cbb1203ff7a0d108e872ce60f4831be827a6e5
-EBUILD quickcheck-2.13.2.ebuild 976 BLAKE2B 9a1ba164938a6fe803df96e5b2774dff9f745b222adb9416659c9356aad22d4ca66ca1c3b4e80f20d304e1fa58f518614f5c0811c3d26de2cf225fcc42b59b0b SHA512 aa7f31eca0764df583df869823f8573d3674c96b8674b02ac7b63f33dc186108eb22b283ff4710e2b1f65bdab03e2826b55e393de262fc0fe265a4394682a9c5
 EBUILD quickcheck-2.14.2.ebuild 1065 BLAKE2B b5b4c84d557f47af36016d2029b0bf1945da9b6528edf8284685f5846ddc80fba39f262e0459768e709c959f4ad6b0fdbaf289b48f5a937d63e8154c8c8848a7 SHA512 c31e8ecded22f65fef707f12b5bd112e9b2649d639b73289bede0e7fac9ca19c822357d612e46d3454c7c3c5b2007460af108547c268d6000ce0d08f1487ef8c
 MISC metadata.xml 1018 BLAKE2B 150043cf9790a8b54ae89b3c26cbda8e02619ce2f509e2a6e3fc3a140b98591cd1059eb088a8d7a5866dc3513fff709315ffdd1370b6fc9f39eef23c071eba83 SHA512 4c7cd76682bfacb0b0193900b5ad61f20b812ab2cff14279d21991221872b56cccb9e840ce0f9b85883a485cc7011d401f95af3a5f07915079d3cf649ce9ea37
diff --git a/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
deleted file mode 100644
index b22abf4396ab..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: +base4,-base3,templatehaskell:template-haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/splitmix-0.0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template-haskell templatehaskell)
-}
diff --git a/dev-haskell/readable/Manifest b/dev-haskell/readable/Manifest
index 9a202e73fd7b..778af765633b 100644
--- a/dev-haskell/readable/Manifest
+++ b/dev-haskell/readable/Manifest
@@ -1,3 +1,3 @@
 DIST readable-0.3.1.tar.gz 2907 BLAKE2B af3dab05bb8eba05bca049cb8991e3b46c38e8a4bab73f81c4c2fd4fb62f9e4134071eac0f69d4354be6b02df70ddfe1bd2a7bf59407434ba265371d0006c979 SHA512 237467c4b6dfef9fe090c53e45a1f4261e34fc947b16878575c2b1d2b93400a67678bfde3ad8500f82c56a4b87c5b45e561304c9936572a033d7b295740fb3be
-EBUILD readable-0.3.1.ebuild 603 BLAKE2B 01026c2478b2d4c7cc458a696a48457ccae6b4f0ec1c7bf2b5e1bf291b2307c6c6b017eb63f86397b0963f77981e2002eaab0fdb70423c6af63ce74e95bd9738 SHA512 c199c936ccbcd3e62508966997c40d063886cfe700d17db13c66b511adc2b345d77753b5793672bf09a85c9a10566c2b717f5e274b638938ea70040ce09a50fc
+EBUILD readable-0.3.1.ebuild 610 BLAKE2B 7924485d02a270e13c793c7fb0df7d1f276f9f283ed362c8abe5b6bd9ed97ca6f7cce373bb1a93c4a353893c9c55aaf4e907e9da19763a0ed9edb6f12984dace SHA512 c95d5fd623c98f8b1feb8a6f21440a9c75a4f556c7f28f6f0e5004f3bb529be5014e5cb141e1c882c29b95bc2640dd09115315b7f81dcd931bbaa4aadc9e24b4
 MISC metadata.xml 521 BLAKE2B f55c50448afa93121cecbe910a16fa39f80fac3c6d7545c8166aaa4d25fd5230073b4604c7f1036dc98ae2cc489f46eeaec6cf880c9547950ab0e4e7ec0379f1 SHA512 5c41add0c5df7cc3985f2a6f69ca0cc878e6b2f58f197e3f217d8bc851f30ed93b12b8bcc27ae83bd428d688ad1713e1381b9ae2843aab92e90d8837ca9e8e15
diff --git a/dev-haskell/readable/readable-0.3.1.ebuild b/dev-haskell/readable/readable-0.3.1.ebuild
index a0d6385a7f69..522217142a2e 100644
--- a/dev-haskell/readable/readable-0.3.1.ebuild
+++ b/dev-haskell/readable/readable-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/rebase/Manifest b/dev-haskell/rebase/Manifest
index 1b52beb08abc..74676a4a054e 100644
--- a/dev-haskell/rebase/Manifest
+++ b/dev-haskell/rebase/Manifest
@@ -1,3 +1,3 @@
 DIST rebase-1.15.0.3.tar.gz 21149 BLAKE2B 9999de56996d719410e770c5970a4e29bb81ac81a254440df7cd6ae001a2dc12bb5d69f47630e8e33941f0934d830f27594be23768f4317145655cfbb4fe859c SHA512 46c5790ba0bcf39b17a98eb32e6c5f68125abf9d20f51b6c3fa4fab665790eb1148878631e1e38677f53e1d81d52a1a96db18a8aec6e0eefbdacdd611340067a
-EBUILD rebase-1.15.0.3.ebuild 2097 BLAKE2B 2810812d36eb821dc4ef83ce2f4cf19191d4734a7d060ede3f2332375b5bb5a8fb77ba2cef60cf7d0ea1b7ecea575d7a00cbdd1760016084c911b3406bdcd19e SHA512 e13aad75ff90e90bf1a614f4bc7fd3523d79cd8757110908c1e9156abcda4666ae95cebca83626a5bf6871817bea62a784231924ea1645bd4460e5844007b28f
-MISC metadata.xml 1137 BLAKE2B 0d69fcb4a70f9279380191c6e39a622e75ec062452204869e2bd5f5931327bd7c76e31c5316242ea08816118795c449f54b19cf47c7884481ff047e510b62c87 SHA512 d1cf24ea34ead7c0d74bdcae14c6ea2b86e0574bcae3d1ec93e8ac8fd425934ab2215435f95215ed4e5e0ad6fb2ecb99dde5d92c6477aa883360c5e5fcc522a1
+EBUILD rebase-1.15.0.3.ebuild 2104 BLAKE2B 13795e8a394189339122fede5ac97da4744c38d19648ba04e9add18b2929dc0587a0733c6ce7e32b635ee76ce2fe29ace30a7b0af2e3d76f1fc3818bd557cd5c SHA512 94684ae648ab09d214953905d360df34bb155e3c891414ca8025c8b6d94b815416e040d8c389887aef1cbcb5cbc1a8da9e9bbfee99bcc5f4fa87b65e9ce677f6
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/rebase/metadata.xml b/dev-haskell/rebase/metadata.xml
index 582001c49632..937381521944 100644
--- a/dev-haskell/rebase/metadata.xml
+++ b/dev-haskell/rebase/metadata.xml
@@ -5,23 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package is intended for those who are tired of keeping
-		long lists of dependencies to the same essential libraries in each package
-		as well as the endless imports of the same APIs all over again.
-		It also supports the modern tendencies in the language.
-		
-		To solve those problems this package does the following:
-		
-		* Reexport the original APIs under the \"Rebase\" namespace.
-		
-		* Export all the possible non-conflicting symbols from the \"Rebase.Prelude\" module.
-		
-		* Give priority to the modern practices in the conflicting cases.
-		
-		The policy behind the package is only to reexport the non-ambiguous
-		and non-controversial APIs, which the community has obviously settled on.
-		The package is intended to rapidly evolve with the contribution from the community,
-		with the missing features being added with pull-requests.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/rebase/rebase-1.15.0.3.ebuild b/dev-haskell/rebase/rebase-1.15.0.3.ebuild
index 75e505e5a20d..22454d9414a8 100644
--- a/dev-haskell/rebase/rebase-1.15.0.3.ebuild
+++ b/dev-haskell/rebase/rebase-1.15.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/bifunctors-5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
 	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-5.1:=[profile?]
diff --git a/dev-haskell/regex-compat-tdfa/Manifest b/dev-haskell/regex-compat-tdfa/Manifest
index c725894b71fe..cf0d69377dd2 100644
--- a/dev-haskell/regex-compat-tdfa/Manifest
+++ b/dev-haskell/regex-compat-tdfa/Manifest
@@ -1,3 +1,4 @@
+AUX regex-compat-tdfa-0.95.1.4-ghc-9.0.patch 470 BLAKE2B 9044e7b95b5d6a03df35d9e1198de43db24c1ec9ab22e00cce9c405b68048bebd7532cf39e21ee3edea1aa0f985409070ea6d805245048c7775f0635755618b1 SHA512 15dd9c61b60335c51d906ba235d242d80b248d31a563dd1b82aca2385bedd67f481757cae6e7bf9c55ce30b44c32d897ed6475027d7e32efd29cba18181dd26d
 DIST regex-compat-tdfa-0.95.1.4.tar.gz 4146 BLAKE2B 1749307b8a7bfb1f0a0137febf425191d225bcdfbb0517034ea31e11e648eac128f16cc1951f9471e9f22efeb296c1c32344a375c16381ef823e0fc4674e730f SHA512 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14
-EBUILD regex-compat-tdfa-0.95.1.4.ebuild 805 BLAKE2B bfe4f75385f7047bea679257184db1126b18ad8212f6c71b7eaaf4bf3ad011c07d704c7fabef9971ffc1c6bc0c919628e6d1eddd9044a9d34f4cec4474425637 SHA512 be9b4c8945f35b022facfbbf7680edcd50b52f27eb8ac484941ad651bec123c0cf2130434a0c09680edc7f72e0ec34db1516f8d94b82dd327f13daa0c72f4992
+EBUILD regex-compat-tdfa-0.95.1.4.ebuild 862 BLAKE2B 8c88b241895122b6225e2387a125cd0364c46317932457ad5eae14ac4993da97048729dd219266e6f6423bbc737235e74e225b54ba576cae3191e8b871514d5b SHA512 a6494eeb917aac5143dee688f68308c9720db5c98a3fedc31dbd01b98f7c6f10eab1791145366185da89055f6da22a798043ddcf0a7402a921b97cf0edbffe65
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/regex-compat-tdfa/files/regex-compat-tdfa-0.95.1.4-ghc-9.0.patch b/dev-haskell/regex-compat-tdfa/files/regex-compat-tdfa-0.95.1.4-ghc-9.0.patch
new file mode 100644
index 000000000000..78d0ceb93575
--- /dev/null
+++ b/dev-haskell/regex-compat-tdfa/files/regex-compat-tdfa-0.95.1.4-ghc-9.0.patch
@@ -0,0 +1,11 @@
+--- regex-compat-tdfa-0.95.1.4-orig/Text/Regex.hs	2021-06-25 10:08:26.670791461 +1000
++++ regex-compat-tdfa-0.95.1.4/Text/Regex.hs	2021-06-25 10:08:10.325737439 +1000
+@@ -139,7 +139,7 @@
+ splitRegex :: Regex -> String -> [String]
+ splitRegex _ [] = []
+ splitRegex delim strIn = 
+-  let matches = map (!0) (matchAll delim strIn)
++  let matches = map (! 0) (matchAll delim strIn)
+       go _i str [] = str : []
+       go i str ((off,len):rest) =
+         let i' = off+len
diff --git a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
index efe655a7cf3b..71c308c67193 100644
--- a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
+++ b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Unicode Support version of Text.Regex, using regex-tdfa"
-HOMEPAGE="http://hub.darcs.net/shelarcy/regex-compat-tdfa"
+HOMEPAGE="https://hub.darcs.net/shelarcy/regex-compat-tdfa"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.95.1.4-ghc-9.0.patch )
+
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=newbase \
diff --git a/dev-haskell/regex-compat/Manifest b/dev-haskell/regex-compat/Manifest
index b11b3715f074..7308fd163a04 100644
--- a/dev-haskell/regex-compat/Manifest
+++ b/dev-haskell/regex-compat/Manifest
@@ -1,3 +1,3 @@
 DIST regex-compat-0.95.2.1.tar.gz 4285 BLAKE2B 5b1b7adf71c2903bf6647cc0bfefae230f59dbd3ab655a03083f279e7557b533ab745c15e36c51dcd6c4da9239e49a85c64a37a50458ee1a20e0d33a5abecc38 SHA512 87a671729dcdb2c89ce079fbb124cd2f16407f2dca0ed5d0d898a9cf06f893b82c184566efe80d966afbc7dde2cab1693b81516adc4832a9c65283a65fecd919
-EBUILD regex-compat-0.95.2.1.ebuild 834 BLAKE2B b51a703093b46e675d750bfdc45bf3e779d306f5194e3c031212558c2e002c61cd2ad2134b22a2f00f3d549f05dfcb490bea6d7e12920bec862b7608a4957ab9 SHA512 6157d70563cd0be73e0fd6fda7325e9898bc524e21465b8e089bc5e5aac328686fa8bc03cea2b079316b98bcf8bcf41afedfa152bd781220b7e01d706d1f24b2
+EBUILD regex-compat-0.95.2.1.ebuild 841 BLAKE2B 9b1c6b183490e63f399d7f00760290c9d48473abb9aedb702f473f074bda41d745e12828b218db660d08dca84d024e0e10a5632530646fd6407b15ce12466006 SHA512 8b56933ab9ca1d65fbb807772f1c8643d3e98f2abb7358b23555320edf2a5fe6b319a809932c390b16684960a658457f0b7c510fa8ee2cf233a7171bd429fe55
 MISC metadata.xml 308 BLAKE2B 0a9963e4eecbb0644fe45a944e127eec6ba5594aae29ecf22f83ab8723fedeeec3e7b46cf3c2cb008b2f262898c52bf6dd6403390c3fbb397fa25d31e39abe81 SHA512 d1ff415536abae9d9fad3c5129e8efef94dd5989395b8f8016c913fee07d1e7243eacfb3170b37848a68818f4e50629aa9cc64fee67570140eca8ecee79a6fd8
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild
index f554a29f8648..cff6eaa349ca 100644
--- a/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild
+++ b/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
 	>=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?]
diff --git a/dev-haskell/rerebase/Manifest b/dev-haskell/rerebase/Manifest
index b7ed1e44b4fc..b67d42b43fb8 100644
--- a/dev-haskell/rerebase/Manifest
+++ b/dev-haskell/rerebase/Manifest
@@ -1,3 +1,3 @@
 DIST rerebase-1.15.0.3.tar.gz 17673 BLAKE2B 9dd7fe1492a432975522735770a1630d24efe299084e5faf5221946878e3d8c8337dfaae0ddc1db13a56e131e8225a1f8e10f0b84e3c0602277337aecfc3e004 SHA512 7887c40a92a84df9361e7745c001476d6e0984c9da973f841feb3f6a413062d16a5dfe4be3171ee8d0bb96a9554384e831a1a4217eef764b97c726051c22ae1f
-EBUILD rerebase-1.15.0.3.ebuild 610 BLAKE2B 6aa6ee2eb2dffddc6215050a5183499815da0d3a4a575729501a1855009a062ce40ced3e8a1ba4054f9901178ee303d1a0d947ea81cd53fac2c3e34510400cc5 SHA512 e7e7722354b0ccf1b003b7ee809bb04ecae3e9afdb53b37f33a1b6a32ac11e6b2c754dd51accca042d254053a7e1f848bf124041fd578bde02c08e88e52cae65
-MISC metadata.xml 447 BLAKE2B 75567e7540165104416ff0e3ecf2dc74e1ba0ca6ab3d179d13d0f0f24a0e075b2256dd0b3e9aaba7568d38e397ef7b867896ebae02eb026e52d35e03cbd4f7a2 SHA512 74035333714d957c1a1700c346b3647a65533613dea3a5bef634fa4e790797012a0dca14096bb5fb7ba2fd42c5210f7d4c4424932bc92bad722bbc3d61987f9d
+EBUILD rerebase-1.15.0.3.ebuild 617 BLAKE2B 66957f5cd467aa9b03e3b5ee06502b5dd506a16ddedff1cb4245eb77380686982187912d18aaae525c16a23532939bcf0f2aced0ac3826f5d814ca6f3b17d187 SHA512 967ddcab2fbb41d79836ee32b19a455d3afc5e340c4ed2c391244d359249e6f67812290c017f8ce1ed72fd80dca0fe1e1a5832fc27dfce11b164d19d3687bbfb
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/rerebase/metadata.xml b/dev-haskell/rerebase/metadata.xml
index 28609600f5eb..937381521944 100644
--- a/dev-haskell/rerebase/metadata.xml
+++ b/dev-haskell/rerebase/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A rich drop-in replacement for \"base\".
-		For details and docs please visit
-		&lt;https://github.com/nikita-volkov/rerebase the project's GitHub page&gt;.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/rerebase/rerebase-1.15.0.3.ebuild b/dev-haskell/rerebase/rerebase-1.15.0.3.ebuild
index 40ba9652c4c0..3a869b56e093 100644
--- a/dev-haskell/rerebase/rerebase-1.15.0.3.ebuild
+++ b/dev-haskell/rerebase/rerebase-1.15.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="~dev-haskell/rebase-1.15.0.3:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/resolv/Manifest b/dev-haskell/resolv/Manifest
index eab5e2617dcd..13263b404cc4 100644
--- a/dev-haskell/resolv/Manifest
+++ b/dev-haskell/resolv/Manifest
@@ -1,3 +1,3 @@
 DIST resolv-0.1.2.0.tar.gz 156710 BLAKE2B dbad867d764db2075724a06d9f9dfa8dff882683849883cb9ade6d0654fefe9f024445cd137dca516b80cc2982544b794de7c82fd5d5f482a3891422a699f2c9 SHA512 fae2d0717a109b0d6cc19c51c773bc68c64c0048b9d930528cf5622ee270ebaddec180c1d444542e8eb036262611f5b88deadeea223fb2ef2b15b41369a2376e
-EBUILD resolv-0.1.2.0-r1.ebuild 982 BLAKE2B 95de97ffd52610560baf0ad305cdd28c712de6d436af003205a9f0d763cb8d62ed4ee0ff56dd8175ae5ab5e018ee74e4944ef3ccb890447a3f2da0f631fffb7d SHA512 d29cdcd6c7ddf04e0f403f0e7f468e9caf63bb5d1b5cc230b60f6ea0f78ff4d7711b0584168dd51bbb885647eb1417008c50bfc98440fb5f9088d43cabc0583b
+EBUILD resolv-0.1.2.0-r1.ebuild 989 BLAKE2B 1910cfc803f86480dde8685b70696b38c65023053762ba117666a7bf5f1bba497391d5b28ed95cc5e6a8d71bc2d185a3af392f290510d1d970aa66dfc9162536 SHA512 45d3ca28acc528174fd6f49f3d9be0f12d18b7a3d1c97fcf0b23396e2604d4781d79f5cd0add908002500e870a474eead352a3830ddc12b3a27759f77bb3e4ec
 MISC metadata.xml 1961 BLAKE2B bed50e176c392eda8b7dbc6f1b9f80ff129086eb0e2441e6e43186d4ef0d3ed5022687a58141de2789ec859ce4e14379a599f97d4b80723793394725beeff011 SHA512 47c0294ac938ce2a7d8ed57e0dd7f5ed05b34231743ef65652d1994b94e112ddbc106dee16b4a880f7bdd5ad6e5bf4bcf9dbd3206aa315d3a8e67563e529d19f
diff --git a/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild b/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
index a82bf7c7b332..a8d3fc110156 100644
--- a/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
+++ b/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # fails to build test suite
diff --git a/dev-haskell/resource-pool/Manifest b/dev-haskell/resource-pool/Manifest
index 9fc7d8b916ff..884129d1404f 100644
--- a/dev-haskell/resource-pool/Manifest
+++ b/dev-haskell/resource-pool/Manifest
@@ -1,3 +1,3 @@
 DIST resource-pool-0.2.3.2.tar.gz 6527 BLAKE2B e57d2406a483f0252cc564de91f74c51b62b9c1e7b52ae147e5c60a647130c2803af469d5b33389a5ff618d259f110738a973580e7633d2ff2dc9e7d57cd82a7 SHA512 42b0bb6dea35c08884f65604acc0dd93707b8d4de780c584877e92fbfe534d4f754282e9c9f7257c203f1152d85ac8170f84ee9a95573343d02a774006c4118b
-EBUILD resource-pool-0.2.3.2.ebuild 860 BLAKE2B 12d07c70f0294ff44fc64486c0107943a12de198a8266155230ba00975ac7e865ce9e842a34e9119cb73a6066f17fcb89022ed40df5ff168ccd40342f3e77ce5 SHA512 d264c3f10d9347af743ce5316519526c4882280050f0dc6ee4bd8c5bc4bd4011f610194a27c34c50316b720f6ecedba21b330921098f391c024ffffeff678f16
+EBUILD resource-pool-0.2.3.2.ebuild 867 BLAKE2B 99d1e820fe2ea19702b79eb2afa585fd03ba5c40e555f5b28df727ca9196b5302faca93869bd459328c9f517f007d1a438c641debfc9bdd5fd33df22b5daa893 SHA512 3d1e11675e9ffb01251088460bab821608589e337a6e71ccc793d6b85c8dace2b78d71a65b05934e06afc5d03cf4d8c1a2c5599aedbed38911fa1af8dde3bc4e
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild b/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
index 2f9a99428beb..0d396d1c906b 100644
--- a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
+++ b/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hashable:=[profile?]
diff --git a/dev-haskell/rio/Manifest b/dev-haskell/rio/Manifest
index 40310f687932..2987d4434628 100644
--- a/dev-haskell/rio/Manifest
+++ b/dev-haskell/rio/Manifest
@@ -1,3 +1,3 @@
 DIST rio-0.1.21.0.tar.gz 59157 BLAKE2B 5455a0056efc32f0120182a65adee665cfc33fbf2b6627bf420b26db7d472ca8b3d0797d996600f8538cc1dcfe34d87c0b6ce93f88dfc4c7e8b9516be334f25d SHA512 5a049c7af44f0811e402d641815453be0af1f437a89cada613940085ceb8b8bb66ab92753f31bf400ff16f72ff08a9e83ff422c988e434ffef0c64b4c1cc7224
-EBUILD rio-0.1.21.0.ebuild 957 BLAKE2B 6eca708b514172d5b84d00b037ea35526d16411acf87dd24b42cd5159b72d792f57052db6aa12669c4f771edd0bce4e9787479d60526bda3cb5e209efeebccfa SHA512 083b518d2426f55e6aa574f804055fc3b2a50a9f869473f1fab0618940ebfd2096e3017437656f03364d0e620d8652d9486cbbb5efb65a78314a569f6bff1b2a
+EBUILD rio-0.1.21.0.ebuild 964 BLAKE2B d0810c0c28bad703f8fe949cb1c307756141556c662de4c062ea7ff9cca83ebb50b9b60efabb5e23e8b0bced659b82efe11bfafbf7c4909cacc7f090ff19125c SHA512 b45891d7aaedae71971ef7fe898b65f004fe2e24c7482bef23b6c0af5b9fe1ec8df67946cb2fa56ea35718155e91e1aa88ea2ed81ee6817bc87cddc57a350973
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/rio/rio-0.1.21.0.ebuild b/dev-haskell/rio/rio-0.1.21.0.ebuild
index 1497f9c14087..a76a2313c508 100644
--- a/dev-haskell/rio/rio-0.1.21.0.ebuild
+++ b/dev-haskell/rio/rio-0.1.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="dev-haskell/hashable:=[profile?]
 	dev-haskell/microlens:=[profile?]
diff --git a/dev-haskell/safesemaphore/Manifest b/dev-haskell/safesemaphore/Manifest
index 0b11313634db..2a35b1ed0195 100644
--- a/dev-haskell/safesemaphore/Manifest
+++ b/dev-haskell/safesemaphore/Manifest
@@ -1,3 +1,3 @@
 DIST SafeSemaphore-0.10.1.tar.gz 24007 BLAKE2B c11997a1aba15f8357c1518135c7d78bdb27a6def14ef0da2f94b8530e8ba62a4f4031fca3df040be21474edf8b33e7ccc675d08a5fd855b876fc26f56530ff2 SHA512 877731622e1942f45fcc43e2ed8ba7ddfa2c1f4a7ea4f36cdf425a98acc9c2f54c742d98a7d1bb457ff122f20a5af399ac776bff7403b892353f812e42007250
-EBUILD safesemaphore-0.10.1.ebuild 721 BLAKE2B 0c0a35e11b0036ef0fcb813daf263fc9ed1016ed37f6f4303595c3a514f0496012d4a7a67367b73598f2c4a5129a9d953223065a2abe46b3737f09164062e40b SHA512 097738a4508f48a9422b10b026fc460c9142e4879a437684a1cbb0ff3349feea2e87d72260685923f3b1d577afaba1ecf800fd0110a3258ead261315f9bbef58
+EBUILD safesemaphore-0.10.1.ebuild 728 BLAKE2B 31ad3d86768afc1b17faf19619f6b1619d934d90f11f606031b122ebaf95b054f7b76bba49c10d22e394fdbf50f50549be4b94ba2801c841e8fcf572f28edc35 SHA512 498498ced30ee2fb521ad6ce6c56fa2ce3b56d504887809e565ac8d831d361fe753d2a0a817bedad13fdb4ffce2b5cc83df27f4015035d39783dbe725ec6cd82
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
index 4d4f9cbbf31d..e589d717b966 100644
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/stm:=[profile?]
diff --git a/dev-haskell/sandi/Manifest b/dev-haskell/sandi/Manifest
index aea83984456c..553ef2d771a0 100644
--- a/dev-haskell/sandi/Manifest
+++ b/dev-haskell/sandi/Manifest
@@ -1,3 +1,3 @@
 DIST sandi-0.5.tar.gz 19115 BLAKE2B e6fa5ba8757c2ff96a556cdad50217344eb188e5b258c770acc2228e0219f2259891789b4ef33d00a64a8f2d3f1b633d046517fc95792fa21b1dfea1dd2a19a7 SHA512 8abff3496d0d3f082f12416eea3189e06d1663fe78d996159396ab944389b2a816853c0191edced3b176fc506dac60e9ce84347ecaf2c255e5ec0d6b1590c012
-EBUILD sandi-0.5.ebuild 871 BLAKE2B 2f776de892a05c18304d1c896332ebccd972759878aa8a6f5226f0da18cbd861d8af75d3d517600173e8f058c6de7498edfcfa7c85a23de7a21530c3f843ccc1 SHA512 25abada072ea0115f425e54cbaa3a2607cac44bc9a81de109e4c32b1f15ec019f190cebc5c13d7c9b9d53904991f9c161dc525e49de1b2c876683e985b8282f5
+EBUILD sandi-0.5.ebuild 878 BLAKE2B 264973ca1d966476e1211809b6a83c7a07d585a00beb8aaad4328c53fbaf6170c0499f5c5d2b08013b3f9dda9c4b80a597ad112634496729f6d9df22bebd7551 SHA512 eea57f23a17512fbef721441e21e5abbe1ba8e8a5f422140b36058dad85af4cf4d848b0c260e0802056022c2ca8513d161b686f49f55fa6c4b2f74c0c2a3ac87
 MISC metadata.xml 314 BLAKE2B 68d81403a7b06559ae33b5a1f2157194143e00bfef88c84a91ed09d314e19a4e2c73e20965552d1293f86fe40ae6b6e44b4a8bb48c43602f556c056f314267c8 SHA512 7e4b0365da1efb73b7ae8db2ee570fff9a8e0256e3064ed25127b63164c06b1d4a0bb482f3c71370097cb10fab4a43e13b09ebe0bb0b5faae81168e499e97b51
diff --git a/dev-haskell/sandi/sandi-0.5.ebuild b/dev-haskell/sandi/sandi-0.5.ebuild
index 5ff1d36abf72..60f4df48e55d 100644
--- a/dev-haskell/sandi/sandi-0.5.ebuild
+++ b/dev-haskell/sandi/sandi-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+conduit"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/securemem/Manifest b/dev-haskell/securemem/Manifest
index ca9f0244b1d1..dd6cc0c367c5 100644
--- a/dev-haskell/securemem/Manifest
+++ b/dev-haskell/securemem/Manifest
@@ -1,3 +1,3 @@
 DIST securemem-0.1.10.tar.gz 3801 BLAKE2B 726659761c4e53a5009c0539bfd07c340b72765c6cfcf946f0ac13fb5473df57eda16af7089867089cceba4f211ff7764900da5e3b176d90e5b892ccf4387102 SHA512 9f1428896a7b554244e42ac04a17c008cadce8102294b3249c172d84b20195325c48eadf15f7d26dabd766e4d45d171b0a26649e097d632a7fae596663a43096
-EBUILD securemem-0.1.10.ebuild 649 BLAKE2B 571da86a27e812d0f067ef50cb845e2325fd7f9f4dad857b1c74ca9d7536288a31173d1d340a664870d7cdd63b8ae70d7f5f84118df08d7812c356bd649de35c SHA512 f747fd47163c87c399e3d53c87578d476e3d0da358a30c14505c05b2363d5977f4f172de9a57cc78270b555433ddf8ab44cf89a71ac129c9f22b3e159c0362c9
+EBUILD securemem-0.1.10.ebuild 656 BLAKE2B a1ca3caabaa3a7eead6f0e7af0a40df4d102ab39384a53b03a851b0701ea6057b3123568ca831e219b0e6244947bf9af1c0bb94e98366294258617b89bad8860 SHA512 72c899cf60644750c8fdf541bd91b3ba3270456244c74b36b57807188c7ac6eae211a3d50597d67873baeec5ef9439deeb0de26aa75156c92158d643d7630566
 MISC metadata.xml 509 BLAKE2B eea11d2ecea3f013f847e4bdebcaa34a1abe14f75bd54844bd9d276b40692e91391ea44abb221789da96db7c84a00381ee142eb6934ba54836cce0abe0d212b6 SHA512 87f0e2bf571c599a897c443dba4347735fc94b95cae22530908e803b7ceb86f9423e387532cf38a9cb79e9d83e2d7fd33dfba0a5df890aadb937acf5c478780c
diff --git a/dev-haskell/securemem/securemem-0.1.10.ebuild b/dev-haskell/securemem/securemem-0.1.10.ebuild
index d8917ccf3057..fe6ce67bcb40 100644
--- a/dev-haskell/securemem/securemem-0.1.10.ebuild
+++ b/dev-haskell/securemem/securemem-0.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/selective/Manifest b/dev-haskell/selective/Manifest
index 0765a65bc0bf..baeadcd4871d 100644
--- a/dev-haskell/selective/Manifest
+++ b/dev-haskell/selective/Manifest
@@ -1,3 +1,3 @@
 DIST selective-0.5.tar.gz 34055 BLAKE2B 1cd2af69e0590c04f41b5473595579c0eb494a70167a7a06986930a6a28cb254dc971ae08451a402e6e1e1b9925cf6a96fdbffffe885888d97da667929c8da22 SHA512 31c7d294fe0cf92f4c4b57008d9dea055e959906eb0a8d11873edc0e02430dbfec99a57b68ee9c98d332c92c9c5111e03b2b4ce89d3dc543243b343a37313d6d
-EBUILD selective-0.5.ebuild 612 BLAKE2B fde8d0e50ffb23d0e957ad559769a879cef08960bd073a67dacb0dfb62b4c3c9b862993b4de1aa80c2085da42a5345f37dde5c578fb76dc493942258a4697dcf SHA512 58f654e1107f8cdd7a75b47832ee079846e45c64d1b33a3f75a09b7eaa807a54fcce286ac8cf3fe805ea80262dd54d8850c168c5a3c27c82dabd199708ea9f16
-MISC metadata.xml 657 BLAKE2B 92ff4b5dcff32658a237eea31f5ddd21bc1fc8d5a7459f9acfdd44b18451b6f99fe877b272c91de1e62862eb33544caf77d70f7a8bce2a4eaa2eb743b37d6e84 SHA512 e529dca1d1ad98db3e9516349fb245393d10173f0279442454ea5c44b215cf80739d7e60c2022ef8f38ee7a824f1bbe72642265256cb0bf255c13693a3cdadc0
+EBUILD selective-0.5.ebuild 619 BLAKE2B fc5dde628c0ca0d450d69b9f3986a6d4aba35d029865b03b66ec08ff056bce12cccb4cc561ebaab8a674d72aac488128738a224003eb16fc489910f29e51feda SHA512 f069f6660abd4606123a97938c5bf150021ee041cb0d492001e9a7e37cde449f416acfc22f15921a0e55a6d64cc7420e9c01f7f888ec24556542374c7ea03902
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/selective/metadata.xml b/dev-haskell/selective/metadata.xml
index bda6fc5af0fc..937381521944 100644
--- a/dev-haskell/selective/metadata.xml
+++ b/dev-haskell/selective/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Selective applicative functors: declare your effects statically,
-		select which to execute dynamically.
-		
-		This is a library for /selective applicative functors/, or just
-		/selective functors/ for short, an abstraction between
-		applicative functors and monads, introduced in
-		&lt;https://www.staff.ncl.ac.uk/andrey.mokhov/selective-functors.pdf this paper&gt;.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/selective/selective-0.5.ebuild b/dev-haskell/selective/selective-0.5.ebuild
index abde0721dd40..3a61c4ceb495 100644
--- a/dev-haskell/selective/selective-0.5.ebuild
+++ b/dev-haskell/selective/selective-0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
index 8cb95cd9a6f3..2414d926d0e1 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -1,5 +1,3 @@
-DIST semigroupoids-5.3.4.tar.gz 26307 BLAKE2B ad22d061c6b5773c6717d00226a41f3b765513a50034d7a805605630314fd4d284b80d1eeb0f85829877ae9a51c8b5e0408e53c27d8dd206216d7eab893885ee SHA512 b4053a856e1c2d3f20f984216f008ff264cedd2ccc3cc39ca3b70bc296d81ea8c1e6dd655bb8a6d1b9a44084e02d74a26cd4eb7264e4732e98be3ec351dc6e3a
 DIST semigroupoids-5.3.7.tar.gz 35349 BLAKE2B c911fe203638714236211a9f40f638fd7e43255e57a4b1b3d0df0cf10a97cc93815776bb53c864a8a4c95fda74402f9a5f6003e3899c35015eacd9df8cc5b86b SHA512 5e908f3b1618cfeb45e03335284e8811ff443f3d7cd8013813337729da62570c052e854bde64c56535809340d0ba281e246d7d0cc8f14627deeb7b1047623849
-EBUILD semigroupoids-5.3.4.ebuild 1959 BLAKE2B cce6f1b896b40312b284f5889ad7adf1106417131255b445e33b2cbbb70919bf7b8d4ee183d0975e07a6d97554db8d011da26f2bd49c38c1b814e5b997caa66d SHA512 9a88ad9a3fbd304724668081cdffd53b3ceb1af0c6ad80cfe7b76a632184ddcd298866e756a491eec0a0bc56a7578e074b363c62ee9895e848993bb13362fb9b
 EBUILD semigroupoids-5.3.7.ebuild 1855 BLAKE2B 68f5711371f6d5c7c0948a2137cd769f93669e9ad22f14641fd44096f85655395fdf9f30cadc3b2aee36f15cc6e2cc453ff55edef0d4a5c8054cae921829d71f SHA512 540ac564375144500accbe18f6cdb2b74c781cf1cc4af51547347ea2568ebbe4ee0487c1cd660e57c9c46aefe78cb3f71ffbbc6daf177aff5a8efa5261de55e6
 MISC metadata.xml 2028 BLAKE2B e52e472eb18b5ea924355a6361001d9fd2465d994bcb1f9f139981d35a9c25ff6dcd0e71005559473dd9d18b65967d740a91378d36316244c4c891cf875ef2ac SHA512 4b14472f76a2c85a0a9c007b2430dd52c457c391eb25dd66c675d57ab46929438c35184ca28b9d8d50ee41da0dad7e4200b4eb5203e011925945a741bdc2f521
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
deleted file mode 100644
index bb93a243b594..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: +doctests,+containers,+comonad
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+contravariant +distributive +tagged +unordered-containers"
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-				>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=comonad \
-		--flag=containers \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		--flag=doctests \
-		$(cabal_flag tagged tagged) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
index 2111763a947f..fbad4d01f1dd 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -1,5 +1,3 @@
-DIST semigroups-0.18.5.tar.gz 20162 BLAKE2B 6580b1f1ac5bf85aced9dfaea1fc8d6daf4a0536395428f629af651b3717d06d36a33b1d50e38e0b420937cead33fa986d060243a788d83e440dfd73b5413572 SHA512 c1a3376041ea32e9f4ddae79ad5ec649ff3a09c5e0a07ac4f731c05b7615ac2c33deadd24c5c9ee81a6747373ae928f3b3bcaa131dce7a7ff1e3efa56cf57db3
 DIST semigroups-0.20.tar.gz 18788 BLAKE2B 8cd5e82bc1af79a5c688e16c1d1c4aeec12923ed3be2fe9e1aa4f6a431a1e5be56f373ca952536054c2c7530da1adb579fccd8382ddc5031eddcce44815d73b3 SHA512 76e61ffb854276a7760619acd093df0c80c17a58a553ba9f9be3148998c4905784ca5840041a9afb800eab220c62b59567d1be95be478c21b4446021bab7b923
-EBUILD semigroups-0.18.5.ebuild 1522 BLAKE2B 218642cce159cff9c06443339d93a60b0b545fe7b7be12c8900665dd2fc76c2e2336247ff24358c7084216498d994e9ca0a75f51becbfa1c8c6447b73b2f69a4 SHA512 c007cb7cf10b998e52f80aad62157b38ddcb07872b209d91ea992b0303f67805ac0c39437967ce2a365fe671ffdda239d5350bef4db8e22b51e13606b2ab96c5
 EBUILD semigroups-0.20.ebuild 987 BLAKE2B 619986298b53ea714ebd14e7d0def3ce3d9e88372da66178116571305fb4ab905b6d50b7f963a3517bc300009100ad83722d300ff1c50dff0ef73ef9d0bc8a4f SHA512 415ca467307b5146844e5b0aef285c745e29744e735080242272a8be9267dc3d0f87dbca11e2b87c7c6c1544fe9cedd5dd7a6b72d12516574f000c640774b7c6
-MISC metadata.xml 492 BLAKE2B bee9ef77b0355856bca5fac4d30d54404c93dfebedbbe6d989f8882044033a2ff2c0576880bccb53db7d6b63a68c23848c60db0b98dca3be1881bb1bb1cbbfb1 SHA512 346b9dd7b7ec6f633d40f465de863d2e11a993f55f745621bff3bdf308e7d540f611b561169019f9b218083c73843e4609f9a3806a0053174ec9aee4b9ed7c5e
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/semigroups/metadata.xml b/dev-haskell/semigroups/metadata.xml
index 4fa7e4c8dacb..937381521944 100644
--- a/dev-haskell/semigroups/metadata.xml
+++ b/dev-haskell/semigroups/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="binary">provide instances for binary package</flag>
-		<flag name="transformers">provide instances for transformers package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/semigroups</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/semigroups/semigroups-0.18.5.ebuild b/dev-haskell/semigroups/semigroups-0.18.5.ebuild
deleted file mode 100644
index 6de986302e7f..000000000000
--- a/dev-haskell/semigroups/semigroups-0.18.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+binary +transformers"
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag binary binary) \
-		--flag=bytestring \
-		--flag=containers \
-		--flag=deepseq \
-		--flag=hashable \
-		--flag=tagged \
-		--flag=text \
-		$(cabal_flag transformers transformers) \
-		--flag=unordered-containers
-}
diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest
index bfbc6610249b..9c3e863d6c4e 100644
--- a/dev-haskell/semirings/Manifest
+++ b/dev-haskell/semirings/Manifest
@@ -1,3 +1,4 @@
-DIST semirings-0.5.4.tar.gz 18490 BLAKE2B d3d67bca474ae7cbf3e016ef17da5ead593250d9cdda051a0fcd84bdb142ced3af74a0f287921e6edcde9916dea4d128f11cc77d8a65bff85470d533565e4749 SHA512 d24a178031e494e1b337585272e0cc960da7935007affc0fea893fe1cac0acd79569a6d8dc9cfddbb7f435a48c34b7aa0d6e589a16741c7c9b5fe00d52b95441
-EBUILD semirings-0.5.4.ebuild 1046 BLAKE2B bdf5a6bba062023d5eb94f1c09171393ac75ef677a988e3095182581c12a6901c45496b9a877ee5dcd16c27456b3081888046e151da726d619cf9d43a7a9d11c SHA512 a06ce8d7f6e2d7da0cf0495aebdfad85524f166cb6776f319f87095d87b8ef8818ce0e4ee7905e3a19c7b45095aa798bbeecb797e0466dfa415f99e55b83fed6
-MISC metadata.xml 1641 BLAKE2B a618c1318d0a716c6a2cb62e8ce0357c940a39f2810cc71e4ddd2b698f811dd7f119078156e7fb8456eecd38553974450bf777d0645941f27ec9083b6c7f2b1a SHA512 6bfea836b89bbaf61efa35acf0f9a83849c5ad0ae00c3d37fe995ed6ff86976cce40b41dd4eca9f4d35ca51820586d36f44f82f30866162093bcdd565a8ffedb
+DIST semirings-0.6.cabal 2668 BLAKE2B d1c1293a9f2ad63caf291bd1e409afef54815815ea3e750cc915a4872725f8d1f69fdf7097fd724f8f4762a98f9b36653b38df900a31c4fef775615c7031e838 SHA512 1b2afdf824ff308726b258b82cc9b18718da01795bcfae23c073dfb484faa1a44ee59af479a8719ed950e5811bbdce64bea4e7b7a0cf59986c24f89e256de156
+DIST semirings-0.6.tar.gz 19640 BLAKE2B 9cd6d17cfdc2fde31741a6db085d972fd8ed131ad003102c1b4991e8157f4b22a05508306c64b1a4f730ce1f99e3d40861b60332689d9b16e122c3ff59a80e0c SHA512 01675527d47b5283ae6beb6feb38b4a5527a46a780b75e4b712c0b1e4b57218fa8238ba100a20947a2e2b53c4a314ad4e1a71f989bd5194fe6378dba048c870c
+EBUILD semirings-0.6.ebuild 1318 BLAKE2B 78c568bf0e276034952bc277559c3525a3c3c0efa62bd80ccf3dfb4d6d7ea018e4e8a8178e5fdaf721344e71556745448e89c5532a97ec66e88be12a6072fec7 SHA512 6cfec416f4f3babbc8459255b5a0a8dcf1f869d276da241ba0fdae48bc19f1a361d5c0ccf27582be89b3476ac87ef32c9ebb592398454340b0982349323ccd7f
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/semirings/metadata.xml b/dev-haskell/semirings/metadata.xml
index 7695d99e80cf..937381521944 100644
--- a/dev-haskell/semirings/metadata.xml
+++ b/dev-haskell/semirings/metadata.xml
@@ -5,36 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="hashable">
-			Enisable the use of the `hashable` package. Disabling this may be useful
-			for accelerating builds in sandboxes for expert users.
-			Note: `-hashable` implies `-unordered-containers`, as we are necessarily
-			not able to supply those instances as well.
-		</flag>
-		<flag name="containers">
-			Enable the use of the `containers` package. Disabling this may be useful
-			for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="unordered-containers">
-			Enable the use of the `unordered-containers` package. Disabling this may
-			be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-	</use>
-	<longdescription>
-		Haskellers are usually familiar with monoids and semigroups. A monoid has an appending operation `&lt;&gt;` (or `mappend`),
-		and an identity element, `mempty`. A semigroup has an appending `&lt;&gt;` operation, but does not require a `mempty` element.
-		
-		A Semiring has two appending operations, `plus` and `times`, and two respective identity elements, `zero` and `one`.
-		
-		More formally, a Semiring R is a set equipped with two binary relations `+` and `*`, such that:
-		
-		(R,+) is a commutative monoid with identity element 0,
-		
-		(R,*) is a monoid with identity element 1,
-		
-		(*) left and right distributes over addition, and
-		
-		multiplication by '0' annihilates R.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/semirings/semirings-0.5.4.ebuild b/dev-haskell/semirings/semirings-0.5.4.ebuild
deleted file mode 100644
index 37ae6599ef4c..000000000000
--- a/dev-haskell/semirings/semirings-0.5.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="two monoids as one, in holy haskimony"
-HOMEPAGE="https://github.com/chessai/semirings"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+containers +hashable +unordered-containers"
-
-RDEPEND="dev-haskell/base-compat-batteries:=[profile?]
-	>=dev-lang/ghc-7.10.1:=[gmp]
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semirings/semirings-0.6.ebuild b/dev-haskell/semirings/semirings-0.6.ebuild
new file mode 100644
index 000000000000..dea5b95c40f1
--- /dev/null
+++ b/dev-haskell/semirings/semirings-0.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +containers,+unordered-containers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+DESCRIPTION="two monoids as one, in holy haskimony"
+HOMEPAGE="https://github.com/chessai/semirings"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-haskell/base-compat-batteries:=[profile?]
+	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=containers \
+		--flag=unordered-containers
+}
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index 13a676905662..10cb05b94539 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -1,3 +1,3 @@
 DIST shakespeare-2.0.30.tar.gz 71263 BLAKE2B a3ef788611b83d27d0e188cb11b45e54f5e7ce1ff215c3f62d643f5725022b8e7b3f94af7ce35fe5471311b01b9b6ff532fb6fec5ad4059a6d5be31f65f2b122 SHA512 8b278c712f0e914dee2cb2736f6d859e920ffdd3ffbeb2684eb45d3eafced4bf871cd5f960e31b9355d53f913fee29611f82494ec7b26d8711a2b33ef5a0aca0
-EBUILD shakespeare-2.0.30.ebuild 1161 BLAKE2B 7e15d5ae77c9e9006fc642b678fd0a9f6f965408bce26dd12652504e6220e2716263e5f80b6aa599c103a9983b6214896b87d2d69a8f2b153fd5353f1190fc69 SHA512 d2aaf4bf410cb970afef82f44c62769604a0a6184746fc2131f9aab8827a30a497704e6a9da3d3a0bc121218376ca16daed91513bc9174fd997da3495b379061
+EBUILD shakespeare-2.0.30.ebuild 1168 BLAKE2B e8b7ee8c3c485138add99fec790b9e85c61c24a7cf63c95fcd7a1548ecf40dda8fc85b070b6bf154632ceefeb265a253eabe80a1d4b1594d15cfa14c3c852c59 SHA512 057569e5bc0a2e6447b7cecfe6c3b1cf4ccf950cae7ebb26119bcb7b41d07e4a83878ad9ab5c3425c86bec6a541e3721f5e1f0d6c90a04c01ad47bbf239e4bb4
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
index e87d52952eee..4c96cf67bb4d 100644
--- a/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="<dev-haskell/aeson-3:=[profile?]
 	dev-haskell/blaze-html:=[profile?]
diff --git a/dev-haskell/skein/Manifest b/dev-haskell/skein/Manifest
index b2fad8db3d5c..70071036d77a 100644
--- a/dev-haskell/skein/Manifest
+++ b/dev-haskell/skein/Manifest
@@ -1,3 +1,3 @@
 DIST skein-1.0.9.4.tar.gz 134346 BLAKE2B 0161ea5a6de793c7938595d05b98b04f8929f007945fb86ea6c6fc7cef26a7022be00d0546920abbfb0ececcdab3e770acf4a4f468a33582106cd8290e830f2f SHA512 4f449de2db0c9f6a22e3f7375999029c1ab9139ae2e678e5582d5ad05dc8b3c12c99951ede884228579b9acc0243b00b93dca07dd6d1ea314cc0d3d223165c34
-EBUILD skein-1.0.9.4.ebuild 1068 BLAKE2B b4be7e7c851f4fe93f10a832370e7cf4d79a1fc74e9a0752cd334f1421bb1a0c52aa69b7623352bcf85d388ec7cacc2dd7f65b3881b621048e8d8f5043da78df SHA512 65c0d46bd1fbbcbc8e634801041b6f87b12eb8e5bb26f3504275962d01b8de80cb1277e2f8ea6b5be07c1c85ef66a58c7aef684a36d0253ced1996acab9a5148
+EBUILD skein-1.0.9.4.ebuild 1075 BLAKE2B 1ccbd856711a58908b35704c9a06e4e36b4c571108f6d5d6a7f7261a1424f3a462c59b3230d19fb447ca3cbe02e2ac0293777823aee8aafafa51b16bc2f080d7 SHA512 e81f6477cf60c1dca3d9ae6cf927dcbd2b1da10f0b50787fe6d8e9f8051c6475b59f0a6d9afca02a05020f8559ed4bc40ddac4650b1e8d4be2935ff91cf200da
 MISC metadata.xml 1491 BLAKE2B e765f9fa045a1aaaa625d5013e65222ca2f00a71c5bce1855f9f5879ea7dcac7aec08e7439627da11882e2ed70890d4996c5b6c4e0ce08d2c2757e1f097a5445 SHA512 0c0a7971f93f2107254d40a79a776c52da4fec24555cf035e559a017fe7347f22979f1678b35420d45f2d465ebca82198a0f4f79fbdfb77972cad848eb26e4b6
diff --git a/dev-haskell/skein/skein-1.0.9.4.ebuild b/dev-haskell/skein/skein-1.0.9.4.ebuild
index 89a3273ac90a..27b2515547a9 100644
--- a/dev-haskell/skein/skein-1.0.9.4.ebuild
+++ b/dev-haskell/skein/skein-1.0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="big-endian force-endianness reference"
 
 RDEPEND=">=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
index 8ac043f582d0..dcc6a4b42cb3 100644
--- a/dev-haskell/snap-core/Manifest
+++ b/dev-haskell/snap-core/Manifest
@@ -1,3 +1,3 @@
-DIST snap-core-1.0.4.2.tar.gz 163146 BLAKE2B 2fc037fa239eed3771c84ede4ed247f34169fb45464f5724e7d770baa0992409eeff4b066a9eaea3cdebf46a9846dd8ac94dab42deb36047bb26654df5642f9b SHA512 42e710ac58a7d3cf58f9fdeca6c9c4880a94765ee0dc42fbcdaf68a6c2c337e1715f8b89863c7f911232af493bf5622b647d4c962237f211f97d731572fd94f5
-EBUILD snap-core-1.0.4.2.ebuild 3274 BLAKE2B 3c8defd45c17501f4c7a8f411d665b2b276496652f9b2bf17c8dbe9975664fbbe114941f592520231eb8d52a760ba867feb87f18622b64e082f1f6dd30e51ce8 SHA512 1e5a3b6eef5c22a8503563ec0cecbcf047c2adae26d9acd3dec4fe60f4abaf7a384817e816f03a3b67405e354090582aaed7bbe8711a14a64b63266224701d26
-MISC metadata.xml 1856 BLAKE2B 0de547b6f37428da5cf4b2898ca2dd47f05173548f2f5a90414a27c912de81bc46faedad8c79584282bad7ae82b64cd72cf4ed864163048231835bb35373aa34 SHA512 54d54c595a5f02b608bfc156f36d46f679874d57e5f669f55019185ee0bc52eddaa78246db02cf1ce181ef9f2ce06585e30e5fed8b2906d8395c50a636aafae2
+DIST snap-core-1.0.5.0.tar.gz 163675 BLAKE2B 24cace660bd43093b1f7cd358e79f3df74d5daff62a2e1c754cbb80ea0631560443f69f5d5d892c0609a881b6c943dddcdb6ab3e9e7a8205c37b6c6465df2ce2 SHA512 4873382625715703531c7cbc61343a29cf7606384e64b92fb2026016018258f5c959ac7dccf0b1093eca39f5b750c19416afc691bec93161fa76ef79a1369b7b
+EBUILD snap-core-1.0.5.0.ebuild 2751 BLAKE2B 4ae51ec92d68b66d24dd8db74021c1d379ab21878ef466d4f89d3f3821e7ed4cb25affb7cb2e466231ee22ec62203193de3bcf645b5ce108cebe371faefc8b9a SHA512 57010247bceb230390679e6d8f3168f07a8a699bcb0a4af1fc2f4f86bc2b58c130e7374d185c00834e55e9ffd9aafda3a61cadc11ecc7a7574897ff104b58c83
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/snap-core/metadata.xml b/dev-haskell/snap-core/metadata.xml
index a31266da8cde..937381521944 100644
--- a/dev-haskell/snap-core/metadata.xml
+++ b/dev-haskell/snap-core/metadata.xml
@@ -5,43 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="portable">No non-haskell unportable code.</flag>
-	</use>
-	<longdescription>
-		Snap is a simple and fast web development framework and server written in
-		Haskell. For more information or to download the latest version, you can
-		visit the Snap project website at &lt;http://snapframework.com/&gt;.
-		
-		This library contains the core definitions and types for the Snap framework,
-		including:
-		
-		1. Primitive types and functions for HTTP (requests, responses, cookies,
-		post/query parameters, etc)
-		
-		2. Type aliases and helper functions for Iteratee I/O
-		
-		3. A monad for programming web handlers called \"Snap\", inspired by
-		happstack's (&lt;http://happstack.com/index.html&gt;), which allows:
-		
-		* Stateful access to the HTTP request and response objects
-		
-		* Monadic failure (i.e. MonadPlus/Alternative instances) for declining
-		to handle requests and chaining handlers together
-		
-		* Early termination of the computation if you know early what you want
-		to return and want to prevent further monadic processing
-		
-		/Quick start/: The 'Snap' monad and HTTP definitions are in "Snap.Core",
-		some iteratee utilities are in "Snap.Iteratee".
-		
-		Higher-level facilities for building web applications (like user/session
-		management, component interfaces, data modeling, etc.) are planned but not
-		yet implemented, so this release will mostly be of interest for those who:
-		
-		* need a fast and minimal HTTP API at roughly the same level of abstraction
-		as Java servlets, or
-		
-		* are interested in contributing to the Snap Framework project.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild b/dev-haskell/snap-core/snap-core-1.0.5.0.ebuild
index 0d7046af4b4e..c9dddcfd624b 100644
--- a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
+++ b/dev-haskell/snap-core/snap-core-1.0.5.0.ebuild
@@ -1,53 +1,45 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.5.9999
-#hackport: flags: +network-uri
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +network-uri,-portable
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
+HOMEPAGE="https://snapframework.com/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug portable"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug"
 
-# Fixed in next release: https://github.com/snapframework/snap-core/commit/49a8090d7834a0ef9b438048e96be36e55b2fbf5
-RESTRICT=test # test relied on headers ordering
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
 	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
 	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/hashable-1.2.0.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/hashable-1.2.0.6:=[profile?]
 	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?]
+	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
 	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
 	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
 	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
 	>=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?]
 	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
 	>=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
 	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
 	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
-	!portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/parallel-3 <dev-haskell/parallel-4
 		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
 		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
@@ -56,9 +48,16 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
 "
 
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'hashable                  >= 1.2.0.6 && < 1.4' 'hashable >=1.2.0.6'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag debug debug) \
 		--flag=network-uri \
-		$(cabal_flag portable portable)
+		--flag=-portable
 }
diff --git a/dev-haskell/snap-server/Manifest b/dev-haskell/snap-server/Manifest
index 795cb0da3a3c..e67e20fa7528 100644
--- a/dev-haskell/snap-server/Manifest
+++ b/dev-haskell/snap-server/Manifest
@@ -1,3 +1,3 @@
-DIST snap-server-1.1.1.2.tar.gz 73645 BLAKE2B 29215ce7f542c56be40ce40711f04f7f0b2ccb568903483dbf99950b3ec7703505440cabcf70d0c6084991fe09931e6312b59b48da5511b407df02318b551600 SHA512 a11bb92ce8774269704ce8c045bddf4aad15816cfb447453e8010bfce7aff2a08b38d3c99a400ab3882cb9e0b2f0b1f9af69adc56c1b28df53dc3fdd44042e30
-EBUILD snap-server-1.1.1.2.ebuild 3159 BLAKE2B 123e1ff8719f6d9ccb18e73f26702c05b53dfc535fe301209f717b8f7c95001a57d440fe0e4a27b9268a9d3a6ce34e1eeaa2d7fd47dc51fbace8581191a47617 SHA512 8f7e4bc4764de4b8bad79ff93e7d3ef7eead6ad916cc73723ad7d5d71f248a04c1d2d44e0e8dcc0f4c5c6afa248052b0dad50e554aaeb280633d752efded1fea
-MISC metadata.xml 1428 BLAKE2B 5fbb5b85e3cd6bbdbaef2b778337b5a44557202861a9e12842f42e27fb3b3f52f9550d5552b55c1259156f762d9fbc4cf5e58b7584bd6d092facf59aaf923714 SHA512 22a9fedaaeaaf2c51329c6b48f415bb2aedb4858cf72d5b951e8bc9f5bc820c7e02eab6fff080e24c86a679a134b51e3a22bc0ff89eec9799ab823e57cd79a8f
+DIST snap-server-1.1.2.0.tar.gz 73795 BLAKE2B 878a5967e0929cf84a17ba0fa6f5d2da7b3606aeceffc807dfad916724bae35a751d21f5081f151d7c6d335cf1dec2196197bc452d55e3b31df183b917a52ca3 SHA512 da17f988a364e6c04b29020a9e27fa5d8b98fe890577cb6ca4ee4cc3df016ac6a9ea6d8ffcae564f25efa0362f3bd454f72ad3344f7571ccaa620c6c1bf57665
+EBUILD snap-server-1.1.2.0.ebuild 2540 BLAKE2B 3a263e74b717c5ff05efa6770776ed178c9e17478f3a4c7cd77e54da67e327f0e1ab64737bee1422c152a2025567db186b44c2d67af8309ef651ea18445894d2 SHA512 f4431b1eb12066aa8b598582f11d9c899efb02cd33bd8c581ee21e8d87140a057ae0575d400782239dca0b54f714805b075de11dd18bfaf8f2416965e195415e
+MISC metadata.xml 1080 BLAKE2B e3937f4eb4368ea479fa5953f77341222c601f4b4673581953ece99ad8823ac2f17908fec1ad97ec0d22026dcd495e971eb00494d606a8eed940415d241fa1a1 SHA512 aa1037f397cc57afc4f51e9db8d31787d5d6a2414eb3749d25cc10d0e7a5c270d6dfe027b80ef7d18a49b09fc52f91dce24145f4b148f4e072500d13ff546b94
diff --git a/dev-haskell/snap-server/metadata.xml b/dev-haskell/snap-server/metadata.xml
index c02d9d573bff..475be8193364 100644
--- a/dev-haskell/snap-server/metadata.xml
+++ b/dev-haskell/snap-server/metadata.xml
@@ -6,27 +6,19 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="build-pong">Build a server that just returns "PONG"</flag>
-		<flag name="openssl">enable https support using <pkg>dev-haskell/hsopenssl</pkg></flag>
-		<flag name="portable">no non-haskell unportable code.</flag>
+		<flag name="debug">Enable support for debugging.</flag>
+		<flag name="openssl">Enable https support using the HsOpenSSL library.</flag>
+		<flag name="pong-server">Build a server that just returns "PONG". Normally useful only for benchmarks.</flag>
+		<flag name="test-server">Build the blackbox testserver</flag>
 	</use>
 	<longdescription>
 		Snap is a simple and fast web development framework and server written in
 		Haskell. For more information or to download the latest version, you can
 		visit the Snap project website at &lt;http://snapframework.com/&gt;.
 		
-		The Snap HTTP server is a high performance, epoll-enabled, iteratee-based web
-		server library written in Haskell. Together with the @snap-core@ library upon
-		which it depends, it provides a clean and efficient Haskell programming
-		interface to the HTTP protocol.
-		
-		Higher-level facilities for building web applications (like user/session
-		management, component interfaces, data modeling, etc.) are planned but not
-		yet implemented, so this release will mostly be of interest for those who:
-		
-		* need a fast and minimal HTTP API at roughly the same level of abstraction
-		as Java servlets, or
-		
-		* are interested in contributing to the Snap Framework project.
+		The Snap HTTP server is a high performance web server library written in
+		Haskell. Together with the @snap-core@ library upon which it depends, it
+		provides a clean and efficient Haskell programming interface to the HTTP
+		protocol.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild b/dev-haskell/snap-server/snap-server-1.1.2.0.ebuild
index 4cebd1763301..7b95498faafa 100644
--- a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
+++ b/dev-haskell/snap-server/snap-server-1.1.2.0.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.5.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -portable,build-pong:pongserver,build-testserver:test-server
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Fail to build: test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="A fast, iteratee-based, epoll-enabled web server for the Snap Framework"
+DESCRIPTION="A web server for the Snap Framework"
 HOMEPAGE="http://snapframework.com/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-pong debug openssl portable"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug openssl pong-server test-server"
 
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?]
 	>=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
 	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
 	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
@@ -28,36 +29,33 @@ RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:
 	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
 	>=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?]
 	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
+	>=dev-lang/ghc-7.8.2:=
 	openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
 			>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2
-		>=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9
-		>=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/threads-0.5 <dev-haskell/threads-0.6
-		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 )
+	>=dev-haskell/cabal-1.18.1.3
 "
 
+RESTRICT=test # tests need old network
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base                                >= 4.6      && < 4.15' 'base >= 4.6' \
+		'attoparsec                          >= 0.12     && < 0.14' 'attoparsec >=0.12'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag build-pong build-pong) \
+		$(cabal_flag pong-server build-pong) \
+		$(cabal_flag test-server build-testserver) \
 		$(cabal_flag debug debug) \
 		$(cabal_flag openssl openssl) \
-		$(cabal_flag portable portable)
+		--flag=portable
 }
diff --git a/dev-haskell/statistics/Manifest b/dev-haskell/statistics/Manifest
index 966d4828ed8c..ee3cace502c5 100644
--- a/dev-haskell/statistics/Manifest
+++ b/dev-haskell/statistics/Manifest
@@ -1,3 +1,3 @@
 DIST statistics-0.15.2.0.tar.gz 98424 BLAKE2B 36a1b59e7db9e20ee9960f89794c2222ac8db7fa40f44b166e2d92a501b44d8d5ec06bab96b9e89bb7417852a98890bdf140f3b1a7fb27f0e034490615d84131 SHA512 7afa3e3edb15e02ff59c72601175d25f1a8baeaa1dd8561322e8e26781dbfbfcc03b2ade773269bab027d7399375f01595145fd2e2f252f3e73abc87f9baed41
-EBUILD statistics-0.15.2.0.ebuild 1478 BLAKE2B d0ae4c7fdda42798ec345e9df51f5db2c36928f007698fde09f6e9cca77975eecd0418027b48401e67d9ea4647029b8d32316ed68a41335f6985df9d5e0994e8 SHA512 07f3913b6ab94a15c3257b6026ac38fbdd67ceafebd747e18b823abf00b616a8ccd2738cde75748a7d92b21c17b66bc07749f49df8120b9bd1502c69bfb4b59d
+EBUILD statistics-0.15.2.0.ebuild 1485 BLAKE2B f58432ed0ec89609f7b8b5a768327e3843a9d1eb986e15711088cbc33d3859287be013bb6d11b5c9f8ddb498ee78d9c02ea2a2f7832fc5a4d0166a592ef6a118 SHA512 e3a724c78114e0902c81a462bf2a8d069880ae8f483202144c5b27ad413479a528b16eee3a74d24839c4e19cb0bf53f38e6733329841ad0be654e57a9549061e
 MISC metadata.xml 3722 BLAKE2B 575909585863175348b2d291c40990b848e7dd92ec117687dda029e431b6a4578bff9942a86081ec24b45577455e01b45d063082c0eb17651469ac9bcea36f87 SHA512 22a96fc6646bc93caea9a494741ad4ff4c1e487677a4a0393fd6b2051e113ea2b61a6397738aed622e47db358aa80f2ccc8a83f6413d87102903225df99bf652
diff --git a/dev-haskell/statistics/statistics-0.15.2.0.ebuild b/dev-haskell/statistics/statistics-0.15.2.0.ebuild
index 3d935d303cd1..179f429564aa 100644
--- a/dev-haskell/statistics/statistics-0.15.2.0.ebuild
+++ b/dev-haskell/statistics/statistics-0.15.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
diff --git a/dev-haskell/stm-chans/Manifest b/dev-haskell/stm-chans/Manifest
index b87ac37f479b..6428f4779387 100644
--- a/dev-haskell/stm-chans/Manifest
+++ b/dev-haskell/stm-chans/Manifest
@@ -1,3 +1,3 @@
 DIST stm-chans-3.0.0.4.tar.gz 9673 BLAKE2B ecde49051b1849a357bfd1886e6075255ebcf1a72716b82740383725e370a66a516e1c16fca8acdfe1a1c9180b3553497c798a0bb1167def1b4cd5396b2d26b2 SHA512 7882fa4d036dc3de3dfbfcb62fd54eef5bf679d2adcbdc0653a1cd4c4f1b715dab6a70465573721b141cb9a281f2d6119114445c0dc79c5e4c474250f4f22d18
-EBUILD stm-chans-3.0.0.4.ebuild 565 BLAKE2B dcaa0a58f4bb9da66b4b1721152086f45a5309a8ef092eccb864c47b6bd86e3e9c9b9909c936414f3a591ad87de050041942a6753f70f7a1db63533f57d1e878 SHA512 909f36ddca994c8bf74c76e790f87aa46ca78d398d41512988c0a23ad47a197cf141f4fcb965869ddb9c7fbcf8a7191195c92689ec6a0ace50974b92cf18cb06
+EBUILD stm-chans-3.0.0.4.ebuild 572 BLAKE2B 6ef2c84c4e92408911def10c30f1f01a2bae8964f10b57a4546f2484c2b4449d4af1868bd5dac4f4dedceb5fbc2ad83e754716ab3ecd219beddfdf0e69c6c621 SHA512 a82fb40ae769243c289c18f1eb77b1b027a2d94747661a18b6b9e9acac941e50bbd5ded25438c432ed7cd7effbb5c2262603777f9456701dbec79da6a9c825c7
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild b/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
index e7aaf5b34209..54738f7dc701 100644
--- a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
+++ b/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.4:=[profile?]
diff --git a/dev-haskell/system-fileio/Manifest b/dev-haskell/system-fileio/Manifest
index 293eff9efb5f..9edb99f6bc8c 100644
--- a/dev-haskell/system-fileio/Manifest
+++ b/dev-haskell/system-fileio/Manifest
@@ -1,3 +1,3 @@
 DIST system-fileio-0.3.16.4.tar.gz 15632 BLAKE2B 88c773cd78cf21a445c45a7b1548b77ed3624af54f54d0a0388b9c41ffe4595299e32ba4ffa5dad1234f810de73b07f47b16e8e2ad1b490f63811d193523abdb SHA512 68530cd11b25aa8a05967d3f51091ea57a5be138b672bd5373918163281c55a91b60dea03bdd22bcd4ba1d6bb26e2ed14660ce55bbdaf2737d2dd2b7e608d698
-EBUILD system-fileio-0.3.16.4.ebuild 863 BLAKE2B 3ea181b2de1d099d68d607a4e5eb80fbbf435e6ed523cda0cf982cb9994b147d80b48876df0300d2aa4dcbdca20889695aa55f522502698eda9bfdd1a7ff8b4d SHA512 1c284dfcbc59fb87045063b7341303ead33e56a4527922497e1ce83e4f79d69344de608d6fd5a91bc5ba0962eb44ef1c704b827db3f43d3990c0063d9f507c2b
+EBUILD system-fileio-0.3.16.4.ebuild 870 BLAKE2B 22a3379744132b1676417435a5bbd126f28e77092fb906a3ded2837b751110ae4dafb3bac63f4ef88fef1a1ba8eabbe8b5cd11a37f59befc6b1c1a5047ef51a2 SHA512 bfb497060818d3901ce869416b03cf4da484a227968b1fa496061ebc9e94876fbcc44ee63921383093f76d6fb2e3260b420d3848ede39e26903fa1cf69678c16
 MISC metadata.xml 758 BLAKE2B 43433b26cc4b5960622e7cab6726a3cca05ca138d9f153bd850e6c72f862dedb11fa10e5e225b0f3eb1890dd6c4318e56ec33498b7ebdbf08874f5af6e70fcca SHA512 c47573b9ba98bad4f5bbe44b6f81c47bd21bef1497b7a62d8a5b184c099f614620cce9aa3dee5b3792a4992127e5389ee229fb8432eada31d0cae0d33466e969
diff --git a/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
index f9549f2fe8ce..d78e0b8e47d1 100644
--- a/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
+++ b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
diff --git a/dev-haskell/system-filepath/Manifest b/dev-haskell/system-filepath/Manifest
index 2f478919cfac..c98a8074450d 100644
--- a/dev-haskell/system-filepath/Manifest
+++ b/dev-haskell/system-filepath/Manifest
@@ -1,3 +1,3 @@
 DIST system-filepath-0.4.14.tar.gz 16663 BLAKE2B 2a05dfcb1a7dace3d194e1d137d5d52ffc52eb96b1c43b4b9e6a97fce17db06ffac2a923537af0607451042d1ffa582567573a7f581a10a06971c4d1bddaf5ee SHA512 d858b077516ecb76e27d032fd123aadbbbb154afea87fab93f148aa8a0007587c1fb04d87217cf0b51a80e9a81ab20357dcc5e345899e1c2b6513900da1e6768
-EBUILD system-filepath-0.4.14.ebuild 772 BLAKE2B 502f308ec22c9d5a92ea3f7b640a65517f7ba0df600d2c94b63af15e1e8d5ce3451a10c4b7af003d740b7062b8c0c28153c1f0eb7701d5fdae7fa50c0200f723 SHA512 e94bc1f59cb6dcaa6b532791aed2549d2251e30a75188ef98c12f77f8cf6b6f87f235335c02170e186b2e50e340d4e70f664cfc45738d62a0b78398fb9a4788f
+EBUILD system-filepath-0.4.14-r1.ebuild 687 BLAKE2B 7bf90716c6755a46a451710696ff175070c9ffd240dfe352fa107c076507d7425fb29d74127f8935a84815f812aae33099e77f2be6a898dc9637bd215063b57e SHA512 f7f5942a55803ea34285f6eb1353d969aa4082d536a2f10d18e0f805df0def99e1ff02947aca75a918d383b90d3ce0a0fde6cf78b38b56625de7ea8595cc0ccc
 MISC metadata.xml 338 BLAKE2B fa4112369256ced33d0b999a52be753b4fb5dbb872f08746b147703861a5784add11ceeecd2b061bd46b03dc1a98e62c44c9b84f186e67623d0bef9f6642690f SHA512 774939f1858a06541af2c233323868ed1a712d41d76aa373bbfead108a34459e632105ef87343232ea5027e9666103c0950d61020346288ae642613e205dec8b
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild
index ac3f5eaa57e8..1fbd6a9a1d47 100644
--- a/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
+++ b/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,13 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RESTRICT=test
 
-RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?]
+RDEPEND=">=dev-haskell/text-0.11.0.6:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index cf583ec647f0..fe3759fb3592 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -1,4 +1,4 @@
 DIST tar-0.5.1.1-rev4.cabal 5459 BLAKE2B 6feab7587be8c2533c200cc9f57411f3cb4f5a31dbff09502c983c181b6dc0c8521e8db02fd0a3f14c3237dce4872d0adfe739452ed38252f7696dd80de80297 SHA512 aa1c41951d93ce368cffeb6a5ea43b70cca042557e0509c7901901710b2c01b715c37923e9325fb438ad83c2a50c8f227777641e9931700ba0bce6ae6d974200
 DIST tar-0.5.1.1.tar.gz 39155 BLAKE2B 8e85489e3b43044dab8ec4405413873c2be4d50cfd4a5adc80e3ec231428a120db1faa033d2e57643dad40f18a934a381f3d5657838aad42d2aa7eea951c1faf SHA512 8d0a8d3ae178570e0842a2321a7fc86a6bba28c471ec27bafbc07fc4ac0e4183f8113c99ebc7126dc71759c33083791122be32563fb0d5a2b2d39cb3b36171f2
-EBUILD tar-0.5.1.1-r2.ebuild 1322 BLAKE2B b4a6f2382dcd8d45f222866738198a7d49b79fa24fdb5fb9ce36653c6faef9bd15e3a9d48564c6461078add6fe61a0daf4e8a25525f6750a32ac2443a83571e3 SHA512 98176770a53adbf21f153f63eb9d09d49d18a65108f37a7e39f10fc497c59dd0a5a1be0672b0e834806a079693bf19e7f607a437b2416466129fdbb107dd6e6d
+EBUILD tar-0.5.1.1-r2.ebuild 1329 BLAKE2B 5782a6f69f569d579625153b6cf03dd4bb0c1a67e4027c47de231f387b8aa165f573f1c98f3a1c2f014da3f0cab42cd7b8fdcc69f5c0bc8ec90852166a083763 SHA512 1a5c44f477d135f8b03acd2f3533ee89bfff0566f6206d3ab710e5a7823de3a0628aaa7500b2bb0893304d4b31f24a96fd44f4300c52d56a0131b08085d61b82
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/tar/tar-0.5.1.1-r2.ebuild b/dev-haskell/tar/tar-0.5.1.1-r2.ebuild
index cd48fca21e69..7a0b940e3b2d 100644
--- a/dev-haskell/tar/tar-0.5.1.1-r2.ebuild
+++ b/dev-haskell/tar/tar-0.5.1.1-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/tasty-lua/Manifest b/dev-haskell/tasty-lua/Manifest
index f6d77f1a40ed..cf36c7f2d814 100644
--- a/dev-haskell/tasty-lua/Manifest
+++ b/dev-haskell/tasty-lua/Manifest
@@ -1,5 +1,3 @@
-DIST tasty-lua-0.2.3.1.tar.gz 7520 BLAKE2B 61c60b1587fd09b1db6f46066d8037034b9631e17dfd6217375df870acd91ca2558260b4e50146df7968d61ea2772765b806bcd71b6a0b91f727ebe2ccbc5fe2 SHA512 7c97f001ee2659ec48a8810505fc820607be9969151fe082157a33a308617b68be83a792b7ff1da3d492d14490fdc1b71a7d9bda2643be760a78f46fb5e98ad7
 DIST tasty-lua-1.0.2.tar.gz 10413 BLAKE2B 78d09b1c70b53b23264ee5d2b76d32be43e55e3df551792a51626201e405cd25be267cbe2c55dee2c16851877b90c30cbd8bd8b34fd341ce9024ae75e423e5f9 SHA512 0b572e4dbb793c573d28a9e3516926e7f7cba7e962e48de29c24b4da9c2656407cf3a2db21b2db56fa149ef13a70e318f44b3b5de2041863510d31e1bd621857
-EBUILD tasty-lua-0.2.3.1.ebuild 887 BLAKE2B 4ed6dbf3043fd0f3107f0e16578762851576d8d13ef1e507d762f1cc4bc1b9692731b5337a6a821f2c334ccdbef9beb2677c543f3798c470beec6b6b8eae54e5 SHA512 501e8ff88552439738a8de0bc59a39160a21facd942dc19c1427951bdf814fa8ed873a273d793e253d0531615ee669f5e5e2be21643cb6a0e07eb35cd9d5ef0b
 EBUILD tasty-lua-1.0.2.ebuild 1160 BLAKE2B 24b07156109897ecf8a8e6455eb8e278ce114834acfa9c2126ad25ef5fe26b1c3d795b33ca7fdae080cc4da864c892e2ca0e6573f1a09a3f4e77ffc49dc63f09 SHA512 bc0f0c001d65dac434c41c65ca5d22cfb8c7b862bd0b11c7afdc0c7a9749928fd1a75b0cf39439b303a961feac31af2685bdc169fb1e4613a5ad554a1cc75c96
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild b/dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild
deleted file mode 100644
index d135aac5da0e..000000000000
--- a/dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Write tests in Lua, integrate into tasty"
-HOMEPAGE="https://github.com/hslua/tasty-lua"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
-	>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
-	>=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.4:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/tasty-rerun/Manifest b/dev-haskell/tasty-rerun/Manifest
index 820e2b878455..b41aacdb20b5 100644
--- a/dev-haskell/tasty-rerun/Manifest
+++ b/dev-haskell/tasty-rerun/Manifest
@@ -1,3 +1,3 @@
-DIST tasty-rerun-1.1.17.tar.gz 6305 BLAKE2B 6e84088c39055f40e64c67d186917d3d9dde5839243584a045a0f4cadc7b7f0e81e3f046ec32e4fa13455f51fa1b287eef51ea60a17f95302caf8fa0f3130d5f SHA512 d65b35acb1b45a78a0bbe568a2118ea6580352a55b921f06974bdf59e363403f1590604e215840be990f5f18a5d8e75abd416e7d3d9b6b9f4c6c16532c31052d
-EBUILD tasty-rerun-1.1.17.ebuild 1007 BLAKE2B 7bf0ee2c4f2a7b638687f66798a6b7d64e9a47602a13968224827ad32e4c8e6fe7555e847fc67e85f45122495f38e050c776f58510313f34fefc0c4459ec5183 SHA512 0e367b54781a63dffa67751b7956df6309a979842ed8cf9b47efb6c5a253b64a021b49e834a2967f4ecd929ca9c48ba3ac99fcc9b08fd8471d5d8151aafc791d
+DIST tasty-rerun-1.1.18.tar.gz 6388 BLAKE2B 795cfa825ae49e5a91e8b25ebb1910092f2927484b52500048740b95c2511981a16bc5202182cd18e8d85676d21a8f956183508be2c9eb1257427c6328fee550 SHA512 82672a8d2f37a56e9867bb6fa2b8c79dc40869262a1853b51067e9cf463aef78c4aa3d69cda32a06c3d226ef18c951789845e57a82cbad880f29d5415a659ced
+EBUILD tasty-rerun-1.1.18.ebuild 992 BLAKE2B da0385a0b14832c9e224db4cf78abc83b876ec9bd133fe04fc82ada7dfe0c633bc46e680421e7f8776273cf75b5592ed6de2d2cc0fd738ffdbc139e067c0c480 SHA512 41a34bc3bd3920da94d16faf8284aa46b67b6c30ea132cd2dfe330f4728ced629844dc0d145407c86b97aa70ae79e8bc44ef4ffad55cff1656bb30d6e4c71660
 MISC metadata.xml 2521 BLAKE2B 073db753faca1f74d6268cdb4149f3012f0688eff2eead799a2ef75712c819efa2613d103cd5379674305f75b3afda1379646ee6625fd625bbfbd542a887b161 SHA512 f95e6ab229be9bf787cf96b168e33c61eeee2aa164ea736badacddd50dc7731c711970036308835cd9ceafa9740fa23f6336f0fdc99a9e37a99698778823904a
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.17.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
index 481cd77335de..e6477175c083 100644
--- a/dev-haskell/tasty-rerun/tasty-rerun-1.1.17.ebuild
+++ b/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.2
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Run tests by filtering the tests depending on the result of previous runs"
+DESCRIPTION="Rerun only tests which failed in a previous test run"
 HOMEPAGE="https://github.com/ocharles/tasty-rerun"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
@@ -22,7 +22,7 @@ RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
 	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
 	>=dev-haskell/stm-2.4.2:=[profile?]
 	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/tasty-1.2:=[profile?]
+	>=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
@@ -31,8 +31,6 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-
 	cabal_chdeps \
-		'base >=4.6 && <4.14' 'base >=4.6' \
-		'tasty >=1.2 && <1.3' 'tasty >=1.2'
+		'base >=4.6 && <4.15' 'base >=4.6'
 }
diff --git a/dev-haskell/template-haskell-compat-v0208/Manifest b/dev-haskell/template-haskell-compat-v0208/Manifest
index 5e3a341949db..3d7bbab0e388 100644
--- a/dev-haskell/template-haskell-compat-v0208/Manifest
+++ b/dev-haskell/template-haskell-compat-v0208/Manifest
@@ -1,3 +1,3 @@
 DIST template-haskell-compat-v0208-0.1.4.tar.gz 2957 BLAKE2B 604a9a64f84661d3babd083782844cd8c4d13138cecbbfabdcb4e933cc11233dc45eda2bb72426271b0bc859ad5babc86e8db6cb5a28d9f30e0f2b0169b4951c SHA512 00bda455148500ae49638ad8eead6516e37ab0fd6a35f5060dec73f4026dd02f0cd2be21dd8f64eadabd4b1bd6894f2bac3735a4dfc60115dfbf37dfe864d62e
-EBUILD template-haskell-compat-v0208-0.1.4.ebuild 596 BLAKE2B ebd38a814a4c60ed5af7716210556a069b5fd1223b9b9b7989bdcc4fff483bb4a9cc4d62eb5832842b998d1880a728fe487753686390b4f04a321adb60d4d2ac SHA512 f9c3d3a67cb9452764ff92b13352a132d9a7f5a71792cff5fecfda84ef32c1ebfd5e0b43f2ca62b1bd7f854f6e19d6faa3ef04adc356df53ae0b8176861d059c
+EBUILD template-haskell-compat-v0208-0.1.4.ebuild 603 BLAKE2B b7c1d74783a33d79c916b77317be6b0cacea00d60c89e7df05da4a99b849f99dfc926dd71ff4f0668270f274df44a2eb0cad0a753b8a891afe50ef3773e99ac9 SHA512 b30ab6e37eb5252879ae936ffdbfc961bd941433f26e3de27e00b218dce71bd4b07c3b7a0e91c0a748d6d8855571cc91a247a0036475f02b27d017de11655cc8
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild b/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild
index 2b162c42cfc4..7e5970695d6f 100644
--- a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild
+++ b/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.6.2:=
diff --git a/dev-haskell/test-framework-th/Manifest b/dev-haskell/test-framework-th/Manifest
index 5fc3b0e61bab..ed8395f5c631 100644
--- a/dev-haskell/test-framework-th/Manifest
+++ b/dev-haskell/test-framework-th/Manifest
@@ -1,3 +1,3 @@
 DIST test-framework-th-0.2.4.tar.gz 2977 BLAKE2B f43f3f964eecfba401db1fb574ab9ef4bf9b575251a60f196ddd451c23f8c29ea44f90d441eae2f5d923d053061a247820fc0a399e59e1eb088ba31abf38ef44 SHA512 0e8b6898eb7bf481bafb0c9ff9caa615dbf768e538e26b15ab899c5c9a1ad6bd6ed76ef93cf9a823706046d41f49fbb0cbe660bf846e59a608a0e5d21e89686b
-EBUILD test-framework-th-0.2.4.ebuild 751 BLAKE2B 1ebd22db456c11fc4d6246c98447fefe662b0409a80aff25465931fe67dde5d8fa2d32801bae4dde8b3f1a80702d59ea3651337dd9ae358b0abc8ba2c2b4c6ec SHA512 c8f3652d0d31b4c9d66037049307eb26829cac9d3be118fdc03786d4d867b4feac8bd13180449a51de05aefd0c2b411070a066cafd18f44759326407897218b6
+EBUILD test-framework-th-0.2.4.ebuild 758 BLAKE2B 42fc293182e2890457039ddd3fbefaa1d1c65a8fa8b224f01bdb6a81bb7e8da1d2b4dced85e9dacfc61b0df8df5c5dc61feb93ac0db7dd610dca98e4e58eae5d SHA512 fb89d4882c7c0db0d200c5079696279321779f0c44b29e14e74e965dc4fac4660c71e8b09abe2a584a26eeed94d4141fd9dcaff597c4a3a441db816bde7f6401
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
index cc8dadb87ad8..8c51c3866b5f 100644
--- a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
+++ b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/haskell-src-exts:=[profile?]
diff --git a/dev-haskell/texmath/Manifest b/dev-haskell/texmath/Manifest
index 644a8f9183ae..a91d71728015 100644
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@@ -1,5 +1,3 @@
-DIST texmath-0.12.2.tar.gz 1807359 BLAKE2B 31da9ba7186eb9140c2fe70ba7011e91c00c290ef4b099197cdfb81ee2b992bae73756973b77d6920cabadef71739eb7208136fd2a589f9b81a6afaa338b296b SHA512 89f3dc5c1042980abf06f1e4d3ca6806922f2094c6d7ec2cc1e4673ac16a7aaf73693c5fa5526eac96d6f9f5c2f894f2341295bacebb7216ef49eb8be7cc0424
 DIST texmath-0.12.5.1.tar.gz 1606982 BLAKE2B a58e033176a6a9ba136590b8403d577c24c84cab983a6ee53ba2ae4564c05b681a31859aa066a3cb5aa3b18b07eaee9266964018abc8c30cc9288df15160d8f4 SHA512 77f3b008b82a8a1946108f8bb948d5d43121bffe2b2e22220cc8eb404884fa4c960bff07d7c8a5c75d5cce53d4039a8e6edd190fc69f5ad4da5b41212751f897
-EBUILD texmath-0.12.2.ebuild 1230 BLAKE2B 74d91f654940d8c88699647d377be2908709defb1697c952d93feee66ca8735e21c4e01728708d8c97b5ed6d1af60538dbc51b3f95fcae6024cc1a8ece9c79f7 SHA512 af9c5fb5faf2c1490f0bc6c67e21d6e7ceb7185f2f9736ec020957ad35ddfe43ac6e9e5d9d9a55f075af8f3014494c3dfd924a059ed94c35a12f09c4cda60854
 EBUILD texmath-0.12.5.1.ebuild 1506 BLAKE2B 487c344d174e81e6e502a748e11b8ed45b1cd19775484267c7abed8ab145b3d3b301d5df72e0ac4f9820988577c02476479de2390ae1004055539fdaac4445eb SHA512 ec2bcb0cde7151ba026ad4faa3daabc5497cf76b683fc9beb32f18eefb26e285ead355ad49fadd14d3931ff2478da33bb1a213643452b050cb490f54766fb8c4
-MISC metadata.xml 968 BLAKE2B 05f4a11bb50a3effd8d877a0ba2c3005616a20f87119ed7390a485610ec82b92a252daf92b18ecdd0c02b7735816cc58be494d277ad0b7082995a919f2440137 SHA512 cb799257a5c255e964e5f516331ae11f844c55531b0d8bcc62be22542f4adb450f698bc16c7c03e30638e7eea178c91db74e72defe5a2d8fe1e161337473d247
+MISC metadata.xml 447 BLAKE2B c354596e76ee9dbe9ac9dd04c1dea9a526a28ac0ef38423ab516be7209f6cc02cb7ff118d4dd18f883a82cda4fbc1b7f26ec2b649a97e59afc2b9a28863b3a1d SHA512 f53db773e5b0edb53b75fa16878fbccee7ae8b3d01ea45822ea7d63443e64f17302b4f1819eb78b5e471726811b57e9e77f712df495439f3677066f272f21643
diff --git a/dev-haskell/texmath/metadata.xml b/dev-haskell/texmath/metadata.xml
index 7364f9dbea9b..77811c73b748 100644
--- a/dev-haskell/texmath/metadata.xml
+++ b/dev-haskell/texmath/metadata.xml
@@ -5,22 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The texmathml library provides functions to convert LaTeX
-		math formulas to presentation MathML. It supports
-		basic LaTeX and AMS extensions, and it can parse and
-		apply LaTeX macros.
-		
-		Use the @test@ flag to install a standalone executable,
-		@texmath@, that reads a LaTeX formula from @stdin@ and
-		writes MathML to @stdout@.
-		
-		Use the @cgi@ flag to install a cgi script,
-		@texmath-cgi@.
-	</longdescription>
 	<use>
 		<flag name="executable">Compile test executable.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 		<flag name="server">Compile webserver.</flag>
 	</use>
 	<upstream>
diff --git a/dev-haskell/texmath/texmath-0.12.2.ebuild b/dev-haskell/texmath/texmath-0.12.2.ebuild
deleted file mode 100644
index e4edd72795d8..000000000000
--- a/dev-haskell/texmath/texmath-0.12.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	>=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/text-short/Manifest b/dev-haskell/text-short/Manifest
index 8ef61d1a7523..251ccb0fe884 100644
--- a/dev-haskell/text-short/Manifest
+++ b/dev-haskell/text-short/Manifest
@@ -1,5 +1,3 @@
-DIST text-short-0.1.3.tar.gz 24435 BLAKE2B f0d571f2c84ca47ee2d4f0aef0a98812880f68d9971e73abd40f2b8d27cce50052a67f6f2a5d19d683093fabed490082df72e29bc8e43123b53b388b9962018c SHA512 6d7a5379dbaf28a201dd44229959a293acb5ff57c4659a6a34af37e46b2e6fc5eb61a00ba26d36dd08795456246429ec20236af8e342fd0d03bfcf6d06d69428
 DIST text-short-0.1.5.tar.gz 25113 BLAKE2B a3ed468d60d4a351ad86600f5d6e7241ae88b987746fabc8ff79f6e0f0c687a9d5d5e0f4fcabb2fbf7c48ce2e3a37b798e478d6c8239760974e7a55835cab1aa SHA512 32f09a1abc37ddb3f85921d80629355f68b2e68531f14318907e792a8eeb7d4a258bfcf7d45710dcb67f85fadfbad2bb9ffdac27a912aefc4296dc1818585125
-EBUILD text-short-0.1.3.ebuild 1348 BLAKE2B 9dce2c4775e803c5620c336d74e39b303928368af2fab518cbff7291fcf86f3ba9e71af05c29aee99eb74e70e92a756d139612d3e28ec90f6d6bfd80cf6fb983 SHA512 9fa66fef824be7dcfde5be75a08f59e0c2125a80a8e653a349cb233a6f3907ca2c6eaadd0dc082d4d545fb2d0fa2fd215e8f569405323f79ef49a1c2019ff726
 EBUILD text-short-0.1.5.ebuild 952 BLAKE2B 6bd1b580b324e4c2283fd4a357af4c4c59f5b119dfa5a0b468767578bb056fc8777ce3e548cac65c33cb5d21762c67d21c6794ca44bef95ce0b64b8e71b9c352 SHA512 ff9602c46cdd9e4f3233a6e3db184f1cd530351de2196325d697aa5047b059b1d53ecd37741ab1f26714c5078b45db98d8a132311bc1957d8b7f618bcc484e52
 MISC metadata.xml 872 BLAKE2B 91ab79a1fe67e92a0d86869ef6be2bf2dbcbfb0cbda3425c9dc2b3ed0e494fe514b06bb0604eb1f5f8ecb8c1d6425d8dd0b213ac31f2d77c55e247cfac04ab39 SHA512 3c4d2162ee00fea6c378da26e4003bf3aafdbcb4df4024ee53b629f4eea49ce4eff5c2f82d5c3b1cec7a5ee9b352e6dbd4acbccb93705a9fdc02742dcf617e03
diff --git a/dev-haskell/text-short/text-short-0.1.3.ebuild b/dev-haskell/text-short/text-short-0.1.3.ebuild
deleted file mode 100644
index a6f10f5a7f4d..000000000000
--- a/dev-haskell/text-short/text-short-0.1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Memory-efficient representation of Unicode text strings"
-HOMEPAGE="https://hackage.haskell.org/package/text-short"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="asserts"
-
-RDEPEND=">=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-instances-0.3.14 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tasty-1.0.0 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-hunit-0.10.0 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base        >= 4.7    && < 4.13' 'base        >= 4.7' \
-		'ghc-prim    >= 0.3.1  && < 0.6' 'ghc-prim    >= 0.3.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag asserts asserts)
-}
diff --git a/dev-haskell/th-lift-instances/Manifest b/dev-haskell/th-lift-instances/Manifest
index cfcd8ea6f6a0..7e45c10a3e61 100644
--- a/dev-haskell/th-lift-instances/Manifest
+++ b/dev-haskell/th-lift-instances/Manifest
@@ -1,5 +1,3 @@
-DIST th-lift-instances-0.1.14.tar.gz 5712 BLAKE2B 02fd3b2b1073a49c58625237514bd898d0fe7147225b52ba11658d9fea5fc6c6d6f392c92315fe5bbf529c11a263964a2bd3310d7b451452fc548212e44b3bcb SHA512 b0050866a250c7a5f55f47307e6482c49373d1cd09372c38b3c5c58883662f794a0e5210b9ba7e5a60536fd20262aa14cb7e94edf576cc69be5d2b33f21d21be
 DIST th-lift-instances-0.1.19.tar.gz 6113 BLAKE2B 75cfd2a7f8c80fe3cd03e66c8c6fa104f79167de1ed75db9b46e94d27c93c5650be13068c3273fa7d9e401f6017306796acb8806a055a856176be0a88bb0d5ba SHA512 d8a38531a9a61dce426c43807e3764abbe22102e8886d9d23e76d27735bace672e10472b77b27dbe2fbb74bf6e32a5d528d690a608a81d8dce9963721fad6349
-EBUILD th-lift-instances-0.1.14.ebuild 841 BLAKE2B f95ab4e08645663ef36cd98a56072943af681aec8c7e65b89ce1d8408b2bc4901f13c11a5b2318c70bae7d0b19fc12769d623adb13bb47fdd3be52b64b1232ed SHA512 b5d9d6af14ba556e4f2a3a536e9e2a44788f9d3607058fdfbbb4b5545944944a924ba274c7158f3cb75f76efec68af5c319cc7e1bb871bd2d538ea0e1c0ef7ff
 EBUILD th-lift-instances-0.1.19.ebuild 725 BLAKE2B 7933c6b15da0b84761e2f64f2e3a97d7443b341555ecfd1c6de660af913331afe0473add3d93e4d992acc1a332d723f7ca078d6003455cffd2adabb34ef3ae35 SHA512 1d743b9e6c5616b4ebd530da2c0d8f7612a17be272d1f613b32f65aff64feeff8172bb9fc31d6618497ba433adccdac89fb4bed01f4cfc8cab568d2263a9909b
 MISC metadata.xml 441 BLAKE2B 17563f7fd5fe592f031c6146f9056c0cf88feabda2061b21a66d0f6afbf596d25b31507602eed60449c25ac0293368d55be091a391942acc4a7a72faa7b82be9 SHA512 29a850eba3003930862355d0b0c7bbd18216c34248cf61a6eb9f15daf0f5374659f05a8352834297880ea8343d94dc23fec97ad69fa979a1b48a091484d8dd0c
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
deleted file mode 100644
index 6cf4d601a7da..000000000000
--- a/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lift instances for template-haskell for common data types"
-HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-haskell/th-lift-0.8:=[profile?]
-	>=dev-haskell/vector-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/nats-1.1.2 <dev-haskell/nats-1.2
-		>=dev-haskell/quickcheck-2.6
-		>=dev-haskell/semigroups-0.18.5 <dev-haskell/semigroups-0.19 )
-"
diff --git a/dev-haskell/th-orphans/Manifest b/dev-haskell/th-orphans/Manifest
index 907a305fe787..f6db6e6b2e63 100644
--- a/dev-haskell/th-orphans/Manifest
+++ b/dev-haskell/th-orphans/Manifest
@@ -1,3 +1,3 @@
-DIST th-orphans-0.13.10.tar.gz 8680 BLAKE2B fe03bfbd6ca27a9949573cdff3c496088fd6b082c6a334960388b45bc0bce38d2675ca9319c627d4d7b0df831fb497bea2d9dc753c76ce1d967e9f423b3562f6 SHA512 bdf9cc69f57b97772f2ef38dcda61ca352069ac07e45c85efdcabec9dd3a538f33b3d65cfdff77185c737b8050139e232c4ecf677d89fd79aa5b74238b8af651
-EBUILD th-orphans-0.13.10.ebuild 904 BLAKE2B 6b093628db0ec18ab441cc64e8d962c4b148fb6220fd00c1ae49bdca8cf9158623eec469fcd8d9662c92c6841733b5ca7e9009059b7e6611bd31699afdd17fbc SHA512 093b81fb64f922b0a797c673484e92a469cc2ed49cf115953d1c7517490d8988ad7370f457d0064b7dbe5e5175656615fc48ea3bfd7d323101415b2acfbf062d
+DIST th-orphans-0.13.13.tar.gz 9531 BLAKE2B 742408b0ce6ceab0654b02b63fc0ad154005879b066602c5106485713b295aa2278105e04c044d777ee9d741325c8d9fe7ededc377016c50cda262090d8fa864 SHA512 94747e89c8471bd927810180af7572c5150ba7daabc4f45b41afda3210a42889b1fda05fd7fcecee2b1c2a92ea2ad195f924b44d22f0d269de2c94ade57fd335
+EBUILD th-orphans-0.13.13.ebuild 770 BLAKE2B 2ca9752fd4ca6e9d61f992c2814d7bb94af016803335957796bda28a9ea1af4ea05040ff85956ffec487951910797f4d51b54633bd0d40d81712ce9328cd1af0 SHA512 e7ac642338a508fc85af86ff8cc8874132288c28cdebaf3dff4ce6528df01640d1965ce6ad5365caffbce859d90d499ae970ead760c084b4ba2d405634d413bc
 MISC metadata.xml 508 BLAKE2B 15318ff4be26770796c2332e5c1c0e87dd577bb98aabb6bf3c1fbfe67589df17b3cfc25a3d75bdcdc1ab410100a80a431d793d53fdd8f0801585190d22e78aaf SHA512 7a254b1f82a5918f2d291ad8d686c85de85b0299def2cc8cf76108b8cad4c4bc481e93a124f6778c8f7f3cbd870a325a50f6ad61a4ae6e8c2fe2f7a617258be3
diff --git a/dev-haskell/th-orphans/th-orphans-0.13.10.ebuild b/dev-haskell/th-orphans/th-orphans-0.13.13.ebuild
index c2a10a9d6d76..8fb2051d3986 100644
--- a/dev-haskell/th-orphans/th-orphans-0.13.10.ebuild
+++ b/dev-haskell/th-orphans/th-orphans-0.13.13.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.2.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Orphan instances for TH datatypes"
 HOMEPAGE="https://hackage.haskell.org/package/th-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/generic-deriving-1.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
+RDEPEND=">=dev-haskell/th-compat-0.1:=[profile?] <dev-haskell/th-compat-0.2:=[profile?]
 	>=dev-haskell/th-lift-0.7.1:=[profile?]
 	dev-haskell/th-lift-instances:=[profile?]
 	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( dev-haskell/hspec )
 "
diff --git a/dev-haskell/time-compat/Manifest b/dev-haskell/time-compat/Manifest
index 42ad8fba8bb8..73dd5a836d96 100644
--- a/dev-haskell/time-compat/Manifest
+++ b/dev-haskell/time-compat/Manifest
@@ -1,6 +1,4 @@
-DIST time-compat-1.9.3.tar.gz 50050 BLAKE2B 9c6f457945a975d88fe1784daf7dbf4a0b96c086cdd05af97a3b0d9d2379777c985b8b73dd592f588d4e09aee2fc987ed4b97efd4d4199841318114b379a8c5d SHA512 937020b42b739a9ee2da3d8105181adc45d80f7e8b5af81c7f43dfbf567f33c81caf0e34de8896bc139f1eb4e40efd0715e9f6e5a4d542a1a86c4ea53151cf2a
 DIST time-compat-1.9.6.1.cabal 5033 BLAKE2B bd54030fd2ea681d4b50eebbf05db7a8080c0023aaa845d285e4b9c15c86d9b578446c690d5053c00da27a28ee77be5ee4a728a9d120f98271f57128b4fada2a SHA512 9643dcfd5e6397b00b16547fc5eff687363d5921b44293d2e80e665392ee853315da84cfb3aa91ee8f225bee1966b281af80a5a549bdfa10b42444f27b097890
 DIST time-compat-1.9.6.1.tar.gz 59964 BLAKE2B 0a19a9692100d47f14643613539061104fead78056d37ff3aededf3d15ef00e23aa6875b77b56a92138818511b7681197ff55fb8adb6a0d6075c7e02bf0fe397 SHA512 ca0b19aa5e7948fd7d9fbd8ff5e1b0f93a2d8d410d515e7078b40370e7d9fc363c111d53551d57a0320efb0894bcc2210afa8fc04da9f003ded626f53b7e58ea
-EBUILD time-compat-1.9.3.ebuild 1481 BLAKE2B 5c1bb85d1b748888124e04a61cac8ace0fc2c212fe1dbaeda469744bff1d3947100ac6a539bd0c04a7ad8418d6015bb65d22c6c436fcd288851b0215176bdb28 SHA512 c9a34e3220e8b343c491059bd7a717f07b37eeeb081701458b8ed7e83eeafba3f0f730728e7dc8d2d29168733efeaee94c66071d1b642a184a74cddc4968e992
 EBUILD time-compat-1.9.6.1.ebuild 1611 BLAKE2B 850a8e316fb4dff4613059ab5dac85e30fb9a5463743f8d51f143949476151ca7cab81e2ea7783f305e0ff339fad3335692fac7a5be5e8f31f74f192316a8af3 SHA512 85feb1c9c27f201c76d439b3d355a689c7f9f7e739d5e98ac86f71f5b6734fad4ca4ee749bf7effa7be4f06aba766a3e97cb13e1d38d651cda9a8e2e214f56a2
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/time-compat/time-compat-1.9.3.ebuild b/dev-haskell/time-compat/time-compat-1.9.3.ebuild
deleted file mode 100644
index f6868dc7dfc5..000000000000
--- a/dev-haskell/time-compat/time-compat-1.9.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="This packages tries to compat as much of \\'time\\' features as possible"
-HOMEPAGE="https://github.com/phadej/time-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires quickcheck-2.13
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12"
-# 	test? ( >=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.12
-# 		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
-# 		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
-# 		>=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.3
-# 		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
-# 		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
-# 		|| ( ( >=dev-haskell/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
-# 			( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 ) ) )
-# "
diff --git a/dev-haskell/torrent/Manifest b/dev-haskell/torrent/Manifest
index 8e5bdea7d896..da6ff78af968 100644
--- a/dev-haskell/torrent/Manifest
+++ b/dev-haskell/torrent/Manifest
@@ -1,3 +1,3 @@
 DIST torrent-10000.1.1.tar.gz 3977 BLAKE2B c1c487d6ef2d9da68cf3bbe24097824cd56a53276e8577a3dd28f949b818b8c396ce8d65eb721a3f9035969121ba4df9ca13a6f26ef085607f8b5e30d5ff1560 SHA512 db4c18ca8df4fd32c45d6fc01333a5ef083136dfd5833f13300161ca393b6f3ebb2a8ca2b2f7e2bbf7019eb9484e0b3b067677a63fd41311e3dc7a17111f5a6c
-EBUILD torrent-10000.1.1.ebuild 611 BLAKE2B 4eca4dbada252fd1c87661e3c2b86e4ec3f8d0859b20bdd7e54ec9b973daa9487f64605c73f4f686f7989eb490c71ad44e04a47e84de4f851c193dd250a6e069 SHA512 7e884bb5ec2e5012049a14c25285dbc1d642723dd9c1ce9a97cf05dac50ace0eedd155d78434e16bcfc1c73c20071d3275f31f7a60dfd2a51871f68f3b0169f6
+EBUILD torrent-10000.1.1.ebuild 618 BLAKE2B 505db622d9dd46150ee657498c005f0a4a29e10dbf8cf4df023eb755a075049341774903e21bdeb008907695ee155d355f58f72dd3394fa1d866f2221053afb0 SHA512 61df521f6e407e69c27373896b22f4bea3298d36b30283202594b2a3863722ad50a6c348b2cf841d3439cdfbee41a392e561b4e3e2c815e3f5adb1cea644de42
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/torrent/torrent-10000.1.1.ebuild b/dev-haskell/torrent/torrent-10000.1.1.ebuild
index f02322ee90d6..47d5e12b403b 100644
--- a/dev-haskell/torrent/torrent-10000.1.1.ebuild
+++ b/dev-haskell/torrent/torrent-10000.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
diff --git a/dev-haskell/trifecta/Manifest b/dev-haskell/trifecta/Manifest
index ea60f4bd263c..e9103fa85d26 100644
--- a/dev-haskell/trifecta/Manifest
+++ b/dev-haskell/trifecta/Manifest
@@ -1,5 +1,3 @@
 DIST trifecta-2.1.2.tar.gz 60393 BLAKE2B eeaa0fdb855b09f8aaea5ef9b1f4c2b465d8f07bc05ced926bfbbd43c256611336e7153edf7ad57853796d436930cf317fc9433462477ce37f5cc417b45f777d SHA512 33ee39932235d1963b44ce54a59c1b5f193db9f590f30ba272f4e10965582c3602f822328b7e6e98f09ff4d3e14a8e324375353246f3ff0815070a7d94916c2e
-DIST trifecta-2.1.tar.gz 64406 BLAKE2B 31829c010ad48d9c506863138379d4694318235c3cea7f43ee46bdcb22fef4ccd9979990150486813a3b0f6297c34597888cd52e987f0fe8102882a217a85a7d SHA512 0929ee4a3d9a53c211b13a711814b4b6ea488ad40f373befdc7e8a479b2a95c4e97a19381873af54d377ff2af49782677fa2ea892ea69522c242e245debd3a25
 EBUILD trifecta-2.1.2.ebuild 2074 BLAKE2B 8f158989ea2e14f77346b815bc004e1f1a4cbccf519e682208de36fea270138cd387c52764e7ad5b723a2eced51369d218b5cb5f631ada41b5034b479c62de6e SHA512 5bacdca832562012457b76d094d1ecce9a1d72f2cd86fc4de125a7ca537a6b3016f6cfbc05eafd604b4a5ae33319562ef522910ba31b3e98ba37e8318b145515
-EBUILD trifecta-2.1.ebuild 2346 BLAKE2B 282f9e3e4920c067fd19897415618acdfef7d8b258fb6017c43f029f42bdfe91dccba54670b85a2ee7a9f7fe25051368927121dea7f737bbbd9d6cf916b6567c SHA512 768337ccb4af0807a1c37c9d2703d91518ead5b4b37e428761f02f02dd8a2f897184ad239160702121f5d99f0a83a2d8067a71cd9621b2e2e8d2d26682523379
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/trifecta/trifecta-2.1.ebuild b/dev-haskell/trifecta/trifecta-2.1.ebuild
deleted file mode 100644
index f1145445332a..000000000000
--- a/dev-haskell/trifecta/trifecta-2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A modern parser combinator library with convenient diagnostics"
-HOMEPAGE="https://github.com/ekmett/trifecta/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
-	>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?]
-	>=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2:=[profile?]
-	>=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?]
-	>=dev-haskell/profunctors-4.0:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/reducers-3.10:=[profile?] <dev-haskell/reducers-4:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unordered-containers/Manifest b/dev-haskell/unordered-containers/Manifest
index 75ae39091981..dbf35c8cc055 100644
--- a/dev-haskell/unordered-containers/Manifest
+++ b/dev-haskell/unordered-containers/Manifest
@@ -1,5 +1,3 @@
-DIST unordered-containers-0.2.12.0.tar.gz 53070 BLAKE2B 54bc9779382d4b83d6d6e1c352326f79da69ad75ec27a125ee3bf2cd784c8ffc3ed733fd3db285ff1c0dffce94653ec0bef4694eeefdce682f1c6abf7c828581 SHA512 516f45494c598e33301df08d2877fae2484b6574cb554def35ab3ef31e29424a140115be81b88cd7aa7a8c7fe7a77354a7379c62a65aa00cd8c5c674ee1dd00f
 DIST unordered-containers-0.2.17.0.tar.gz 54110 BLAKE2B 089317f81ce422b1ad54b20bf6c4724a13db855b34e6b4c634e36ed7e897927d2390559f32e8b1f1c38b206c0e8802e066d1f20b3b0a9c3c69a23a01ca993a1b SHA512 e0705e0ad9ec03ad192a8e4047aa5c8a1da6268075be28f423d3f3e7d330084ec02d8499b9f5ee8686c4dd36c67758822d58484155f3ce2cfd210e5bb1a3bb8b
-EBUILD unordered-containers-0.2.12.0.ebuild 1204 BLAKE2B 7253c4968a349241dd03c10e9f1d28a04d78330eb57d9c4d97864923137dfb108c45e6332d6420476ba08cced4e8d1f99510abb56b5fa36bd39192164157c068 SHA512 192a30c296c21e5059cb46219e568296a16974801ca950c4429d13018e6516ef3ba99b035ab5fa24333c8f423867549fa78f388a7534d9089b4cfec494ec9581
 EBUILD unordered-containers-0.2.17.0.ebuild 1031 BLAKE2B a4f36574ba6c64cd6378daa41e1bbfa0774cf3f4a1ec7364a57499a984e08afa645b98842069b38d4815d2ddd7ebcd3358a89f049804cd37445e101c76538b7e SHA512 e79533c92096dbd1005f9c5eab0da87fc0a0c02c29279b35ba55c21436b35708e02050219acc6405d195079ab0ffe0b5bccea15013a5e9890facb39ab7e69839
 MISC metadata.xml 675 BLAKE2B 0558c755df81a5a948d84f2b1dcf91e313e3211747df92d0cf094720079184ad32b9739224eeda0a8d80f99a2a126597ad409eebd9b8ca454342ba0a5d3960ef SHA512 e4dccb120f5c5f31d1b36079856f533ece40be9f8a4c2ccc3bd88ec43691466f2e3d0292bfe0d4e74d241fc7719c595b3f798cb22a25a4f38f3770397d2f5765
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild
deleted file mode 100644
index 37b3a71fc575..000000000000
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-
-inherit haskell-cabal
-
-DESCRIPTION="Efficient hashing-based container types"
-HOMEPAGE="https://github.com/haskell-unordered-containers/unordered-containers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RESTRICT=test # circular deps: unordered-containers[test]->quickcheck->semigroups->unordered-containers
-
-RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-"
-# 	test? ( dev-haskell/chasingbottoms
-# 		dev-haskell/hunit
-# 		>=dev-haskell/quickcheck-2.4.0.1
-# 		dev-haskell/random
-# 		>=dev-haskell/test-framework-0.3.3
-# 		dev-haskell/test-framework-hunit
-# 		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-# "
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/utf8-light/Manifest b/dev-haskell/utf8-light/Manifest
index 514ff32dfe1e..a45a8d5edf41 100644
--- a/dev-haskell/utf8-light/Manifest
+++ b/dev-haskell/utf8-light/Manifest
@@ -1,3 +1,3 @@
 DIST utf8-light-0.4.2.tar.gz 5821 BLAKE2B 50f9ed9201458c90306200538e583f9a696f99aac394851da430dd69263789dccf9c4b188319bdbfeaec3542eccbbe7f4b336028953d513973b98718a4a22c18 SHA512 83777117a24a4c456134c0591e59ec010cbb938a5ddac8fc68b8204c7999aa2a36ab158b14e5b7bded1ca9cc4596f448b0e7aa5d194081130d7aef623d7c6bc0
-EBUILD utf8-light-0.4.2.ebuild 535 BLAKE2B 628387b4a5f312bdaacedc8e8fa7a421bb529100005b33a5699ee9e8c033872a804b3e8ba252fe01a4973b31592840f7c039c075503fb839a76208d33f8a9f65 SHA512 97e316c7ac2403e427c0b6299e88bd1280a884933f65087dc7b4868712ac7652535edce1972348d9b6689f387e307a09745f2a85e713e0534cc588d4841523bb
+EBUILD utf8-light-0.4.2.ebuild 542 BLAKE2B 76aea182d0aa6d3da07ee0fda5a1a2f1b4494480b7cf3ffbe4e1041270668b6789131541f0be6a3d5c87b8d0fe5314c82942502931f6baeba8fba314a152df88 SHA512 b79c7f97bde8d4d201e1bbd2e385c852cd73cf04d8a00a97b308af68ab0f3dd8909c157dc985efada51e837b21218d1176ec88e41c46dfb8387f230ab7c63831
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
index 9a0c0ad3fbe8..79b95f644dae 100644
--- a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
+++ b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/uuid-types/Manifest b/dev-haskell/uuid-types/Manifest
index f394b613a17a..34429bf7cfd8 100644
--- a/dev-haskell/uuid-types/Manifest
+++ b/dev-haskell/uuid-types/Manifest
@@ -1,6 +1,4 @@
-DIST uuid-types-1.0.3.tar.gz 11999 BLAKE2B 71941bf6abf554e2fa4fb64ae2cc5d61354643c07fe757920c19b60f762a7ffdce87c222d1f1a4a993b50f95e58ac4a011e2ae10c73108a6b71f65ebff209600 SHA512 039bccea9ee22388a50e3e233c95afdd3a59f01aa5f552dcd8e8c1ded8f9da210933c58a4d9cc0913c768b587c24ee27fa0eed15e531846ea841b666f513df9e
 DIST uuid-types-1.0.5.cabal 2608 BLAKE2B 93d8b89dd8f369032ef0035db3edc07eb21e0985d59c43f17976e1b9f6136ea75e059e5fb1930f9d0ab450846a160b9a5eda4691b13e6aa3bc00de6bd3008d31 SHA512 e2bc98a0f1ddcec5b5f3d26d6f5ec9a7ba5d9c51be9dc56166d975d28753380024623daf694088030fd8b24f9653ff798ce326931a1e7887adca27c15dbe8649
 DIST uuid-types-1.0.5.tar.gz 11922 BLAKE2B 82da240f63c255be7c64ddaa6b6f49e022446afbf814b6cd3f9607fd43c0bf33e5d92b0586477384d46b4906f15b17f72564227ad090da54c03b1c21608f5fcc SHA512 0e0821a426120ab63d991a6cd39ded65a89472751ada4d5fb5e4f12177d8e797ede3b6b74d6817ce260d6334adeb42de31b0073389f58a27a06ec8ea4a574ef6
-EBUILD uuid-types-1.0.3-r1.ebuild 1356 BLAKE2B 7451633c6802fe88dd170909b55c747a8234cd8981bfef9d68ddd54029a3f11f6961a77fde1cf53200443a16f924d981e8d1409163aeb97e77806c9a79ca61a2 SHA512 b598cacc0d781efc0baec5d60102527430ca442fa60dda8d8800eee2d6d45624f1fe4f269a05fa27407e70abbcb23c4269fadf5e4eec07f21e2835c18c3ff5c4
 EBUILD uuid-types-1.0.5.ebuild 1443 BLAKE2B 07351da053cf94d31d35ac3914b627b14ba23aac6640cad3c6f2056d07ffcc7ad2c60e575038a4d4b778a00e1b609ca030692a7faaf9f3e09626f1e63661d3fe SHA512 23ae42c98bfc852fb851c95a55797710bc5d914ed1ed92e602ddc4090edd8c0a8360312cc474dd48738b3f1d5ce60b52a74057bbf6964b804bc3c976dc51d957
 MISC metadata.xml 548 BLAKE2B d396892798ad896270a7700c284789a3aa883b7370a459e9f9c8e0216bf10487a7d3427d5f6aec29e35f6b5f94f706314afc033174440d763c9654509ff51c38 SHA512 9b9dcbd53a6537d464d369775dbc652dc3204298ca8a815991163f9eb0b2f22ec4757f578461267ae9fc0eeb11dc1d2b4acd216228e7df1d7d9653dc4eadb94e
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
deleted file mode 100644
index 8df1fd9cf77c..000000000000
--- a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type definitions for Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >=2.4 && < 2.9' 'QuickCheck >=2.4' \
-		'HUnit >=1.2 && < 1.4' 'HUnit >=1.2' \
-		'tasty >= 0.10 && < 0.12' 'tasty >= 0.10' \
-		'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9' \
-		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
-		'random >= 1.0.1 && < 1.2' 'random >= 1.0.1'
-}
diff --git a/dev-haskell/uuid/Manifest b/dev-haskell/uuid/Manifest
index 1188dc7ccc55..f8f65fc916ca 100644
--- a/dev-haskell/uuid/Manifest
+++ b/dev-haskell/uuid/Manifest
@@ -1,3 +1,3 @@
 DIST uuid-1.3.15.tar.gz 8815 BLAKE2B fec665690dc6fe05e9b7083700ca5ba2723d9bbd7cdc7f8770359d26b9b4b32572e15b686bc4589a3bed2cd25caa02cbea96270ea2e373941451aa6f315df401 SHA512 acb5c17b809bee5ce2f1591f3382a7c3a57e9d20a47d8f47be717b0e7fbfd803603810ebaaf88597bcf98dff698f4807dc7d8122a0d7d36785a47e0e065fb59e
-EBUILD uuid-1.3.15.ebuild 1479 BLAKE2B 3b72290d246bd87aca7ce29be1da67bef5035aea6aaeb984ec875973d46cf385ef19c356ab0b1db2ccc9ced9101b981d0f94575a0878f438b226559da2375924 SHA512 fd902950410b2835b9001a6eae08f61a9bc42dd15f49d91817027eb15de285b20082f2f326b824f27859109e0113ec7e4bfaa646e178c7a8f31b51ff27a87dda
+EBUILD uuid-1.3.15.ebuild 1486 BLAKE2B 27fe99841da91989dd1011d5bf76f54a4650275e72bbefc4e72f179801eae9a3ca7d59cc2f2ede3f2e5d8f24a87a5df0f947863636161e10d681f6585cf390b0 SHA512 6552e4d11f7a6f74ae35ecd7589ac87d356c59102eacb9856bd9be6a69e026acafd278b432672079052709b6d16b2c304b9454c879c0764a8b52997d0e0d7f28
 MISC metadata.xml 328 BLAKE2B 28dc31dfc087b15e03a61a12ed766c5fe3ed9d328e8f6f461618c235cba25c3032df539920164bf31ab04ccc376c1d02815723a2d560b817bdb6533cbe9aea3b SHA512 996a273983ea1f004269779e07d8f6d0591d382980dfa8d734b4852d43e93b6b6323778342a2f9cd3072e6f1001f117b4a1be770a86b31c03e8951b48d987014
diff --git a/dev-haskell/uuid/uuid-1.3.15.ebuild b/dev-haskell/uuid/uuid-1.3.15.ebuild
index 2b511217050a..947fb5c71f2f 100644
--- a/dev-haskell/uuid/uuid-1.3.15.ebuild
+++ b/dev-haskell/uuid/uuid-1.3.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RESTRICT=test
 
diff --git a/dev-haskell/validity/Manifest b/dev-haskell/validity/Manifest
index c812556c7757..fea3f3731431 100644
--- a/dev-haskell/validity/Manifest
+++ b/dev-haskell/validity/Manifest
@@ -1,3 +1,3 @@
-DIST validity-0.9.0.3.tar.gz 8015 BLAKE2B a14f2dfb2a716251bf7e65548fad61d3525685c2b5065e4b4f74c9fcabe39f4b588a0e5d422abf9b3c734a0be528a59fd660833dcd65e1e0dd06283a0db95552 SHA512 f60faa65677f4a306a289d2985cd1827c3b2fbac18f25802f37af89bb8e0e9dfa23bebff6c2da4eda7824b94e9d26e5bcde55a3756b4e25b86f14ac0aee8446e
-EBUILD validity-0.9.0.3.ebuild 568 BLAKE2B 659e23ae3e00c1e65bde98ed7d7a8ef92cbec95bac8a2ed7b3e7406396d4a4447649994fad54e8a551a2f7d251ce7cfeae2d501c0e3aa55cd2a5cccf299ffae0 SHA512 aecf4c6e30136ee4b1c86d97905cb4067927ccc38de4fdba16ba542fba3e2f9a39d9f3fa55c6b096fd16751da74ec556d35c79ece6f89723b97b4fe22ac02aad
+DIST validity-0.12.0.0.tar.gz 9063 BLAKE2B 8129e8a2b2ebefac853a8dfbc305e0bd32567941adeebf82f7be9c74ff1866698913e80ad948ce22c0142671b7a067ff4299ad315c56d3f13d0cd24063849dcc SHA512 4078340b87dfd8adfaefe682e68563f36a43e6291037bec7d3fd45446e6d50a5622ba9909badfe71acebd1a41f5f740346acf90622d09bbef137b2a592b1850b
+EBUILD validity-0.12.0.0.ebuild 569 BLAKE2B e39033f4ea0c4e0ef6fc579bc2a7e5854add8b0dcf302d0aaab93cf5c6774b4b545ab74c90302aa8e92560ca536cbb181967e0ebc28cd49462c664dc355f4489 SHA512 e7f9dac4f06948d81e09467d680ba70aa2d651cdf33b1ddd9034b2de759cc1ad5b1c38de703ba307d3a1108e10d6b78e7691ec718921e5b5984158012ac6a793
 MISC metadata.xml 523 BLAKE2B 11803a4d1f98fb5cdb0847251338e3d157ecdc65053a85ece51d84297f08c86a4e74dae0e44e67e6cdad20b8e1354e3ce50396771b31e739262d3b5e9ccec140 SHA512 ddf1e801fc2cf80845eddccc8406e0a66c566e2d80341d54adedccb43dd674f381857e235200cec240089434caeb1ed676b7e291987e6a99b509b15513f8456d
diff --git a/dev-haskell/validity/validity-0.9.0.3.ebuild b/dev-haskell/validity/validity-0.12.0.0.ebuild
index 7d670251814d..3239ce98ebcd 100644
--- a/dev-haskell/validity/validity-0.9.0.3.ebuild
+++ b/dev-haskell/validity/validity-0.12.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,12 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND=">=dev-lang/ghc-7.8.2:=
+RDEPEND=">=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-3.0.0.0
 	test? ( dev-haskell/hspec )
 "
diff --git a/dev-haskell/vault/Manifest b/dev-haskell/vault/Manifest
index f10de321f2c6..7e3979c46027 100644
--- a/dev-haskell/vault/Manifest
+++ b/dev-haskell/vault/Manifest
@@ -1,6 +1,4 @@
-DIST vault-0.3.1.4.tar.gz 5375 BLAKE2B 6ba8dc1132d9e188cbfd65e5c1246df18399d08b614bf32f162e2aa4127bf324af6856198c7e32a8f6bbc6dce9f5c8b2cc393f3b3b3869d0731fd7de45a3a52c SHA512 70bebabce76b5e56b3d5cd4f95590ecef7a41f4de7f943932713fbb3eb17ac4d615a25b6503773a532b36649cf4a7b595be3b4222a15ca7d0756b2bee8aa0792
 DIST vault-0.3.1.5.cabal 2366 BLAKE2B 2ed90b48841bc52df3f6d269b8f30a5b224db2074646e5a446ed8d8f0d2ac15e4bda8839b142e072987dacb1b829ed4bc97f1b9f56e901dd5fb159f3126dee40 SHA512 cca747e73489e7c87c2e794f05d32dac93b935c6dca3ddf58f35d05afd960f1e2279a739ebd7f7995262a7f8d7c2e85b9453da67a5337e029bd03dbf00c5889b
 DIST vault-0.3.1.5.tar.gz 5431 BLAKE2B e102b85b99e6c28e0df1ff535c0bc9c61b01ec8c616107fa6298247f4d7f54e82e26eee7614b616d66cdefb21141a67cfcdf8d15743a59abf94ece0ac692f143 SHA512 f268d192f53594d5be39db807982073591e9bb830411813d6904e5ad1bf10d16eb5f89d9a39b764f92e6e196aeaabeac1b75cd07a70c59a42ce842835758e409
-EBUILD vault-0.3.1.4.ebuild 995 BLAKE2B c2e1ddad9089a1bd1f102585b59de6f6b147aff20f394db04d498b225a80da06582104c49c532dea2799cf21c25890875b1feae06a87af752ebfca68ea5e1c54 SHA512 df5c58ec5d7555bcb06dc2fc22f522e977d1e9b84c12dbe02f12aba6259f2f8c1d9d220659a19a6062050ef4464d63b1f77883934919a23833416692f6b1bfb2
 EBUILD vault-0.3.1.5.ebuild 1233 BLAKE2B 128a93cbde6be541f9206cba9201cb0221c8d38e8144d03a880c8ec4480532c667b2be2c58a18a4c0988278785529bdd84c847d2db329752bcf445a15736eef0 SHA512 f71110efb47fb53bf9d01d51dc80fb5a5a8b801f8282d52c3ad1c71ce65107728ea9d9b2bad016367f6d938c03478ac82a864b91a676d08d8306e986b3ae4c4c
 MISC metadata.xml 659 BLAKE2B 48c43b706c05d169de4017fb530c4739dafb8f75236dba1bf80ee1c0a0155920626e582bc8cbe1fb785c2cb13661f6946a5ca8663c5ee49d07047a5f683c80f1 SHA512 73c3f04753edd39bba7940cee5dbd05df56cb7e2cabab06e2e3e807af7d40878456685217f7578c04af222d9895130732861998fb9b1f68740b39c94806fc971
diff --git a/dev-haskell/vault/vault-0.3.1.4.ebuild b/dev-haskell/vault/vault-0.3.1.4.ebuild
deleted file mode 100644
index 48f582ae33e1..000000000000
--- a/dev-haskell/vault/vault-0.3.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: +useghc
-
-CABAL_FEATURES="lib profile haddock hoogle" # disable hscolour: ghc-8.8.1 is buggy: https://github.com/haskell/haddock/issues/1091
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=useghc
-}
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index 1d9ee842b2b4..a987efbc89fa 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1,5 +1,3 @@
-DIST vector-algorithms-0.8.0.3.tar.gz 26559 BLAKE2B 7541d141967faf4bc1b33dcd23f283e1a6868f0b51e784918c1516a46c38ba3e9205045c87679738d89c48fee3ee2e61286eab59cc66ec8cfc18f1a4b977c634 SHA512 45311e19a1e5c9994e7d666b73445d11946f60915df3d2f385a435538d1b6b0929b56a960f83c5df1b2df883566e7f8e6fdd5be4e075364d7daecd6dbec780e5
 DIST vector-algorithms-0.8.0.4.tar.gz 26681 BLAKE2B fde5a8a9663e5e94e340f4edb1c1d17a47e7b561013982b5bf7711fe595913280476de629470ec9a049a6bd277587b1dc5390ec9e6dd0d7da87eb7f48ab891c8 SHA512 da5f52493c7f68df0a2c718724dcac9be758b09b14c8fa913aa328ee4c1286893fb239882018202d0fcd56709364ccddf3d620ff3b886d830102ef52a0868d42
-EBUILD vector-algorithms-0.8.0.3.ebuild 1223 BLAKE2B 6f6bab44d2b649c727336a0a3e67cfa9e858621b6764bd04ddc5ba2177e3153370e39a33bd4f8dc2d2d9dedcae6aa8d63158f47f70d5320b36da3844c6f9d6c0 SHA512 97b6b98e7713b7a3bc55849347b6277e17f8a620f721418cb8f95676a39acfa4acd1fa96a2027486f28c5b14689492c1bd5813c95327ffa2fcf37f9354d1b3ca
 EBUILD vector-algorithms-0.8.0.4.ebuild 1234 BLAKE2B a089596beaa1db42b02b7817f95f0b10c8bd095341a1bbc61f7133fcfebfe86b55ac8ebd797e047c481ee3356e61fda4db5d4fa694d1deeba351d379dd452479 SHA512 96678d18a56456090cd6c17ad5c9b016dfe26794eca26103616a05bae1c46abd5bfad3ef00c1000b5ecd0caa4e3527aca35b89c71b5aa20fc37869d27759428f
 MISC metadata.xml 691 BLAKE2B 5b808c9e8cf015292afd7748e66c901ac9ed49a4aedcb3f372532bc9f8ffd484ebb641a005597db87c2ecd8641c691ca2d4951615fd7b166d4b38efe679d494b SHA512 dd3c33752eab67d954cbac96686860a3f80e06e944eda70cc60e3f8d27e32f6033979118dfddfbefc3997cb6faa209c148280e8867046a036788d2ddfe856be1
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
deleted file mode 100644
index a1fcf35bd7ab..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="https://github.com/erikd/vector-algorithms/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bench +boundschecks internalchecks +properties unsafechecks"
-
-RDEPEND=">=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bench bench) \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		--flag=-llvm \
-		$(cabal_flag properties properties) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector-binary-instances/Manifest b/dev-haskell/vector-binary-instances/Manifest
index 03710ca78766..32cd8b8c2107 100644
--- a/dev-haskell/vector-binary-instances/Manifest
+++ b/dev-haskell/vector-binary-instances/Manifest
@@ -1,3 +1,3 @@
 DIST vector-binary-instances-0.2.5.1.tar.gz 4067 BLAKE2B 4c4bc50e10be05d0a063cd417198c52e5f79e94547b69eac5d87d26762e62e92dbcb9dfc3209a4d105ca6e3ae772a918de1b983856beeb9117c5c9fdae467b21 SHA512 a16202b8ca3f88df82c27b37511087008579296363c73fe09ab19b00dee0fbaf98699b79b08d7e7410fcd062c03f2c5d1560f6b1c9ebf1ab8290596a35758be0
-EBUILD vector-binary-instances-0.2.5.1.ebuild 789 BLAKE2B d23b30d09d1bde924ab52fd88904c9baae56cbd344ca665199a9b6e47fa314ef4ea3e37d34a988952b1559a7f8278594ff2d2bfc675cd40399afa93174cdfb46 SHA512 c31a938168de614247a886e12f2d582032174c7f0a93e7fd0770d52ae93ccc5ef7937f5c1c1ffa3f021d6b3810179226ddd8f12f2450b5f7b71552b573335261
+EBUILD vector-binary-instances-0.2.5.1.ebuild 796 BLAKE2B 2e01afcebfa5f4a3ae523fcd684ac88545c766ff144537bbde8361702ecc4360ed6082d9648345785ccde4b14fe6bbf0c1c83eab73d3be0cb74d41e091592cb8 SHA512 bd9f73cbedbd0a5d307e98d9c1a352f96f1461f0ab1a4f6f7402e5f18f4565c30df74e3a2a81d379eb897c096a1d178ed395e12e4148ba2c8c9b45ea0d90b697
 MISC metadata.xml 1132 BLAKE2B 223bae42ed021cf2fabbe2a7f1a458fc3c177ff19b072a14dd7453bc2ca5499f377e78d31f6d00e5e8b2a8da23483cd970fa1755dcf31d7b815b08c11ee6b5cc SHA512 54336d984ec7ec54202036b430ba05d50f5bede23973f330e36fd3378aff5e0b568a8ab640c3ed8c72a411c3f763c2f790f72e894e8d260d70fbb31027c97615
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
index b0d4d4dbe607..dd2c620309cc 100644
--- a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
+++ b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
diff --git a/dev-haskell/vector-builder/Manifest b/dev-haskell/vector-builder/Manifest
index f1ac5cade41d..dcb1b39db436 100644
--- a/dev-haskell/vector-builder/Manifest
+++ b/dev-haskell/vector-builder/Manifest
@@ -1,3 +1,4 @@
-DIST vector-builder-0.3.8.tar.gz 5045 BLAKE2B 1e599a0e50102c50cd6057cf892d97f9dad7468b0e49500743bf422b8a9e085d062b9b4e13ae9bb68d3c59e6bb549e77a962fdaed91d5a3e3e5d74b8ec45a6b7 SHA512 e7ca1b6ba35aa76e16ad485cfd5e326c2b257339d2aadc57b7ce2a5ec3d5790fec99e5546ea18351cd9cbf31e7ec99c737461950acd355f62be27b53edb2be17
-EBUILD vector-builder-0.3.8.ebuild 1160 BLAKE2B 6c9895e4a9d543b71917f1b01f8e15e39b191fa09a0c3336eff8c057954846060227474751747e4e03788db080bdc71474e04852d5e4f85c8a6692d8581a756d SHA512 8315c6ef2ef1a64b845d5fe358f9bae36984ad4d7d927495636a4f40356ece45086c154d56e1df93020b24f8a914d98cf925ad5ec3d7efea4fceb53e0a7fdadd
-MISC metadata.xml 1201 BLAKE2B fdd049dd70b9317921bd6d13037d264b49bb86681945d75a29b8457f1dd1bf86aaccaadcb478686efb7a4e250ec06916c86ee4c6f425db74b9375c41a0e4b2c6 SHA512 b843644cf2f6c3c0cfb2602900b7a7fb3e37021dcffc231ecd6b11f59ffa25d216f7baeab60424461269da1720274c62f5b1897d4d327ed89d35abae8990a1df
+DIST vector-builder-0.3.8.3-rev1.cabal 3525 BLAKE2B 632bf32ce4051423cde654b59f5ac4267f7c1f026b242deb948321aa440c209bebc9a14a4693b0ec48377e3a805bd4d52b0551394d88354f8ac19c541dc00138 SHA512 acfe3366a07df31ec5079439f91fdbd95215760b44879e5d752f346249fd11c5b19ec5b560ed045fb8cbc9403810f5466a146f39e2ae8e33c3cb7d42eca918dc
+DIST vector-builder-0.3.8.3.tar.gz 5793 BLAKE2B 036c56a578dfb1ced78857d318e084b56e2f4231903cb40affaa67c5d9d4d3750b9f1b8e37d3f96b6cd5c17b2b4aafc3d3831bb4f3e6d34900c0696742fcbee6 SHA512 04ec9ce93275bf4554d97e18bd5f22245f4e05bb4aac998234eef4ae2f2ae1ef0479b34a38c75c33bd928187c397d7bd559d390fa12859994e9ecd1b9ba7f9e2
+EBUILD vector-builder-0.3.8.3.ebuild 1525 BLAKE2B a9911ee7aa4a8941e590595a8d9ac45e37822264adf63c497f4f28ef864f68902881746548f550f3a0b008c0f91736487edaef0b9b4965c80a3e8167c0012bdc SHA512 a76defdfcc1f7063c456b2e983a030d7a5459142efb1e4b90282425aceeb5881bd71041e8e8ac486133164be3095baef927849df947a04044ff4d0b3f341cbc2
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/vector-builder/metadata.xml b/dev-haskell/vector-builder/metadata.xml
index f63fd8a2495e..937381521944 100644
--- a/dev-haskell/vector-builder/metadata.xml
+++ b/dev-haskell/vector-builder/metadata.xml
@@ -5,32 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		An API for efficient and convenient construction of vectors.
-		It provides the composable `Builder` abstraction, which has instances of the `Monoid` and `Semigroup` classes.
-		
-		[Usage]
-		
-		First you use the `Builder` abstraction to specify the structure of the vector.
-		Then you execute the builder to actually produce the vector.
-		
-		[Example]
-		
-		The following code shows how you can efficiently concatenate different datastructures into a single immutable vector:
-		
-		&gt;
-		&gt;import qualified Data.Vector as A
-		&gt;import qualified VectorBuilder.Builder as B
-		&gt;import qualified VectorBuilder.Vector as C
-		&gt;
-		&gt;
-		&gt;myVector :: A.Vector a -&gt; [a] -&gt; a -&gt; A.Vector a
-		&gt;myVector vector list element =
-		&gt;  C.build builder
-		&gt;  where
-		&gt;    builder =
-		&gt;      B.vector vector &lt;&gt;
-		&gt;      foldMap B.singleton list &lt;&gt;
-		&gt;      B.singleton element
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/vector-builder/vector-builder-0.3.8.3.ebuild b/dev-haskell/vector-builder/vector-builder-0.3.8.3.ebuild
new file mode 100644
index 000000000000..202abac8b902
--- /dev/null
+++ b/dev-haskell/vector-builder/vector-builder-0.3.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Vector builder"
+HOMEPAGE="https://github.com/nikita-volkov/vector-builder"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/attoparsec-0.13 <dev-haskell/attoparsec-0.15
+		>=dev-haskell/quickcheck-2.8.1 <dev-haskell/quickcheck-3
+		>=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.4
+		<dev-haskell/rerebase-2
+		>=dev-haskell/tasty-0.12 <dev-haskell/tasty-2
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild b/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
deleted file mode 100644
index 5c2ac8cc49f5..000000000000
--- a/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Vector builder"
-HOMEPAGE="https://github.com/nikita-volkov/vector-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/base-prelude-2:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/attoparsec-0.13 <dev-haskell/attoparsec-0.14
-		>=dev-haskell/quickcheck-2.8.1 <dev-haskell/quickcheck-3
-		>=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.4
-		<dev-haskell/rerebase-2
-		>=dev-haskell/tasty-0.12 <dev-haskell/tasty-2
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/vector-instances/Manifest b/dev-haskell/vector-instances/Manifest
index 3a1a3bdb2db5..e181a4597168 100644
--- a/dev-haskell/vector-instances/Manifest
+++ b/dev-haskell/vector-instances/Manifest
@@ -1,3 +1,3 @@
 DIST vector-instances-3.4.tar.gz 5276 BLAKE2B ca68a6cb0a4b9aeab81409e757d7d5d5a18c53ed826668fa75725b52e374d4047ee096d392557c9c316aaa9740c307165d0aa5658542edb8827be5ddf9a883cc SHA512 67ffd6b941909bda1b6f26c8c7579fc495267425461f15f20bbaecf22b67d3dbf4ee88eb2ac76232f47917c26558eb325fedfe8ffc97368bbe1ad90fb427a7b1
-EBUILD vector-instances-3.4.ebuild 965 BLAKE2B 1a5d0b9c6c7fc8e75c152cbfed90952a6c9e3a1d01b78ede7089239c577ca7e6ce33d4abfeb26b527f57a471c09166ef22c099cedcd2e61c57943a829bc17f0d SHA512 862d3418bedb928850f2313b36f26baea379894a94895bfa5b81eba5813b3980226531ffde7793dfab9c814449c653e81c803bdb3249f88a27dc341f0e4f4653
+EBUILD vector-instances-3.4.ebuild 972 BLAKE2B f27ba9d7d428ff7d75e40b8dbe9ffdea39d824f308080a981dfac4ae1554fe386cef99075143756271148cc52474dcb0ee8c0dab19184b6739e6346438e1a9cc SHA512 ade0dcb7a7159d57a80df456976632a64ca2a8da5153d5b6fefad02407a7acff9701ea45021587d022a6234166f02959da69ad97846360b4222987fd9cfc976e
 MISC metadata.xml 420 BLAKE2B ef3418e10f402b64b189a5e9e3ae7982ef237e71ba88228ab52308e6450935fb3aa51c91319d39e93121bcd1e4304b26b855ce9f1b014c13b05af1694a21b334 SHA512 15ac0372f8ba0da7a45938ad9bf0c5729e859f34395848bef01baa5f12430df96d71226c704680275a65f0c96eadeee89fc5c9441b1f4366507852ebc3b49ecf
diff --git a/dev-haskell/vector-instances/vector-instances-3.4.ebuild b/dev-haskell/vector-instances/vector-instances-3.4.ebuild
index f2d499f3dec6..4eb0150904e3 100644
--- a/dev-haskell/vector-instances/vector-instances-3.4.ebuild
+++ b/dev-haskell/vector-instances/vector-instances-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+hashable"
 
 RDEPEND=">=dev-haskell/comonad-3:=[profile?]
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index 67901a2cae23..e9f5defe1c10 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1,7 +1,5 @@
 AUX vector-0.12.3.1-cabal-doctest.patch 2520 BLAKE2B f211e31c01be3c7ef16b394f12f3326e9623b266b3fb19a205727888f1b3510220d93c02acd979af020caca29b8d59d2d6965fcfaa6146d6c8d62cef7705eb06 SHA512 e74d99c8b6384c43f426a071b7d6fc7bd8e9e5d4af7b824cce62f64793866f2813b69a0539f8ac0b200418451d41761e5f897ff467e6ed697129756d4f72e4a1
-DIST vector-0.12.1.2.tar.gz 131049 BLAKE2B d77981f49b89cab1aefa3237d87e84ae36c4586c20ca3f359c0855e3f3e15b8087849590bde06bd2017d83d92d8ff03ff1b9d8d949ceab382865707f16c723b0 SHA512 36d0237cf7c5a6b78f88b33ff09ea8b19baeaf85609efdeba9ab802ca588956457d4607304b73e8d58e9e802a9101c23da62caee71508f069047a6d531e50170
 DIST vector-0.12.3.1-rev1.cabal 7946 BLAKE2B f1545c06c3a2ce405c9bc498e471b640fa415acd3413fbb3514fd0ea9422f4c7d51ee9ff8b6041da842c45a156132f6eebf89ea11b843835fd360b7c1dafa8f3 SHA512 292df3231e4f34bc038efa769928813808e562553188547420a83a5d068e5d591a169957ef50da42da66b5ba9eea12408b3e739f0f9edb76f06977d6b75a4843
 DIST vector-0.12.3.1.tar.gz 151420 BLAKE2B 1d3bb37f1c2b7f3c74e8a934d855b0f1742df03f8526a8b7632d1f940abeeef5a03e476340a96840c9486aeafc404463bff078eb28db9176bc8989b554e87ac4 SHA512 bf117d53c7844c010dc1cee8b778851bd714155fd34e671ae2eb7bd324427de972389eb9f3f315832f20e7bbbecc93ec0f6296ab10e4935957d2a4e14c6cfd98
-EBUILD vector-0.12.1.2.ebuild 1365 BLAKE2B c7ce3ddcc514f6711f58afc2673782478be650b9844b1c68a591f90ed97fe7aada80371fa0e3888c3714bebad0c25839ec49f894b41b55d76235bcd70ff01350 SHA512 7944081c43ce39110055fe15f359b60187535404860ef6fe7e112e5aa0a77ecf53a6010ce4f6f1b5bb234df24b81197ae4ae157346d4454831176e7110db9c8c
 EBUILD vector-0.12.3.1.ebuild 1806 BLAKE2B f3bba3e5ec2488ef8797438f1a8f6e5a0ea9f07e51e51e8481d2a10179b1b592dac09e289c525ce27b6da4cc009d62b2bbaed94510fe77fb75d7fb757c539a29 SHA512 f3e40b4ca61fe5b39a0677969b4f464efc52f4888bb5e7ae6aafc1c12038e0a20b5183770678f42798374a55cc4e0f4043e3036906f64320e6bf2ab93641f1c9
 MISC metadata.xml 2432 BLAKE2B 68ccab0b08c3cd848b1e68df59d703e82da74bdb819471f8c867edffd33dd3832340b7bfbe255892ca0e81a810c8c6232154f8262172d71bb54e20341f48bcd1 SHA512 a28490c454bd52bdf1e2c1ce972eab4bf89bcef23f8f4b7e943ffe6be452bc65a51469a8645bb9505ff531af8bad9132afa2475ce067491296b535830cd78fdd
diff --git a/dev-haskell/vector/vector-0.12.1.2.ebuild b/dev-haskell/vector/vector-0.12.1.2.ebuild
deleted file mode 100644
index d03f43378f3f..000000000000
--- a/dev-haskell/vector/vector-0.12.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -wall
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RESTRICT="test" # test-suite is too memory intensive
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10"
-# 	test? ( >=dev-haskell/base-orphans-0.6
-# 		dev-haskell/hunit
-# 		>=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14
-# 		dev-haskell/random
-# 		dev-haskell/tasty
-# 		dev-haskell/tasty-hunit
-# 		dev-haskell/tasty-quickcheck
-# 		>=dev-haskell/transformers-0.2.0.0 )
-# "
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag unsafechecks unsafechecks) \
-		--flag=-wall
-}
diff --git a/dev-haskell/warp/Manifest b/dev-haskell/warp/Manifest
index 54f68e2d2e16..2850b296d854 100644
--- a/dev-haskell/warp/Manifest
+++ b/dev-haskell/warp/Manifest
@@ -1,3 +1,3 @@
 DIST warp-3.3.21.tar.gz 66529 BLAKE2B e8de94a4695c42a7620c1afa1a38225f6c26fc454235e941e34b65929a733e160781d895335d0ab48c4d7db25aa650d50e1d84a3ef83daf62b22f409c2045d48 SHA512 7f181669d9f10f88d14f8f1dc3acb6c08f41c8f4565f371f7fe4b89b3fde411a0190e50f003b07a239ba25ea71dbafaa16cb9e77effbe574bec929ea29646f37
 EBUILD warp-3.3.21.ebuild 1877 BLAKE2B dcf8551a63593cec5fd516c91163b08075a911f430f8b6cecc714e7343ef9e365e9415d4a5b58d7c6d47c7ed2d198992512f8a916257996d44fbdb3a81125b34 SHA512 168aca1c082d5ceb457acfddf8c124375322dddde406daf80769d53ea435ad30deddb5c7fa8e7b2cc095614d90da3bb09451e60153fedddb06fcd93444e5536c
-MISC metadata.xml 544 BLAKE2B da146cfd44d715b28d49623ba26eed7389d9a2f2cb571fa73f47be5e0cdcac35e025d2700edf818d4bd3c9f2e91b225d30b07181f5c6868d2b97dd4d9d0bb7b9 SHA512 45dbef5dfc796a988272944afcd5d0f0dc46137cda51a02b2200874687f471832a4d58c07e031e386a3676d45f9078b6d936aeceed7add0e3e8d93fe9c5da070
+MISC metadata.xml 545 BLAKE2B 19b89a4a78f095ad7e7fe1aeaf028022dfc4b7ead99b7506294881598ba2f3eb00a02987381576966e1438c661bc325fdf9870ecc1eb0dae83cbcdddd76421ad SHA512 758ffc58101e98fef27e99749f4968284c5bd3cca4660c43ef2e23b4e8eec61d236502dd1ed34705d98a34be8f3ca81b41e2e9efa99ad49b562545bc4bb03652
diff --git a/dev-haskell/warp/metadata.xml b/dev-haskell/warp/metadata.xml
index 990528df1e4b..f9a038094525 100644
--- a/dev-haskell/warp/metadata.xml
+++ b/dev-haskell/warp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/wreq/Manifest b/dev-haskell/wreq/Manifest
index 31b235c73820..8dbbb330f97c 100644
--- a/dev-haskell/wreq/Manifest
+++ b/dev-haskell/wreq/Manifest
@@ -1,3 +1,3 @@
-DIST wreq-0.5.3.2.tar.gz 57521 BLAKE2B 2265e7f8abe371371d079f735d61917c0efa5b78e2d3e8965e3b720a94e89b3a7ae05824f54d6fe765c643ed81f506b12694355b0bf1d7b4c2e9198d08c2317c SHA512 5a2c62b973758cb8ce2bf20504e328090896fa25e7ee1f77b472d7cf5156e08b6d85bf4341ff45e44db1724070fcf3c0f21037fa0a79211a1767024328f7c779
-EBUILD wreq-0.5.3.2.ebuild 2342 BLAKE2B 7aacbea34d850f4123674c4b325232c5ef2a5e16556de9aee0fd5b972ef7b1727457209523a4cf9db17dd5db8fa55c8022f9c18d83665dabf913f0b5c0d3920b SHA512 e60a8c4306b5c68e69ec417017d3f84b899e50297988ad3ea35c7c40d02252f3696c72c278b8dd0fa1e0a04c1c0fdd09f055412f0a3595a9b4003f8145fd22d3
+DIST wreq-0.5.3.3.tar.gz 57561 BLAKE2B 31849f85b612d4f15c9a50f7e180850b7270c854bc86fc447880ca5740fb4acbd2acbddd65ec2b279180615616b0aac5332d0d352d412ee5665e8e2824fbcde3 SHA512 f074790cf3370d9356efbf5aeabb7421d59299471e02d93010453bb6f4e8daee517fcdf6891245272a9b08a35bc7b1b2233b75825ec377f6403c99cf91041f2e
+EBUILD wreq-0.5.3.3.ebuild 2346 BLAKE2B a38356fd495eec95fbfe1b6330e413950ac4d303cfc9b55bd720dfa4e32b4335aede5087a5af9e973211137ed13f8627f1b657beacfa5390e4673be9d6953615 SHA512 e557ce3b8592ccfc6dab5f9e41730e29872bb54eec28b92a7fb721a0c3673bfccfc135abd807632a7c8e1131415337244e697d0078039fe75ffa6c83c311b344
 MISC metadata.xml 1055 BLAKE2B 20f9ce8e83f1b256e347592f277f3b455e29eb982adb3a9b8afe703eb7392a2b59d06d516229f20034b94fb28d0ddb3e698dd337e4264d875139a443aa892964 SHA512 26d2680ba5d26809fe0b375811fbb4ed41480a66a56a6e74c40cecc2dcdaa4f8bde27361e8454335a006bfd5878598b0da8596efd2c43cd5e8fbd015dbeab580
diff --git a/dev-haskell/wreq/wreq-0.5.3.2.ebuild b/dev-haskell/wreq/wreq-0.5.3.3.ebuild
index 62ccd4251442..0c9018f69297 100644
--- a/dev-haskell/wreq/wreq-0.5.3.2.ebuild
+++ b/dev-haskell/wreq/wreq-0.5.3.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.2
+# ebuild generated by hackport 0.6.7.9999
 #hackport: flags: -developer,+doctest
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="An easy-to-use HTTP client library"
-HOMEPAGE="http://www.serpentine.com/wreq"
+HOMEPAGE="http://www.serpentine.com/wreq/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -20,7 +20,7 @@ IUSE="aws httpbin"
 
 RESTRICT=test # needs network
 
-RDEPEND=">=dev-haskell/aeson-1.0.0.0:=[profile?]
+RDEPEND=">=dev-haskell/aeson-0.7.0.3:=[profile?]
 	>=dev-haskell/attoparsec-0.11.1.0:=[profile?]
 	>=dev-haskell/authenticate-oauth-1.5:=[profile?]
 	dev-haskell/base16-bytestring:=[profile?]
@@ -39,7 +39,7 @@ RDEPEND=">=dev-haskell/aeson-1.0.0.0:=[profile?]
 	dev-haskell/text:=[profile?]
 	dev-haskell/time-locale-compat:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
+	>=dev-lang/ghc-8.4.3:=
 	httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?]
 			dev-haskell/base64-bytestring:=[profile?]
 			>=dev-haskell/snap-core-1.0.0.0:=[profile?]
@@ -48,7 +48,7 @@ RDEPEND=">=dev-haskell/aeson-1.0.0.0:=[profile?]
 			dev-haskell/uuid:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
+	>=dev-haskell/cabal-2.2.0.1
 	>=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1
 	test? ( dev-haskell/doctest
 		dev-haskell/hunit
diff --git a/dev-haskell/xml-hamlet/Manifest b/dev-haskell/xml-hamlet/Manifest
index 76d8fb91f404..2b6c8eda857c 100644
--- a/dev-haskell/xml-hamlet/Manifest
+++ b/dev-haskell/xml-hamlet/Manifest
@@ -1,3 +1,3 @@
 DIST xml-hamlet-0.5.0.1.tar.gz 9270 BLAKE2B 49b713f45d16451d40d7afa46d045eafc208a56b3299f778950c89daa68c2678a2fb01c9e18d9645e00f3e2173bd1bc62bdd03a9b91b15d2f2d627977cb501fa SHA512 273dbb637c6e37fcc3b180448ccee0dce8996319d653cc3833fef302a297e8fdc805958b4ebc6e015cbfb2ae8b60a8325108b9d6dcaab052b460ff27a404de39
-EBUILD xml-hamlet-0.5.0.1.ebuild 833 BLAKE2B 80288abe0ea25258c3e46648a7b0854b45d76750a4614aac47b16412bb471d9db47095731f5c9dec1daeeeebd99ed7daf6f2c7795c7dca3ba0e0defd4566bbed SHA512 3c3e7a50b514e7ba4e2de1f33a6ecd92b5f9dd1ce5ae6b97838993a47f0a86de37ce1abcc816b68b899af485536e1e5f4575d58f775c165238a5138c7bbda025
+EBUILD xml-hamlet-0.5.0.1.ebuild 840 BLAKE2B 814315e26aa7334a2304bb33f6a111487d1974da5d96f72a0f11fb6f174d9051c089236edc7c8d660543377af7e2de98bbd63c4e5e75550b20d0aeaaeb528c99 SHA512 3e9f22e73e11e6e4ba7dfb935c978b66c337a7ea9a42f3e38e9f8eb57d108810027d33c5d56ea74d6463ae37e40583bf3ce62f0b7f1e1b3cbce9991104147739
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
index fc840ae50acd..9e725968fdc8 100644
--- a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
+++ b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
diff --git a/dev-haskell/xss-sanitize/Manifest b/dev-haskell/xss-sanitize/Manifest
index 1e350880fe35..66edad908010 100644
--- a/dev-haskell/xss-sanitize/Manifest
+++ b/dev-haskell/xss-sanitize/Manifest
@@ -1,3 +1,3 @@
 DIST xss-sanitize-0.3.6.tar.gz 11655 BLAKE2B b1d438a6bfa587aa9eb62031fb2c1c53cc48bbadc26b6f64ce717d20d5ab9e282ed657ce5109e0501de393a8609ba99fb9e73966220dc358b222f69301ab5661 SHA512 8d038d807b7fa01a65f4b73d135c87ab75385f4c91ce174b332cd5fd1dc1ebdec26b0c5713cf3f68c27351e19e099815d1b530af3ecb7e4c45e71fec4ae12b4c
-EBUILD xss-sanitize-0.3.6.ebuild 1071 BLAKE2B 3659c10a635c89803fda55fc604575e782e6ed29258d51c1852ef0ff738d1793f7299a96a138ff8d8e04539a7b5ceea710b7c8f4d13c45e9b6ec584bfed5eedf SHA512 9738f20fd4cfd5b8a835ed8ab0af5176bc1c1859af529c007aa7c5304d8c7c652f36b142e7db5ba817c4e8e4186d687d77ef9c614e2a9e905b77abb07f0c7090
+EBUILD xss-sanitize-0.3.6.ebuild 1078 BLAKE2B 7cbc15c25557f961014725a2fa5180083378debc829544a11a7fa34b13de72a8d40e01b718102313e21110bdb09ccfda3f766e348736a0caffdc33a4c31262dc SHA512 cde4f9e3c87d3125dfb2b0114588ee264d16c82ac0d47b634755b9d1aafc712d8c20ed77ae7834cc4667c37758588d68d59480f0531e838cc7f0bbec39a6bf1f
 MISC metadata.xml 558 BLAKE2B b0ef0bd894f0f0b9b7c60340efbe1907e9d4df5eecee4eba6b1d8adb4e8d7cc38ae896ec86fd02dbbab131d3da470a5328cf7c957587994c29ff85cdd08c598e SHA512 240c5ed0e37e793511758ca9ff453f120b069bedc5049f3a47dd41a655391eb12ee56e68f5a4dfe08c961e7d98bb9f6a2a7c2e96f94e4a68af60385360e8b35f
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
index abdeaf6c8c5a..ef2927fc21e4 100644
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
 	>=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?]
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index bbab4f8980ac..c30d94a1b875 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-core-1.6.23.1.tar.gz 103119 BLAKE2B a15ee64ddc5da8f531690b8d6b661af618754a44e3e3511f15af69d82a53ce6d7886a4b55243d611727c2618446a145469db27b9ba122a32bd538d8cf6abdf80 SHA512 edbdf46c2a04a7286d46030212dcbb2c7f0e0e8b62e87682ae8ed4468796d15544990fb43d56a801fcfbf4dde740bc09cfa192ec21c3d5aeb72b92a5ed0cb173
-EBUILD yesod-core-1.6.23.1.ebuild 2093 BLAKE2B e4b63cbd06591e94ab09afdc012359ff22a643c6d2f1b0375f03c1e2900c093f94e3248d9c661c4368e703a2a78afd1bda59b5a1bcaebefb76a61b90e57fc37a SHA512 26c73a591c8953be9b243875232db53d47617876aeacbdef54594a74d9d7d064d2aed98ea2194bc06ace391b5a3c7fb95fd7a969671bb2aa3940ddb041dc1f1f
+EBUILD yesod-core-1.6.23.1.ebuild 2100 BLAKE2B a0855a57ae327dee0dc94a81a80090c6cd93d7032498d66c9b1e6f2e99ae22e489e17e9a33bdf22319c51486de44561233990904d2968c02f5f6ac57eecd6289 SHA512 71194eb81efd4fa8adb923fe8653684075bc7c590ba63c84fe09760645b6863e095152da21f69242a0328326304ed6396da7c2c53f05ff7579773eee2363cac0
 MISC metadata.xml 723 BLAKE2B 3b5be67ca1f5875eb294cac77353fe3bf12ae8fbefd03379c3cc25c7e26c105de45b4aac58d674fff6efc9932a9d85bdf67c8dab8ad2c6f323bab001d33bc408 SHA512 9e379ac8c12417626edd289fa2bc2e7c2dc6c91b448d7fcaa5677580dba0d536344f2af6f0679b8683dfaeeb9c16be0c9db9581d099b773ec3d2d21e14fa5018
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
index c276f0082c3c..ff6a8d6ae5b9 100644
--- a/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
+++ b/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.yesodweb.com/"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RESTRICT=test # requires network access
 
diff --git a/dev-haskell/yesod-form/Manifest b/dev-haskell/yesod-form/Manifest
index 158545bff5cb..38975a465fff 100644
--- a/dev-haskell/yesod-form/Manifest
+++ b/dev-haskell/yesod-form/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-form-1.7.0.tar.gz 34435 BLAKE2B 86b299931316eaece475ee741357acf8e61797bd00cdbdaf9298a1ac6967b735915f0169eb12559ef7296466f61fd20a6624c62c08a5ef148566925659da1e05 SHA512 dc5373c62e78d79e570171c608fa2e9cfb2092a859b81a881ab69a406c357cc9eeff0ff04d0c08f8cc29cf66ef488ce6b96195d26b9c6dff879a1fea96eff013
-EBUILD yesod-form-1.7.0.ebuild 1480 BLAKE2B 0666d6551531a5cb7df209c2a2076077ae6178955503f6bd24843367304374a5327b41f602569e0afc79849bc8d3f37b414a5498fc9751b258f8a40f90450a74 SHA512 f76421d44a75d62c04d0b9e851ef2d434bae0ef188065591028ac2625fcc69c0baa40b599cdd99f1767606fb77e757d6d4ebb7c9573665ac45c03c805fc36e33
+EBUILD yesod-form-1.7.0.ebuild 1487 BLAKE2B e537f20e8675aa2e88a4b63089e06c8a27f85ad169a8b4bcad50c0ac72dcc25be72834157968f842b81f0e18f77051ea7279310d8aba73832b9abd2ca76a2752 SHA512 31ab70a8c89d1da2c16c850ce7ee68b9c053372992992c2ffcca8276c181cf8ebccec0d0551bbbc4b4af265960dc9ad360465a6422cead7c27175990d021a548
 MISC metadata.xml 356 BLAKE2B e8daacf4f5d503f465156cf330919dcb2913657a58a943945575911490183e1c3f17bf54445a5410e4cf9a5e52fae441835e8296cdfddcffdedbae93e4ffd6e6 SHA512 1edb6b5474077f0f08cbac6283ac1993a958cef0cee4d1abf3914f94be9d8cacb09b8fd3c7614a19a3e8dcc920ea4d20d7103a4c4ee350bb6eea38bab4b3717d
diff --git a/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild b/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
index cd4bf590ab4e..9dd32ec21a23 100644
--- a/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
+++ b/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+network-uri"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/yesod-persistent/Manifest b/dev-haskell/yesod-persistent/Manifest
index 834ca4483da9..d633cc71bbe7 100644
--- a/dev-haskell/yesod-persistent/Manifest
+++ b/dev-haskell/yesod-persistent/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-persistent-1.6.0.8.tar.gz 5612 BLAKE2B c3eae29c88a3093d0ef0f254888943f284be22c6b1face4ebffe63f8964e1681c23ef054eac7b3ad2cb1a04d382c1388e042e11ebe54474321ce51783b6f0c78 SHA512 2e356cd3f1ffac1ad7390cdaff436c4179190e8f160fe8a8e798678498e67ea34ba087207df750453bc237e827f7c2748c86a2419240079c5a7012cef5381340
-EBUILD yesod-persistent-1.6.0.8.ebuild 899 BLAKE2B 7de400274bdf7d44386ce9636d189d705c1e886217719b91ac7bc74db1663915be18c3efc8524c4304ded4b25edc36c62b0f743640bf4b07932b0cbc1d4469d7 SHA512 1e42b636b21329d1bccce0ae6d185d6ad6d5688d0ae0a1f56461adca0fce138bc3213f258d92f751205e110210519524de6b1f327a76214d19ffd2fea24ca71c
+EBUILD yesod-persistent-1.6.0.8.ebuild 906 BLAKE2B 1ebea0c751afbfb2ed341cc4f6d8449edb5add49941a409c5e4042678424d72b7181b3d535fa76ae49043b090d5a78964b5a2f2f46f678dd724877c45e935d1f SHA512 326113c3640b7321adf92f510b0b9823e7ef25c73cd32be8f774dde3fecddc548821aa0123b46ef16a88988e49e86c5a4e00ef0f9d3582820bf4740d6c89f282
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
index 8d688871e389..1ec30462abb5 100644
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
+++ b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.yesodweb.com/"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="dev-haskell/blaze-builder:=[profile?]
 	dev-haskell/conduit:=[profile?]
diff --git a/dev-haskell/yesod-static/Manifest b/dev-haskell/yesod-static/Manifest
index 80cd3319f24f..b5718ef70c2c 100644
--- a/dev-haskell/yesod-static/Manifest
+++ b/dev-haskell/yesod-static/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-static-1.6.1.0.tar.gz 25613 BLAKE2B 6619169b5c745f215174cb7f3544dcc0eb5b32cb58059a87b1c1e8edae4e2e53e994c9d7afc60fd523be8aa5e33b996daebeae89063030861fa3b049b2e2c2d1 SHA512 66037ec28eac83e374161c1b306a4d20805ecb35ccfc4878e7894d961daaf30d9936c6e209641ff323d7e3dd5626f5a24a12915d4205417c496e272a2e969f6e
-EBUILD yesod-static-1.6.1.0.ebuild 1635 BLAKE2B 0de8bbc6698e74505cfd0cef8c8b7efb67e4e12d43cbe8562872ef21ec559e4cd4bfd6896be89ea20bdbc256bb8bff414e60cc82b9a051f09ada1563076d9331 SHA512 e70edc69e3116f610047a4f55418bac2c86b13f3b04b08203ce0cefe36db6c21acfa905d0e3ecf5ae00275c6a8635f8f7fd095c39a9e41d72f1e4e6602e55f8b
+EBUILD yesod-static-1.6.1.0.ebuild 1642 BLAKE2B 02eaf1e6a339e7929241dd07e185d140a962a2784d304aa3cad9cb845a5f974306f9dd2ec69080469ff226a7347d6e5c4e8280db97ba5135ca1698861013bf79 SHA512 4b23ed603213e416dc0e455fc9ce2f36e488dd169833bccbad7acbbbe34e839a2b3f5d3e7edaa51a0a731670923f9a96cd05c49d18601bf623c1519e94d498c2
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild b/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
index d02fc54423dc..ae968c881e10 100644
--- a/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
+++ b/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/yesod-test/Manifest b/dev-haskell/yesod-test/Manifest
index 2e04e81b3d93..bcd7ab4c33df 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-test-1.6.12.tar.gz 27738 BLAKE2B 53cc4dc136b4d08c932812f2bd0b7f46ccc4acc3b0b0a2020386092006010859d3c0b14d9e4b36e91ae46617941d008d1795d652ccd1068437e537de83a4e4c3 SHA512 777d112d8c5ae77d667da2b8d1ed91a1cf751850d5b3678e787e7123aca8666d0a4b6d6161b7109491012d56c160603d62563b881a136ccc76a1edd006c423d6
-EBUILD yesod-test-1.6.12.ebuild 1509 BLAKE2B 467e0fc3888c9cd6094dbf2394c1d22890633e87c7f9309166dace51660983a635f8cd1e5c1a2effb0d4a8556077cc661b8e530dabd45aaea160e65750fee8c1 SHA512 2117b91e63eaa5775e29a82ea3b9367849e6d990c441ac708f692b6e99e5c16d122b642f232cc00da835129af9189c1804604a96ee538556c9b5c8cb65032c31
+EBUILD yesod-test-1.6.12.ebuild 1516 BLAKE2B 9b4449526a926aa4ace57c14675dfb18ed6d6dd9b6f9ea2cd6f0899d0260c3b753c586011fe83174711ec9bd31ce284a56c69bed7cbc768c749d5ab9127a428f SHA512 37ecaa2868007a0cc13743a1375c618444e334e0e3aa0afca3f098f3037a75a81d3a4d4594f9a87c79a9ed8366a0c27e5f4b7d0ea6272a24251c7344dcac145a
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
index 60de493bb0df..9be8b2a94474 100644
--- a/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
+++ b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/yesod/Manifest b/dev-haskell/yesod/Manifest
index 1980707e8429..8eb16293546a 100644
--- a/dev-haskell/yesod/Manifest
+++ b/dev-haskell/yesod/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-1.6.2.tar.gz 9927 BLAKE2B 551b6a659180536dae72cea4a342f7451eb005cb79bd06cb5af38e41052956c40b93e2368da307ccdcc8bb5e0ea718ae89e7fd858b3273d8823787a333f11da1 SHA512 7c7a3e191ce91ac4070179bdfdae89c60e91c702d9141bb90fcb7095d175727a3f0648221ea151b6e1f5c37a236f55c37aaf963c526e4ced572c19bd6fb0b3a8
-EBUILD yesod-1.6.2.ebuild 1267 BLAKE2B 1f649958b685f0abebd680cb2f4af946cae7d1610586c2a2b159d4ca14eb5387feb7053289843fbce1f4f70ffb92f0b6935acc67ae2568a080e3565991d3423c SHA512 87e2e42bc1a879d7ce5f2fc935f0f1468ba3e095c4b5304e92bc62ff47f68a6848a37b619e44ddc69c144e95197ac8b97b73efc065aa9ee6cff57abb213bedf2
+EBUILD yesod-1.6.2.ebuild 1274 BLAKE2B d12838cc3c00ff60537e53929b2730b480f5e3c072c02339dbf51a1f822c5e8b2f6a5fd06fa247f2cd81782334260c1641a68610d5534d2f6447d7774b9a83c1 SHA512 581dbd8d294b8592327d16354bbdd47e319620d6cc4272983c735cb4d80cba003c2782f64467d2111e2ed7da23f3a526b05fca53565bab9440af8572ec63082f
 MISC metadata.xml 839 BLAKE2B c8c057d2fa18bf3817f0325e7a4ec021d6f1449e1db930d15ab2084aedb70725d4c4a11872b422471d2fe7f0cd580896908f270d4a90f189dff6b2a789e648ef SHA512 82bb49bebd2cec85303874d75f8160f260b2be1d0fc68e9bdff64d0de5429cfa0fd583d9bdcc72d38b52e423622d3e0c89145743efae8accb71e448470313a53
diff --git a/dev-haskell/yesod/yesod-1.6.2.ebuild b/dev-haskell/yesod/yesod-1.6.2.ebuild
index dedbcc5adbe0..2a3d9ff97c69 100644
--- a/dev-haskell/yesod/yesod-1.6.2.ebuild
+++ b/dev-haskell/yesod/yesod-1.6.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.yesodweb.com/"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/conduit-1.3:=[profile?]
diff --git a/dev-haskell/zlib-bindings/Manifest b/dev-haskell/zlib-bindings/Manifest
index 1b9e767a2a5d..1e620e5483b6 100644
--- a/dev-haskell/zlib-bindings/Manifest
+++ b/dev-haskell/zlib-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST zlib-bindings-0.1.1.5.tar.gz 54770 BLAKE2B df5ed0474ed29c47720b4d94bd8dee49afeec36e9ecafe6639324bbd0ff2c0ef8d52996c54b3ad09aaf3a1b84ee8898bdcddc91705e33847e3e9e1d6cbb4af42 SHA512 1ce7a21f462ce5fb1c6ae0ccd40b6f59eb95772b46fa8f5cb3b94f76d55189b7c020dfd97cb18afe21cd826d1a511d9d02909c4376b165c2f574ec881f7de299
-EBUILD zlib-bindings-0.1.1.5.ebuild 675 BLAKE2B b984dc6279d5242a83810e23ebe2878a36a03bdbe4b6f49d93efade13a705e688f59e8fbf78972a0f528a5df5a72f8aa993fd186d123044614ebeb2a436b8db3 SHA512 4cba0479ae5a6e424c888e68cc44a6c0edb4e00d32f6fe83f0c0a6b549db118d33e6dc1a1795014b8b61501f1a6d79b635da2e000c9d7af72ab001c69aabd394
+EBUILD zlib-bindings-0.1.1.5.ebuild 682 BLAKE2B 0595027f7bfedf23af3c0905bffb7a82fdc067055964571e6717954702d73b95715a4ed95f74db7ce53ff901864c22b66b302a57e3b03acbd6e55145a2ff2730 SHA512 51fa9c44a6b16f068270848fe443cc0e3d9a5026522186bccf60776200e5f7bddebe886c7c8838babe5d14ecc0cbe31d018af4620fcde27f7d450842004171b5
 MISC metadata.xml 337 BLAKE2B 6c2501b7c5b9167ab8a5f432edc55e1862a41b8036fb46cdbadc54ac6cf2f79ca69f955eb35a1bab9837df0aab718cac4b2ac1bc65441779f2c4bd259ecaa884 SHA512 2255388315bcbad1d831b953f19feabe4abc61faa9ef244b6d7991acfc6966a4104150b219ea8beff9a7d7fd967933fefdfdef046085236acdd7319bdcc0d95f
diff --git a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
index 847e306bd483..db10882bdcc9 100644
--- a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
+++ b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/zlib-0.5.2.0:=[profile?]
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4fcf86620cd1..25eaa41b5f79 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index c2ab2c5713e4..996642720e4d 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -2,5 +2,5 @@ DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d420
 DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
 EBUILD gson-2.8.8-r1.ebuild 1745 BLAKE2B 6df1694112b6a71a33b7e96cb84d227cd96a69e6f55c3a964e3f4cbb585e96f9f457900e47260fb8204e7bdaf5e771f4dd9833090e9f22a63388e224e9fb4d7f SHA512 af2f7b14c43f914a91ab4285c1f702388fc45d9d78bcf9fdb65b918436bc4cfda135269168255df20813c24cfa32c38ec4eabf5a49fc6e22b2c6cd6e5bc3c063
 EBUILD gson-2.9.0-r1.ebuild 2095 BLAKE2B 71415fd6ec715372eddec83dd7ee27e84ba2bbf06d9e0cd206d3ebbccbcd8c90ea310befb4730da41a495609903049aef94bbd0d24125a6c0cc3e7f37b31f34a SHA512 217c6663d07526a44e9c23ffee344c3fd87653da8c14b359f7bb927eb78e564071c7678e55bf28c6b6baf4f019c2046365fffa1041d022c67af1814b71b98436
-EBUILD gson-2.9.0-r2.ebuild 2060 BLAKE2B beda8028f1e6779345dac9e6ba2a7bb80f7ce188425f29f45c9caf673e6e7170c65dbc15691b5fa8433fb582b40d075b6c9711f7f94a2ffa6cd8bc47bb123123 SHA512 a5e874d6a35b5c5006128f94573087972b292229335a4944b0c12fade665fd9dd50b52ddf94a354acd5df4604fd34edb977db1501db699306c972b848e0adf5c
+EBUILD gson-2.9.0-r2.ebuild 2057 BLAKE2B 1ef09925f3eed346c4ee76506b821f56c02a848ea01a25d091cbb2773080253bf18ef155de6b39cef73ce89baf3c9f878cb191510da43982e7d9bc0aeddd00b6 SHA512 9f9c561f910de179b87ead15ba45f6b781e4d16df2b5f80f59304f582e4c0fb571941d14b6f9c6d78716506541d271de7e0689f76ab71e75f089621c4e5c9794
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.9.0-r2.ebuild b/dev-java/gson/gson-2.9.0-r2.ebuild
index c5ddf82b4f07..bad7217e8a67 100644
--- a/dev-java/gson/gson-2.9.0-r2.ebuild
+++ b/dev-java/gson/gson-2.9.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="2.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 663af35f4242..ee37783202e9 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,4 +1,6 @@
 AUX zstd-jni-1.5.0.4-filter-flags.patch 369 BLAKE2B d79c3f5bee1e8faafb96a6d87c03c1cf5d1f292697fef1d7724394b9a415a30d9912946a612003e93a278648e4e5b1cc532e28d2c296c90b683eb7e0e769ac9c SHA512 fb56c386c6db387aa2c27a722d3c417813c427425d0dc6fb350ca02bee3f261efbb639eefbcc5dd58107f33c0211dba1b5bc696680e111a6338d0a67381ab533
 DIST zstd-jni-1.5.0.4.tar.gz 9296353 BLAKE2B 1b4011cc7876d3d4ca2636d9872b1127d3a700f4cc6b159a36dbff5e73a2ec3af91d4a27965123c9dbb9f017200bb68bf7e078806d25d7e395243c2251936891 SHA512 2d83a1e4ff6c25ef301dc25343dcfd4f2dda7f8c44aae2d1d5da2159affb6d0c2885693022dd5cbd2d360540092bebfe0635b61c899fc7ce8dc496a96ba6f017
+DIST zstd-jni-1.5.0.5.tar.gz 9297542 BLAKE2B 96b2aa09d62c7a45c352d52358aa47a66c95c1b122bfc61b7e2b3aaa829e011a8ed6f71373130700ecdb7d8541ca6971c2cd7fda01be396053532c4aeeca3cb1 SHA512 b63858d58c7d1b2c9d120f49d1289caa7e5b429d0f8c3c95b7f58a5d432f09d41504c5f5b0934f53be8eadf3c1ab02a1a872e292bac465907fffe2a67108267e
 EBUILD zstd-jni-1.5.0.4.ebuild 1628 BLAKE2B af3514aff4b542a30f98f179ccb5bdf7d78d9f1c152e2ecbffb10d585dfbcc9308a5b0a9515574650641eab1654d848ae75fd8d1526b424de4d0b7c463cc59af SHA512 0d5f86d2e2c55e58679b80e8091ba2726da1d37ec286003190b3ead62f645dbae10e89a820d9d501d2a66bdd10c0089d0d861c998aed9b30e6a77c223a8d83a1
+EBUILD zstd-jni-1.5.0.5.ebuild 1653 BLAKE2B deb34bf0b64209f8f1e40e4672eecca6997def1e39706ccd7c6ef523b573d749ec3963e370a984e7bc6a336e1cc552ab5da4c178d5eea5f2437602fe288667dd SHA512 e9a7280291cf5f0849a9e1b429469680dace8349d338a8dc334ebbfa50e396ebe96d599561d7acd2a55a9c14dcc2fc2a002a8e0527a0fcad5fdbe23c426965ec
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild
new file mode 100644
index 000000000000..fd0b9e85ee37
--- /dev/null
+++ b/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAVEN_ID="com.github.luben:zstd-jni:1.5.0-5"
+MY_PV="$(ver_rs 3 -)"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="JNI bindings for Zstd native library"
+
+HOMEPAGE="https://github.com/luben/zstd-jni"
+SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}/zstd-jni-1.5.0.4-filter-flags.patch"
+)
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	cmake_src_prepare
+
+	echo -e "package com.github.luben.zstd.util;\n\npublic class ZstdVersion\n{\n\tpublic static final String VERSION = \"${PV}\";\n}\n" \
+		>> ${JAVA_SRC_DIR}/com/github/luben/zstd/util/ZstdVersion.java || die "Failed to generate version class"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+		# Resolve bug #776910
+		# Reference: https://stackoverflow.com/a/51764145
+		-DJAVA_AWT_LIBRARY="NotNeeded"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	mkdir -p "${S}/target/classes/META-INF" || die "Failed to create META-INF dir"
+	echo "Manifest-Version: 1.0
+Implementation-Version: ${MY_PV}
+Bundle-NativeCode: libzstd-jni.so;osname=Linux" > "${S}/target/classes/META-INF/MANIFEST.MF" || die "Failed to create MANIFEST.MF"
+	java-pkg-simple_src_compile
+	java-pkg_addres ${JAVA_JAR_FILENAME} "${BUILD_DIR}" -name libzstd-jni.so || die "Failed to add library to jar"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 729e9688b897..0bdc1985574b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index fe565c1301bc..463f83e39f55 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -4,5 +4,5 @@ AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d1
 AUX icu-71.1-CVE-2022-1638.patch 8694 BLAKE2B 2277f0f066609817d0c5ef78f50f33f82c8575152b185a4c79d334a79c38ad902742c9f0558b90a33191d913df46e4b97356c0d7914d5f7bb4451fb388815c97 SHA512 3c6358120247bd094fec7a8e73f51445f979da5eda87c3a272f4df59625e1345237fe924d94824ad6f0785c8c1d70ee2ecb8a54abf9078c6510bee088adda2c8
 DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
 DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
-EBUILD icu-71.1-r1.ebuild 4179 BLAKE2B 3eb72b51387207e69956ce24faeb478b88a5fe7e2b01aa684d98bccece6e033dbdac9caf7690b67ec4a0dc19bd6185b4b4dd72ccbf8c9c9e725a0fad6d184924 SHA512 4afe643f51da7ee92b3794eb35f39f9c3d84d8486bfbce624daaa9b7448cdf5fb20943ab6ee130ab47dfef84cb4b5a2839fc4fa12bdd99ed8d369eb2a0827b72
+EBUILD icu-71.1-r1.ebuild 4192 BLAKE2B ed0cda8aa8f81fe43a3456a59781fbcc235e89eeafed4850e680cde0b6d94829eeebf66e38451e9cd44ae92ed3333da147cf2d7c00f76df0e6502ea649569eb9 SHA512 f91539e7c78300e389c320ff67f106be66f508f9c8f066945a8037eac7207cd5dc40c13d53c1b77f0189049c605cd1ca4e47c4b5cb947537cdadbe640cb55b63
 MISC metadata.xml 336 BLAKE2B df52385ac9930c85fc8cb8799f5fd083e99bfe1bacd63519001f91b841cacdc50d6b7ed32f3520372cbab48d270bb05fd0896eaec55046ce1eac03af4502365e SHA512 80d8e03229a72e9acd1429f7ed697df59e98899b135bb40367e95d6eed63aa011efd2121601be68e685350b6eadd46e6f39c036f86ff18bc3c85410e88008c7e
diff --git a/dev-libs/icu/icu-71.1-r1.ebuild b/dev-libs/icu/icu-71.1-r1.ebuild
index 87911072ee9c..b611c9d0a72c 100644
--- a/dev-libs/icu/icu-71.1-r1.ebuild
+++ b/dev-libs/icu/icu-71.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # Please bump with dev-libs/icu-layoutex
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc
 inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig
 
@@ -62,6 +62,8 @@ src_prepare() {
 }
 
 src_configure() {
+	MAKEOPTS+=" VERBOSE=1"
+
 	# ICU tries to append -std=c++11 without this, so as of 71.1,
 	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
 	# we still need this.
@@ -136,7 +138,7 @@ multilib_src_test() {
 	# CINTLTST_OPTS: cintltst options
 	#   -e: Exhaustive testing
 	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
+	emake -j1 check
 }
 
 multilib_src_install() {
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index dfc5a4d50d34..cf54063198af 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,3 +1,3 @@
 DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
-EBUILD jsoncpp-1.9.5.ebuild 1230 BLAKE2B 9f3b16373714bba34bdd355160070520f6e6e27697ce952ed239a00c270026bdd8fce0b6570201649999ed0814262caf969daf3970a05494c3b8bb716a7cd3b7 SHA512 933184fc1284e0e9cfc140c73aaf5837426d7d9a63dac2efd7474a6718c247d5cbc4c2beeca53fe7fd06973ff9959d5e0bf9f8cdcafa49c5d44c8faa2be2c65c
+EBUILD jsoncpp-1.9.5.ebuild 1230 BLAKE2B 3d3101e6dabe6153ebaa04b7a90d1b8b1f28c5b32fb57ea916321f5f06e5c68eb9f9cde07d6b200e68900e7ee5c10c61049502872e25364e695e089399159f2a SHA512 0f15737e7756616ef15bafd416433edd803dad2b5a67c2176d65306b05039a310709f40cbee2304bd83feb8efd56b2d234f971dfe97b6f3af9c44415d4622d59
 MISC metadata.xml 404 BLAKE2B b1439e7ff1121eaaac0eabccea420806b8c059b6cfc43fec2ec47ff5e3a937ace7a1afa4c3a5f18385de22b3979e8648f048cc7a8717b0ea5e282e08a3914bb8 SHA512 700ebcb293411f62c10a69640c5e7d9240f90f513435b54b77e0fa30f1bb732affa0055dcd7c84c858a50d56f0b3a138dfe6410f8a45fd91d1af62ea827c9e8d
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
index 56dfa76aeeba..515258e3ab05 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-any-r1
 
 DESCRIPTION="C++ JSON reader and writer"
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 9a41dff44bea..a42a98f0011a 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.12.1.tar.xz 446476 BLAKE2B 3b73c50b5e0bdf6dac001c7e34338ece2ba796af711d8f6f9c2928f93a8f41ee484e067c3cb02878de49d631de87229d4b1a377123e385af5997e11f7c556510 SHA512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4
-EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B 16e83557d0e0a4f0a8b619ffb2562ddf8198bdba660a00ff63e72dc7ee7c92d7541fb44f80f48c954a13eb7902bc2a64ae8a2717f4c29b626592ceac087043f3 SHA512 278b1fa8c4c44aefede7fb3a3eab51c0c3456befbd6df801abf28013ad2ad90d140c3657dd7b7afeae7e32bff1dc306d9ca3a7694da54c2e0d15bd95744f76fd
-EBUILD libevdev-9999.ebuild 1119 BLAKE2B 7454c31abb9ea204726b25bdf082078716cca0e911e3012121c06cb37663ebf911e48765a5e718db2b65ace23cebcc305e34129576e4bb1ff863829520f21b6d SHA512 805de4364e75326dada41594b727af707f8b1682b990cc4871a475a545b43a4539e29b57b26bde18e72620d38f2dbae0139094e8d00b4c872b0bd174a83fe8b9
+EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B b39700425b4711359fb8e0f05f5473420ce3ad87eacd8cbeaf40c605c2c8a5853df8b60f137dbed41db5f9c401b2336835bf78af074676891c97f2461434e563 SHA512 f86f50f39388d35606ead66f16594f2bcf3c4de27649cc956b11f59bb61636b593f44aede81c4cda16b854c9d128874071df69e4afa573e87679c7bd450e9ab9
+EBUILD libevdev-9999.ebuild 1119 BLAKE2B dde6bf4c9c7fd7ff688237ec8a793d9d2303a0e78178cb79839ec0332e7a1ad3a3e139ca285b92bf55e7aef054953d58e4c8b360b99adf7af04cf36783019281 SHA512 26c9e626570a80ba6e0ba5b59932830fd4cc7817f0f2dc0f7bd6c8635c71dd1fd9f923623b4bf9d39e3f64d882187fceb4fbe4be46468589c2f85e80b857bf8c
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/libevdev/libevdev-1.12.1.ebuild b/dev-libs/libevdev/libevdev-1.12.1.ebuild
index 1b3bfadb1175..055511866150 100644
--- a/dev-libs/libevdev/libevdev-1.12.1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson-multilib python-any-r1
 
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index a5a5af24e1b8..3ebcd5465269 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson-multilib python-any-r1
 
diff --git a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0-r1.ebuild b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0-r1.ebuild
index 7598d70bc294..0a59f68ebf25 100644
--- a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0-r1.ebuild
+++ b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.formbuilder.org/ https://metacpan.org/release/CGI-FormBuild
 # Explicit declaration by upstream
 LICENSE="|| ( Artistic GPL-1 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CGI-FormBuilder/Manifest b/dev-perl/CGI-FormBuilder/Manifest
index f0157c99caeb..f502a7a47351 100644
--- a/dev-perl/CGI-FormBuilder/Manifest
+++ b/dev-perl/CGI-FormBuilder/Manifest
@@ -1,4 +1,4 @@
 AUX CGI-FormBuilder-3.90.0-rt81650.patch 5659 BLAKE2B b1481c41d4dfcd5fec774e1cae5c445730595e5b7d63843477d7adf9fac5f8da8c8703a0eb882c2b6a335f2f24aaa45f97498b842efae37fd5a3128fd179d708 SHA512 fd5957adf995c2d269bfdc69d54a5244f1190f0786c57a614ec438c6386733b2587d1b8b9720c6e8c89f24e9b9bc33745a62b16e355f9b5e7ddedde639eee8d1
 DIST CGI-FormBuilder-3.10.tar.gz 162346 BLAKE2B 96850d80b10e1c96cefd4fa83316b470898388047cc34ce7dc8b6f29086e6622e743ec548370faecee8b88a4f5ee87e7ec4c98cb5df04cac5a4a8d63e45c5ae3 SHA512 38d8e6eb729e188074d872b979ad46133152877bb30b95329a2c7275154646a4afb62dc3539cb34781149f424b1d384d05230efe8b174967742625a81765bad5
-EBUILD CGI-FormBuilder-3.100.0-r1.ebuild 2205 BLAKE2B 0d0d23c687f5da7b9d64a08a36ed066dd26f9ec0767ffc88b9d3ca18128a8c6786e7ae4c4fc72c8853e047fed069f064330a9eeb3c416d2752f823eda231527a SHA512 e2726f6c0830bc1182d1412b349f6eb9610803dc5a6af2ca9d89836dfb26b20ebe4807669cf32171e4e38e9c16e50a3b38d78aa5f64156b3d1e7df6a4bf40dbd
+EBUILD CGI-FormBuilder-3.100.0-r1.ebuild 2212 BLAKE2B 2b70e349b9b2373118155306952ba161ccffa541a61fbe9a7a92c7a31f32512e144bca1766c6384762903cfc34e6d507187f67a10ad850a55590ada42c0ecc18 SHA512 ece19934b82ffd0f01c874917f699483ec6f5cb7e5eb253f98ea5b96e45fd588a5210f8d34bdf76b381fd38f0c7aded939491eda7bb5aed155f0cc9c616ff3c2
 MISC metadata.xml 3258 BLAKE2B 16fc86e2b66f56c49a2057abb23c51a07eab42e40b800ef85d082626df52ef410242bd0479a18916e96d097e2f990a6453deb003e99872e459ec9b6eafee955a SHA512 6c94bb28632d728321e072218e38fb9fc3aa74912c22e99f138b15d2ad7479c781a984df669f6fff95633853d6bc97496dea37b21e8dec7f96d7b2ed7b0d1fd3
diff --git a/dev-perl/CGI-Session/CGI-Session-4.480.0-r3.ebuild b/dev-perl/CGI-Session/CGI-Session-4.480.0-r3.ebuild
index e3f010cded28..1e02a7bce4d4 100644
--- a/dev-perl/CGI-Session/CGI-Session-4.480.0-r3.ebuild
+++ b/dev-perl/CGI-Session/CGI-Session-4.480.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="persistent session data in CGI applications"
 # Bug: https://bugs.gentoo.org/show_bug.cgi?id=721398
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CGI-Session/Manifest b/dev-perl/CGI-Session/Manifest
index 03d625bc86b0..8f0e3d432f91 100644
--- a/dev-perl/CGI-Session/Manifest
+++ b/dev-perl/CGI-Session/Manifest
@@ -1,3 +1,3 @@
 DIST CGI-Session-4.48.tar.gz 95291 BLAKE2B d1d915c85e230ec73575d56cc92589c45a5f6d35f52737b5cefa61704cfc42aeb6682e3e56e1b8cb015ff2d55b141dcfe01ad4fe376e70ff17014edd3951a531 SHA512 82d6a498035b91474df712fdae2c9ce7290157ddec36095757f16b5cbce593d3b5115077c722350d1c890c299230f7489a41328ed64b85a0f4c3cfff8aceef54
-EBUILD CGI-Session-4.480.0-r3.ebuild 625 BLAKE2B 70cb12d2cfde88204824e9d186ffa48a3c686c27afa909174f9a566bfb7f0995ee4782a00a8a807be37273ef2157d7dc79137eb1aab0f232d119e3bcc2cb1ac9 SHA512 8ce19ed7829950e79f2af482c849dc9b5ab126c7296c0ecd9d5da56913e9caa0fd6321ec783515cd1fbcb099de15d7c5dde3fc7f45e662e98aabe7189280f72d
+EBUILD CGI-Session-4.480.0-r3.ebuild 632 BLAKE2B 984dd879168fbe591127a3cdb944079f25e6095771b0eaac90f013958ced9f139c65fd7f90b8a4b78363819edd84d5c0aaae49f73cd3c2b25a4f3ca457bbc192 SHA512 e13debf84c7b4cec62e04ec6fe52a8c58ab98216678742717d9a7a7e1cb8e6c7c999a2281ea343194a1023c4b6dbd4d077a9e00c1e0976a88be180ae57a2d0fc
 MISC metadata.xml 1722 BLAKE2B b9496dc5cd8d2d727d39f8db58fdfbfcc413b6de4fb33fa834c57e4963a3d79bf4e7c4a9710ca3fae516d485e3e20b1385bcee1c7b315cc56e34683c86054297 SHA512 8ccbc8ac9bf91cc9f64abfdeecc3603c72c319d3aa56cb102a372011c757b227a59faa0a0088a0f82e57e7431ed81ff70998c1a14c1e4ed98a3b08964f9a9dcd
diff --git a/dev-perl/Crypt-DH-GMP/Crypt-DH-GMP-0.0.120-r1.ebuild b/dev-perl/Crypt-DH-GMP/Crypt-DH-GMP-0.0.120-r1.ebuild
index 317f7351fc93..3e07f6b5388b 100644
--- a/dev-perl/Crypt-DH-GMP/Crypt-DH-GMP-0.0.120-r1.ebuild
+++ b/dev-perl/Crypt-DH-GMP/Crypt-DH-GMP-0.0.120-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Crypt::DH Using GMP Directly"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-DH-GMP/Manifest b/dev-perl/Crypt-DH-GMP/Manifest
index d35500e01fe6..4852910df41b 100644
--- a/dev-perl/Crypt-DH-GMP/Manifest
+++ b/dev-perl/Crypt-DH-GMP/Manifest
@@ -1,4 +1,4 @@
 AUX Crypt-DH-GMP-0.00012-no-dot-inc.patch 437 BLAKE2B 74c94154a7cbd29035bb73a55431490e59fc188dfe228e4a5a84c920ebb1055d13adaec0a4d1288e350186e052fda6f4f85248701078d419cc42f7f331644f8c SHA512 5d7cd1a38987cf34b6be84b6a3171505c9ac134eb2f249e129ed419f0ec66224bd61d4105ab64644afe01094eeb8390d42c15dd805d74290722986c4c64a720e
 DIST Crypt-DH-GMP-0.00012.tar.gz 34421 BLAKE2B 3d12f8a2f3950466fd21e5979e81a3a3e9a94f53e7f07790dbbe11728ccc3170ba9e49ba88f79a9f3487843d67071c77658341351b2551bce8603acfa68f9527 SHA512 f799017db780613b6d971f626659765f282debe63207bdbc36db223030bcd8f7f478c6331372d9794bcc8207d71bfae6d62048439766916478f4b61f42c5bb6e
-EBUILD Crypt-DH-GMP-0.0.120-r1.ebuild 770 BLAKE2B b05d40a1e8dc7bf7eb25189328e77872dc1a20e73f3b533d997281a397bc81e6bf65028ab53393a35e3f8a30531ac88c3fc0ad377c097a6ad328bfc1366fdbd1 SHA512 4b6de00a5f7c24ffba3c72edfd05d5c6deb3d4a45cffe3c644c29dbe8c1e6ca4c0f262e6a55d6ed1cadc0d69f153e3862404abccdb78556cf429a6359150c111
+EBUILD Crypt-DH-GMP-0.0.120-r1.ebuild 777 BLAKE2B 8eefc201a846e50256c05f9d51fef4594e5d89235060833f716f997b21e2b61be72da70c84020885a5ad471a8460afae76ad3864082830a932239e3fe9519645 SHA512 4acfa41a059693d452d5131fe1128c99358b0c81a7cad259e0c6aa6c56ffd7ff51388ba333dbefcced04cf692d42282dc184c3089f9ba2bf5d9847abefafc1ef
 MISC metadata.xml 467 BLAKE2B 891fcecf8f56b9c6ba4efddd979ad9827bb98641ed7f889f20fbb8fea9d620a5ded099391ae00617fd64cccab6d437c8bc4aab3cfff5b4b84062abb7501be9cb SHA512 81354635e02522d6b346121a394edd407f5498635cdb9bda88af94e4105309ef4fd89d75fec61942731d826f428f058c99a75dcfe869c6484ad5ebfadd2801ca
diff --git a/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.340.0.ebuild b/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.340.0.ebuild
index b1a204a46204..59f412d60924 100644
--- a/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.340.0.ebuild
+++ b/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.340.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Flexibly parse strings and turn them into DateTime objects"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-perl/DateTime
diff --git a/dev-perl/DateTime-Format-Flexible/Manifest b/dev-perl/DateTime-Format-Flexible/Manifest
index acca7929b689..dabd747916cd 100644
--- a/dev-perl/DateTime-Format-Flexible/Manifest
+++ b/dev-perl/DateTime-Format-Flexible/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-Format-Flexible-0.32.tar.gz 76438 BLAKE2B b7a0f5abdba67e70979c510f13849697a9107eb275d5702ce6eafaa5abed140ee4072778642157f827823badd0f425e861927d5956a4818f6d0ce31c821c28fc SHA512 90e0e83cecff5daab132860c2da2d77c92c0791fe8d0d6aa9275c1e0d603b644a8531848d8fb4bad8e1800c02a4e571ceda1a4bf4b8ee9bd7ac0215898db2882
 DIST DateTime-Format-Flexible-0.34.tar.gz 76347 BLAKE2B e1b2b5506be26ba274a80889c17bd7f5f3073d10e01948c9c3b591476dfd19d048c7d25269802bc071b1c9df1dc1752ab3febe524ca22b997ccbec7674fd0b0b SHA512 2b2d730aaa9c8f6152f57493b8a0b2f9600b06dcdf2776bd1cb3fbf26c3b5ab31351a32fccb5072ed7410b558354fb3f9e3e8fa5af99da846fc623ae25e1f763
 EBUILD DateTime-Format-Flexible-0.320.0.ebuild 735 BLAKE2B a7fba885b17272b5074f1dd759f3eef48b5c545dd0b7b3c22aec4130435d48b1a9ea4750881f005f56367ea945b1ca6bd0634831a73f22cd4bbd9530806be996 SHA512 2d0a7c3ae871bec50d813b5be7b396bce400cff7d18a9b5d2e1e1845a973d0ff240531485a46cc6eece1ae7d61e8609fb7d3f3a26526de8ba9b4111927e1c738
-EBUILD DateTime-Format-Flexible-0.340.0.ebuild 669 BLAKE2B 508dee790890eff1c1aa4a25c4702207efda253419ee7b4896a2f0044e84a4bbbb6725fd121f6677b8e674ed9cd12da56d6605f618a016bb8fae0b2781833852 SHA512 09cc379675df2d22048674a2ca382984f8d01bf09da247caafde9d380328f4f6ccf89939b6f97e1b9c1be043c19398c0bad1aacd312e7b576de4e6e67a95c09c
+EBUILD DateTime-Format-Flexible-0.340.0.ebuild 676 BLAKE2B 5cc0b7d3be3e9951970896cf17f040dacad8bb63d1deecfa6aefef00e85f4e028a4f06177ab27b1bc95f0d374011efa2c1d1ade470d512d144e6bfa527dea6fa SHA512 c53050946677254500a268dc40e87c068d92a572a1aa584153facdba27f7bbc25ac24a198f9e6ac6755d3033717f67d65092755c247b33f6923b2add2b53dea5
 MISC metadata.xml 750 BLAKE2B 74bf2a66a333bc5ee146b3b2b557c1e7ef83b6acbc5413702c84ac6c0e2e78431fb350dac52280c4a56cd39b0fbf44a6be60776500f7753726edea77a86d014d SHA512 86f9cf8ad67d26cbca3da25ce4e12faed3d2d86dffd9f6331350a638a35e82e4eda4de3dfe23626729d863cac856cf068c4130771e8e52de835c8496d616cf92
diff --git a/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.120.0.ebuild b/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.120.0.ebuild
index 12deb3776d14..15b96baea95d 100644
--- a/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.120.0.ebuild
+++ b/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.120.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse informal natural language date/time strings"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-Natural/Manifest b/dev-perl/DateTime-Format-Natural/Manifest
index 8c1284dbea8d..9e4aa749a3fd 100644
--- a/dev-perl/DateTime-Format-Natural/Manifest
+++ b/dev-perl/DateTime-Format-Natural/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-Natural-1.12.tar.gz 82853 BLAKE2B 4705b8449bf255d9a2e15bca7dfe862d0c44e9e851808f2879e3452df083e89d97af2ff48a599959102a85bfb4d701b5dd390200c6516eae49cf29bb2e43fa32 SHA512 c2685815e76d7208d2491a01bc93e0c15657325fc1e9b33b85f123085814b9d4554a25b575241605a6c819f1627486b093bf08eeb25bb55531e15a15ddf158c8
-EBUILD DateTime-Format-Natural-1.120.0.ebuild 823 BLAKE2B dafd46dc79b50641e9deb9ad7cb44beae26281e30ce6d8d0b8a7ff53bd38528c1c053675be3647d19012d61835a1903212a69a499456bf50e0cb47a51f28a590 SHA512 a54002f09c8c8a0bd22f16421f12f39f333e07d061252dd8eb81384f8f13a5f921e3d23b0f917e39686878e013758eb0199e6abeeee24ee077303c92ad79dba0
+EBUILD DateTime-Format-Natural-1.120.0.ebuild 830 BLAKE2B 6353bc8b0d68da7c709045a17cc678c8de9822c8dde27e75da4c3daee62f3fdf8f777f9cb984cc864d5554db37ddef16d07cacc55680ea6be52cd4ed33f55f0e SHA512 a14128f08d732224d465f0c7586c9637c317c6d287e0acb57fa915bc110278a468105594273bb832edf4c741a708b97f1a1ece807de34ba5c777cf3b2e6a3594
 MISC metadata.xml 1561 BLAKE2B 42dcfac089867f7b309ea7cdf73bed3288e1618edc82348a8c581aa32f7f99ed07c90ee501b21e670c18e8b439974b3bebaa9d4d71a217af3ac362bf9c7081e6 SHA512 e0d0c45e146c0604b18c0ee9b617913167823ecd289751fab414ec24eadf3ba8c415288f3ffd5c113c2df8780644278b3c10c74c3218148012e89115b53426cc
diff --git a/dev-perl/Feed-Find/Feed-Find-0.120.0.ebuild b/dev-perl/Feed-Find/Feed-Find-0.120.0.ebuild
index 03aeafc6da68..8fa1786e39e3 100644
--- a/dev-perl/Feed-Find/Feed-Find-0.120.0.ebuild
+++ b/dev-perl/Feed-Find/Feed-Find-0.120.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Syndication feed auto-discovery"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-perl/Class-ErrorHandler
diff --git a/dev-perl/Feed-Find/Manifest b/dev-perl/Feed-Find/Manifest
index 1517b7fbdf15..580453b19463 100644
--- a/dev-perl/Feed-Find/Manifest
+++ b/dev-perl/Feed-Find/Manifest
@@ -2,6 +2,6 @@ AUX Feed-Find-0.07-local-network.patch 3155 BLAKE2B 270f07393e073584d7a320b3fb5d
 AUX Feed-Find-0.07-no-dot-inc.patch 473 BLAKE2B fa2bdd11f5c679a8b22d2a03b5033ae29ebd881eac6dce8b82e6c27e50b80b211f60163bba7470357929f48df02e7aecc67c3c8d875d2fed9b15969676e51bfc SHA512 8b82d2e76db3eed8b455765e26d5b1ff09ca27f582b4a7512814ac244e38b8434e42cdbc5967b866bf73bf492758e51ee7020cef948cacbe781c11a4c8413727
 DIST Feed-Find-0.07.tar.gz 46380 BLAKE2B 9e2c7e446801decaf0f59cd1399b3a92195fbc174b3e65188367416167c9bf188402d7d995673602492cb0fe4c473dfd21848b7d00956d4f0ee66ccc037bccb2 SHA512 5ae62c0d5380d00bfae9f94d1d9ab7d024f3394ca7865d7a086668d84b0e4dfb18095468b966f7afd03f3b766f02822e9b19cfddf0f95ad7c0c3908e5a5806e9
 DIST Feed-Find-0.12.tar.gz 47396 BLAKE2B 4d41247ea6c592727a4db85662582e49a5744f3849bfa646758a6991963fcf20554b595847aa624cae605018826fa6bd354ff34ec64fc0d6eba84b4723e34e79 SHA512 7449563b99b85e2db8ec6662fe1b558bb78c591a205f58d0df6a3f1e786ffbece84150afb96fc71105a7de60bc82b68cfa1402c4d73d677773d4e0a687b66e97
-EBUILD Feed-Find-0.120.0.ebuild 515 BLAKE2B 9c5299e119f5772aa917cc4e81bddf5d44670c8dffaca5138c4df321970018913c1d47e4da2b9529906e76a7de63f4d897f248f3190db3e3803d4c93ed59d736 SHA512 a2dbfcbd2f1b67c9297bac34bdafafe3b7a0b01a79820afc56e62d141563bf9a9667a84a6d6eb68bd955896f6931b2eee5cc7d539ebf972ee23c078b53ce597c
+EBUILD Feed-Find-0.120.0.ebuild 522 BLAKE2B f2a0266be30735154c00af095640353d3cc5f3352bf9915bae5b385ecf4050a181a72af0a5bbeb018ce454e7e31ae9411e3745f9ec6e38f7bee54d3ddbfb2ea4 SHA512 392656b2261cbfc6de3ec9e5ffd85ec9588a62b0eaad50137084b45a8667b9b98653fdc8a3a439d2507d07dff7de1a8c29951a7f99a0871180226a869e83759d
 EBUILD Feed-Find-0.70.0-r3.ebuild 1203 BLAKE2B 4a607087bb9d85b54444e099591d46798229f5e9f89d003a628b56d1aac82e2fb1018f7a04c383be9dd80b5c6b0e3b18753c35f5ebd4c70b764edc8cbf3bcbe1 SHA512 56614935a7e484d250b3b16cb62f38da6605007817951edaa09751c8813f5b4220e894d28e8a8003d44331290818f6f61d42e6f883d84b37f2775391eca9cf03
 MISC metadata.xml 391 BLAKE2B 152de2effacd773dc0bc8f34a8342dee36824a8583487946edd78dd53642b587c71c78804874bce0a7842bdb939f309f81380de49c12a7b81143018036b62c5e SHA512 bdd03276ee048a3c7653f74d7afe493e1767f207f1077baf28ada1ffacb602e0df6b7571c6880d4c773ab6dcc6162a1c5777b01f3390ae527a60a59c00744c95
diff --git a/dev-perl/LWP-Authen-Wsse/LWP-Authen-Wsse-0.50.0-r2.ebuild b/dev-perl/LWP-Authen-Wsse/LWP-Authen-Wsse-0.50.0-r2.ebuild
index 0e17a61d2f66..5a4869e1f7b5 100644
--- a/dev-perl/LWP-Authen-Wsse/LWP-Authen-Wsse-0.50.0-r2.ebuild
+++ b/dev-perl/LWP-Authen-Wsse/LWP-Authen-Wsse-0.50.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Library for enabling X-WSSE authentication in LWP"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="
 	virtual/perl-MIME-Base64
diff --git a/dev-perl/LWP-Authen-Wsse/Manifest b/dev-perl/LWP-Authen-Wsse/Manifest
index 920d74b8c8fe..05908f2ab393 100644
--- a/dev-perl/LWP-Authen-Wsse/Manifest
+++ b/dev-perl/LWP-Authen-Wsse/Manifest
@@ -1,3 +1,3 @@
 DIST LWP-Authen-Wsse-0.05.tar.gz 11412 BLAKE2B db3f0425a6ccb9a34706e9fac926769139da5f6ea38a35b753a6217882db31711c43ad3617f131e55f0ecd47145251c0f6caa403df42024dbc8e6a99520392f9 SHA512 b5612b2996ea84680e75accce386a575c08ba941281329f100b4acfeba8ac56fca91abf5bdb45355b5dea407f578e24df32b7be2a3e26e7900e92c4bb724e2e2
-EBUILD LWP-Authen-Wsse-0.50.0-r2.ebuild 541 BLAKE2B a71cc1760d7fbf67961556f85f46912b6606bbfb5b4c5b9f5ae9719407cf4f6fcfa789508b0093b2139a5d6770316f78d62e36a60ec9c05eac07d5d4e447fa44 SHA512 7655a84a61f8b50d984da5d76efb55024cb1fbfd589c6468eb38c5ad71932665bc59d4e51bcc990e202b74b11a5e6b1e409c8c0bcd8bd6865f8ae3a2b1d66624
+EBUILD LWP-Authen-Wsse-0.50.0-r2.ebuild 548 BLAKE2B 77fc0fe6ad38ff817916d770e69369da755d6d8b2e9ee9d5f19aad408a98042d9943b50d56dea0a7292bbc253a9c4e81570f6edec141d07d062efcf8b9b1e073 SHA512 92848e4dc6fbcc04641700ff1b2b5b9b390bb6704758164fc70524b9938a8fbb27710c0da9137ff6356b9b7a9f3147658a3f5d7adf6a347904b598423085e1cb
 MISC metadata.xml 404 BLAKE2B 1963d0bcb4063b49a851f3c1cfc421535267b27bde079f0e5e6f8160f64419c537fd7c451b42bb46c9715459bf741d4362a3ac0649b5d17d282854cf8cd37dfc SHA512 879924a2654381158b4298f362936a0ef8710368da2b5c094e3fbcd66a0890a01d5d2ffce425ca05befbf60bfd12416d9e77919b650e4d3159da9fd15181237f
diff --git a/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.120.0-r1.ebuild b/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.120.0-r1.ebuild
index b9edccec2a3b..cb1324d33a8f 100644
--- a/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.120.0-r1.ebuild
+++ b/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.120.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Subclass of LWP::UserAgent that protects you from harm"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-perl/libwww-perl
diff --git a/dev-perl/LWPx-ParanoidAgent/Manifest b/dev-perl/LWPx-ParanoidAgent/Manifest
index 73c6eee792e6..b65968e94e04 100644
--- a/dev-perl/LWPx-ParanoidAgent/Manifest
+++ b/dev-perl/LWPx-ParanoidAgent/Manifest
@@ -1,3 +1,3 @@
 DIST LWPx-ParanoidAgent-1.12.tar.gz 57426 BLAKE2B f091f24ae6958f0512845d968816d3adc633a0fdea7183cc35a07b4866cd27cca661ec57f367130120d4bbccf11d30779c7ac647b28875838baa31c12f181042 SHA512 96c380bedfc47802e4167fc1e96dffac8544b74c5b29082728196cd709cd8997caf5c715f06a7d37aca7dbfb1bba1e452618e5711fb250d798beb1fc7a49134b
-EBUILD LWPx-ParanoidAgent-1.120.0-r1.ebuild 867 BLAKE2B 57d5bc1f7743d7861ef18569bf6fa1718069548a847c986a693d40969782749c45fe0ca638eb30d74c0c1362e8258eeb3851f33ca6ff4f9f839ad6dad5add625 SHA512 67d7c6701136d4074705ab868e1dc0ef6ddc2d2f0872bbabca9ab9a4989d2417b191c76ae42df6450c1dc6babd305c10ea1b10267014096ad8246487074c75aa
+EBUILD LWPx-ParanoidAgent-1.120.0-r1.ebuild 874 BLAKE2B 446c726cd4ff7e90a4b0aea6884b1b569458a46a04e1e83cefc1540e2d70935c002576673519c530a15ce8b10b81c0eb396663eabeb76ce6cf7f53df84eee285 SHA512 70bc44d7b34444515f60e706d028a57879310d2665f763fef00d6937d6aabf99e26b24d302d12e46a9c6761b285cae236441acaec31cbc996251c408747cf1d2
 MISC metadata.xml 822 BLAKE2B ffff4a57896c65b042b06b2c715bb57598d56d7e96bc49d7f4ec54aa025e09ac617fa2bca3903bc660a19c742c472762aebb021ce198c988f09cbf64303afa43 SHA512 e1b6ed0a538126d1abbb5ac2b51143a03d5efcd30dae481f9898da4d0e4e0d4145146bf87721ab1eb39f3d983068d60b8ca87e3a76798f28abfa5a752408cc34
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 09fbe647a23f..d29fb27a883d 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Module-Util/Manifest b/dev-perl/Module-Util/Manifest
index 932b44ce41dd..fca91861259f 100644
--- a/dev-perl/Module-Util/Manifest
+++ b/dev-perl/Module-Util/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Util-1.09.tar.gz 11661 BLAKE2B bb3007ea53f840539d6d8f6d1d46de2d0ef7a293ffa452cec3f9fc09a2413d45c8dc00600eda4ed11616cb35a0110a3e829706504b32072c0f98f228356919b6 SHA512 6669216598c5a3b41964e65792fa5bdea9675150bf2ef908ed3e154b9fbc207de0b766feaebc2656a5379393cf8acafa5e27aeb694b9a56d8ff3b5f9c35837ad
-EBUILD Module-Util-1.90.0-r1.ebuild 379 BLAKE2B dc4c7beba2b768702b50641aa47c355b7f7a758c45c3c66350d1f60125169734a66d1755f51808b61c6282fee16e446d337cb963f8aa670f1df1e8d06779c267 SHA512 a791148fbf8879a9bf7793f3809357f2db2752095ccbbb5c404a2916af3cf2ec0222a7d9a0c3bb7c1669475684311c55d53fbf072467fdf54686562ce561dcc0
+EBUILD Module-Util-1.90.0-r1.ebuild 386 BLAKE2B 8df5b60085f371e563043540fb44d91c680044c3800cc75ea140773bfa46818a51b59e8bf9198d7d8f453a0a8e38b6687164681a932fa37b7d9c16eec39ddca6 SHA512 60c4fd899dd1b5476b2817eaed8162c6fe821fe767a71fb1e58e72da7917bd26a17971b4729578f2959a2c88074dc0f081f046f299b3c25ea3846ada189eeaee
 MISC metadata.xml 383 BLAKE2B 0a5ad06e7341a04b41c9e49da240cd9cbcecbdef190e525f04b9888b28ca0ef8d275320bf8f6131a97836f6fd7b8bdae7ba9e6305de58ab1d69f6a259055595f SHA512 32b45ee7be1213331414d0bea1217eebfbc4c732574405dd98855e4e369e0573ea2cd100a8cfcca648fc9dbd2398a49cd9bcfccae58f2060d3ee8cfda7ca297f
diff --git a/dev-perl/Module-Util/Module-Util-1.90.0-r1.ebuild b/dev-perl/Module-Util/Module-Util-1.90.0-r1.ebuild
index 54d2a61ad1cf..483508723a0a 100644
--- a/dev-perl/Module-Util/Module-Util-1.90.0-r1.ebuild
+++ b/dev-perl/Module-Util/Module-Util-1.90.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Module name tools and transformations"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND=""
 BDEPEND="
diff --git a/dev-perl/Net-OpenID-Common/Manifest b/dev-perl/Net-OpenID-Common/Manifest
index 804893041530..b64002fe66d7 100644
--- a/dev-perl/Net-OpenID-Common/Manifest
+++ b/dev-perl/Net-OpenID-Common/Manifest
@@ -1,3 +1,3 @@
 DIST Net-OpenID-Common-1.20.tar.gz 28306 BLAKE2B a6c14430ccc77e1c844170eba5dde6ecc98294e95a1d52d5bb1e263c123377e6b38bf278175ffe03622ae752dfc4d8e5aea8ebdd0de07b3ee8fa8c2c3e5e054f SHA512 9d503834e66b8b3f0cef2452b7cec70559723e02b9b846b14eba63aa73f03d58afa8802ffe7517eb5756d78609f3382137303361542f312969aee8c0a46f0c5f
-EBUILD Net-OpenID-Common-1.200.0-r1.ebuild 647 BLAKE2B f3a8eff15d1650ff4983a81b60aa16d7cea38163c1f825116eab111ba73e32eb79a2a590db4eb57f47d73432b8775e4a991de707cf3322ac16f4b4d76b97b77d SHA512 12a035b841ff8e3fc38e903108eaa8ce853be82c4a46c7f39e6ba3c254c26bfc99f3fb65cfb3392e0398b64c40ff61c005cf91142b912fd340fabf3c775e81ec
+EBUILD Net-OpenID-Common-1.200.0-r1.ebuild 654 BLAKE2B 32e1fed610aea0fafac97f739930d7e782d432721ab3167bfee2469546fd35a7e8aaadd003f89fa1563e75cc1d62f3b71ea30bf3d9dff99254e33f5df3a41c71 SHA512 6e9150bbc4ff6cc15c4024d582e037fc1e101011cdd59db6af44bee0210e251e6f866c13d8dd7595f464c496358a07c9316dcd1694fe1802702b03a37db8eb4f
 MISC metadata.xml 1258 BLAKE2B 0778e92ecca225dc7f3358570245dc24299d1b9151c1e181ba4e6b36015801f1beda8d8a2d4e2e842e9fdce1b78a9c16e02be8b7827d3957834aab6b69a43b9e SHA512 30ca5d3143cafebf0d1f79c028a479d55838d4947de0de876fbe2d04cf2b31a9aedc76f533632759a296d5bf34247ad0ae15337f1fd758215e76702ac0a4f994
diff --git a/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0-r1.ebuild b/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0-r1.ebuild
index 67cf01682e42..5068d4e76ac1 100644
--- a/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0-r1.ebuild
+++ b/dev-perl/Net-OpenID-Common/Net-OpenID-Common-1.200.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Libraries shared between Net::OpenID::Consumer and Net::OpenID::Server"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-perl/Crypt-DH-GMP-0.0.110
diff --git a/dev-perl/Net-OpenID-Consumer/Manifest b/dev-perl/Net-OpenID-Consumer/Manifest
index 9588edb0bc50..1c078b7eaaae 100644
--- a/dev-perl/Net-OpenID-Consumer/Manifest
+++ b/dev-perl/Net-OpenID-Consumer/Manifest
@@ -1,3 +1,3 @@
 DIST Net-OpenID-Consumer-1.18.tar.gz 58643 BLAKE2B c6a520c3496c00a54a6d6b15fae4133ed37adf01237801b9e197e0bdf1ee19ae19af1794baf8e60d41e0322da7ac999ee388de8edca68c9e910d7c17196a0aff SHA512 b8d06ada0f574a88a8a9aecc4f8d11f9a9f91e0320d649a3e99b0ad91b463d22b94919206e1514d1891031c2c6e82f61a6421aea4746ec7314503f1ba9d22fa4
-EBUILD Net-OpenID-Consumer-1.180.0-r1.ebuild 577 BLAKE2B 0bbcf1b23971e48204bb40f6f0dc14a63e068fb545db561c8e03dfe4dfd26ee83e69e621321984d88f0e767f0d4989da5570e5ace118d6c91b11749d1ae4ea71 SHA512 15f7888251235085fa7debdf92eac641fb6898c502fd07367eb537d6035917371e39bdfb9202d75ad1577ac42351bec1f69b47b303333f1eaed451806c69685d
+EBUILD Net-OpenID-Consumer-1.180.0-r1.ebuild 584 BLAKE2B 6376437104c6f0cfc675eb23439c86a450f2d1316e0ffc04372825af889cafd7f1b05b8bd9f646234b38ce63227615335e3fc9847e2be30b39f772dd3450a5c6 SHA512 603507f2d458370aba768a81a2354385c37662446824aa53c9bdb39fd6f94a6af239e58e1d96883fb6c5d656f9e40db69a8a0f67b3eadc8d4ad16dbbb144e30e
 MISC metadata.xml 634 BLAKE2B b3866b31953e1068f2f95f53368fe1d17f72b316b7cd5111c10d006f8f3c575434da225034df722ee6039f670ac092baccb0b41a6c9324304b6a0417b1821885 SHA512 6f0dc405960a10cb59e2d4f5f01a69bcc738a157c57d96dd1ea1b0b2abdcee77d1097d6d47f84383a1e0a19675f1252ae84d742fd31d3791eb533a6fc664c89d
diff --git a/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0-r1.ebuild b/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0-r1.ebuild
index a98fa4ea8141..fbf6c7112aa8 100644
--- a/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0-r1.ebuild
+++ b/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.180.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Library for consumers of OpenID identities"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RDEPEND="
 	virtual/perl-Digest-SHA
diff --git a/dev-perl/RPC-XML/Manifest b/dev-perl/RPC-XML/Manifest
index cb1c3f821c09..1b80bfed450e 100644
--- a/dev-perl/RPC-XML/Manifest
+++ b/dev-perl/RPC-XML/Manifest
@@ -1,3 +1,3 @@
 DIST RPC-XML-0.82.tar.gz 225690 BLAKE2B 4e16730a5bda313d43b00eaa8617e009a157867f286f17afb58693beb881ac2329ebee93d98c44c8742be2608998c1d2e0cc4f323be83ae9c5e9041c5bf90b3c SHA512 e5d1092a2807c2bd423502dd2ed53a72c57384b67bb4709e86a64a6fe37ce8af580998e62fcfa6a48d66d5308d9dc270c74e4293617b9f23a654e379cde4025f
-EBUILD RPC-XML-0.820.0.ebuild 1801 BLAKE2B 6cc1ce7977c0a966381bc418c987f62c2b732fbc40211b124563babc5c7f8ec303e5a830732ff1d3f66c958907839f8ea469919ea7b59eba7e02a6592ce3d2e9 SHA512 b2d826ae70f750903988da432b486e97fc99040dd96d35fcb0f9dfe069c73bb08e889807b6250fa3396d94affa4fa118a12a6feca3b2a9a11dc3c4a249b6817a
+EBUILD RPC-XML-0.820.0.ebuild 1808 BLAKE2B 4aa9e478c6fcfa67c774aec9378cf0a06f4fc8f585484c1ea045b13563283d7497d7bd13e3c782c0341b8d148cbaf29c29adc83531dca319e4669d5cb7269605 SHA512 87f8cd3c8f147fa74dc6907fb50d86038e2e2bcfa395ca552eb0bfada4279d30ac7953d9e10a130ab44406d2863ec78e7a1a44a6478cd8066956d40ddf37798d
 MISC metadata.xml 2133 BLAKE2B 54116c8ead88f2ed2f00d68d97b4090ece7914492e86d3c74d87108ee6536baff458c858c2b072b99bd5791d57bc0ecae586a316cc5dfba6ff053f0e083741e6 SHA512 72f9537a79f1088cb50abbe3992e87cceb2be96cdaa3d154bece08959706fdb495a88877d5fa7cd089e509e706629b8f7ad0c0d36f2813b98184df099d86cdfb
diff --git a/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild b/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
index c2016f706814..c00284e2ab00 100644
--- a/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
+++ b/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="An implementation of XML-RPC"
 
 SLOT="0"
 LICENSE="|| ( Artistic-2 LGPL-2.1 )"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Text-Markdown/Manifest b/dev-perl/Text-Markdown/Manifest
index 5f90a208978f..13434e9f19ec 100644
--- a/dev-perl/Text-Markdown/Manifest
+++ b/dev-perl/Text-Markdown/Manifest
@@ -1,3 +1,3 @@
 DIST Text-Markdown-1.000031.tar.gz 103428 BLAKE2B 0516c266827cb5712f9a4e95071dc18f39c6c181a9225994c66e00b2c2057c601c05991d4fec09574e98cc872991cbd3c501c236a20131a48617b67f0a765964 SHA512 58bef4eba58572c4990849209005109a969bf404a7bc5dfbaae25aa1d0b89317ea9b412658180dcfd96b2c809d5c6900e2118838535dfa9cad6d9b45969bee05
-EBUILD Text-Markdown-1.0.31-r2.ebuild 756 BLAKE2B 861f89775ba8e84ecf853310ff65f7cde5bbce658d4846b5b28cd56dbb1f93b41a3fabc1743455f2e48387b6d49860c509a748736c324696463bc02a060d81c0 SHA512 07fb7171d8a631102ab0e7e2731798ca8d282837db9476240ad956faf43fb26097498830e055ad031082ace990e0a83a7eba2c95d7c9bda542e7cfd800e47209
+EBUILD Text-Markdown-1.0.31-r2.ebuild 763 BLAKE2B 92a3440b5c3bb6382c1af6ac632047efc9d2ff3d91485970e94ea6aee7fe86237a946ad55745dac94f7e010d9736cb1b45dcd53b4e52fea92426420eb03cfc6b SHA512 30e834a1f6e0fa386e92f9b30e5d70166b46fd5270af635c8167c2640d2b3f3b5dec65655bb0eb8386db3442588dd18ff26da4df9a612e03ea24e478e052ca33
 MISC metadata.xml 399 BLAKE2B 07cc4961e985982b4ab70e2c9b99b0a6282d113b06e26f03537aca7765b9bad8c900a1c2a56f50e3c9ea028b18d27247d3a65e89b7aee08bddbef5ab3c226ee2 SHA512 9cc57cbb5a47481689d3580d622fd61fa00b68b30e0509a25c64c86d48a9b0270852c4bef39b6eee277919f6ff46e9cc043fafc1177ddd7e402cf3bf4851d380
diff --git a/dev-perl/Text-Markdown/Text-Markdown-1.0.31-r2.ebuild b/dev-perl/Text-Markdown/Text-Markdown-1.0.31-r2.ebuild
index 9237d119a960..81f28aee2a8b 100644
--- a/dev-perl/Text-Markdown/Text-Markdown-1.0.31-r2.ebuild
+++ b/dev-perl/Text-Markdown/Text-Markdown-1.0.31-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Convert MultiMarkdown syntax to (X)HTML"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	virtual/perl-Digest-MD5
diff --git a/dev-perl/URI-Fetch/Manifest b/dev-perl/URI-Fetch/Manifest
index be73c2e77f23..44d95d84bc30 100644
--- a/dev-perl/URI-Fetch/Manifest
+++ b/dev-perl/URI-Fetch/Manifest
@@ -1,3 +1,3 @@
 DIST URI-Fetch-0.15.tar.gz 16808 BLAKE2B 65bb988eb3c241079ca676006e772f1cea6e1a664297ebd9655e955cea13ec6d5e4153f4075b2b2a75cffeab1add61a19bcc75083b0422d478795557302d36e3 SHA512 eb630a628920cdee005a7a4be5c82da635050905a6cbb12b06721a11921f54b72d0c307306a413b95e43def7859eb5ac4e0d9d9400c4fe86750cc71210db7203
-EBUILD URI-Fetch-0.150.0.ebuild 526 BLAKE2B 06369eaefc15e78b9d23f584adda8b9678932a1f59aa373a8546ddd12ce1f7995ea5af5c09982407a4c77ac315b5e50d38cad54ebf6affa74b5b14f2cfea1ea9 SHA512 66446b7d5f584954047ee10848964e266cdd014bfb24bca754fb8d98ebb2ed127b31add02d17c26ba58a90f1baa7d2ed516312606e6cc137af62a20a9763d8d6
+EBUILD URI-Fetch-0.150.0.ebuild 533 BLAKE2B ef3b911fe834bede5f6130722913eb7771c98530010b2f871bf359ad55738bf90870e6b9f939ed0a6c3449c088567764020d46f73692b80864f613363fc9e845 SHA512 4aec8fed0ac2d8c73ec1946fbfe41c6df224b15aa7af8c1fa20e8baacbc0fa20b66163c6e1723e7c21693205f885325b40a8f65c0095b05723d889a79ee758bd
 MISC metadata.xml 458 BLAKE2B edc7b30e2480f8a61ec4c98657311fa4677acd386c7ebd8c23931442808f735c9ab0e4523601a5ec27598ab38f14606cf9408ff28ff01c072949d11fc0a262ec SHA512 d55be227de61d449dbddc4606d67a74f9b401627d293bbf51fd2c39794c1f0782c85b5d907a0dc2d4bb47d7571fbffbdc324f6156ebeab609efc38bbfad00925
diff --git a/dev-perl/URI-Fetch/URI-Fetch-0.150.0.ebuild b/dev-perl/URI-Fetch/URI-Fetch-0.150.0.ebuild
index 40db4743e9f9..cd8b8a16c026 100644
--- a/dev-perl/URI-Fetch/URI-Fetch-0.150.0.ebuild
+++ b/dev-perl/URI-Fetch/URI-Fetch-0.150.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Smart URI fetching/caching"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/XML-Atom/Manifest b/dev-perl/XML-Atom/Manifest
index 917df42e6816..2819476f34d9 100644
--- a/dev-perl/XML-Atom/Manifest
+++ b/dev-perl/XML-Atom/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Atom-0.43.tar.gz 59113 BLAKE2B d6cacd345e2a25be4541da3521d6c40e9eaa427ee8cd0263196eed30e89a5f0fb40fac92e34c928c2c03a127b3acbc493685c3d12e98b0d03ae6c3768596624c SHA512 408d0753d651da7ab4cc50d79b654e9f3680f17830a3fa36e0d1869a4e7aabb17aaf5132a91ff20f1144af09290f109fe7812baa61b23b5b89de384228649fd9
-EBUILD XML-Atom-0.430.0.ebuild 640 BLAKE2B 1a2c1a3876b807b49da8e39b6a9fbcae262da75174a2ff98d3f4ed41b37296de89cbdcc2fb8837cf862027ec0aafdeefd9e851b007bb372df1370f35cb00db8a SHA512 fc817418431b0c2a9219c002113d5ba41c6fed41b447aa14f3567c39eda084c212573ba0477cf74bc14454b1965b24ce4dee17099ffc326b80559abc83ae66d7
+EBUILD XML-Atom-0.430.0.ebuild 647 BLAKE2B 48c3649e88921abe55e921d2dd0bb8b202470f4d0b30ffc97d2de7f42074a2a5b0b661b37034486ced57da879abf8c27466089fdbd81503d8c8810eb7a0fdfa8 SHA512 604a43f88882aa35c6c5855df84a4b9d2888f9fc7170e3b823c08e11fa970d2224cca9f9005198e63f6337890630232c8ae0c8ea8f92195faef82425797d0d3a
 MISC metadata.xml 1296 BLAKE2B 590af64d8e172569d596d626a8ce3f00cc01631d49cb0f82d928adb8b65a4b9351cf681e06f8b495e1e9095ae85862c15e597da02bfeb2c3b8ed2dd7556fe8e4 SHA512 556f7a839e8b468f8f89f1b7ce00a766c54ad25369ade7b20924d08113958e72eb834b094b9ee24a6ae43101e27a874af0be831ec9b99df484cfa56d23340458
diff --git a/dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild b/dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild
index ad227c08c97f..fce76c9d8a61 100644
--- a/dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild
+++ b/dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Atom feed and API implementation"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="
 	dev-perl/Class-Data-Inheritable
diff --git a/dev-perl/XML-Feed/Manifest b/dev-perl/XML-Feed/Manifest
index 5134cd635373..024e29a49dad 100644
--- a/dev-perl/XML-Feed/Manifest
+++ b/dev-perl/XML-Feed/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Feed-0.63.tar.gz 64306 BLAKE2B 3263f990d97c523a326ce2331e961e6395b5c208ea4608b2eb1ed6e6743507af0471436d100183ab8820b5eec274703acf38bb07ad85e63dec7c884bf282ccca SHA512 3c624e71194ef263f0e1105407dc9a9bf5946a6e4964eb4b6ce96427a088db22a4f4821add5beb4602353a8d49883d1f6560ea50256354f3f8e2c1593b45e010
-EBUILD XML-Feed-0.630.0.ebuild 942 BLAKE2B b2519c68de4a3f80cd9f8d137eb115a92dff05effb212d1ce8e7adb4f3b2fa421983bdb7fdfff4222d97079fdf26f53e7984d44ceb0812b234d23544b65a20be SHA512 263322bbbc726a9ee416609ba02e5b4a57088f9adbd164aa76d59e5fede0fe118995e3920404ad7b03a982db6e5bd147faa99c349f39e59c14a060ea99623805
+EBUILD XML-Feed-0.630.0.ebuild 949 BLAKE2B cd9e5a5e8f982f8d7d777360050e7f7aba3be32579c4c3e2b745f1167244fc2c781a2ce16f8664f7ea265765aaf72bcb1e3bc71de35f6553c4121f22b5b4c7ce SHA512 d77a2923fcd4bbe6e798da8b835efd0ce89173195679e97b8c0983dc17d86603c5521f460e9af20b2e427066c43690188fd688395ec646e960d02708424337de
 MISC metadata.xml 876 BLAKE2B 89336699401bd3e1fcc0480fc6d9b700d5de46e835d9d5199f794afb2e052cb1b2a43e132a201cbd0da3595dd9f5324684ca56f0834f6d26bda2866b5b3143e0 SHA512 7743a6a315b7cddef94c4e2b3c2723ebe7e85eed303e7ebdc694eb55cd9bee310f17d8dd1c580077668cd3ab9fa0db9e7f1a0a68e2bec49db405c06fb5060681
diff --git a/dev-perl/XML-Feed/XML-Feed-0.630.0.ebuild b/dev-perl/XML-Feed/XML-Feed-0.630.0.ebuild
index cc791daf85d1..21fc35a19519 100644
--- a/dev-perl/XML-Feed/XML-Feed-0.630.0.ebuild
+++ b/dev-perl/XML-Feed/XML-Feed-0.630.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Syndication feed parser and auto-discovery"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/XML-RSS-LibXML/Manifest b/dev-perl/XML-RSS-LibXML/Manifest
index 11215dd882d5..ebb382d3cb6e 100644
--- a/dev-perl/XML-RSS-LibXML/Manifest
+++ b/dev-perl/XML-RSS-LibXML/Manifest
@@ -1,3 +1,3 @@
 DIST XML-RSS-LibXML-0.3105.tar.gz 81621 BLAKE2B f463d8b0683f015568fd34ebb719b068c60b07f0562477dc51fb89916a9b94d7fa45483da9c8caf19b42b03aa8d86ad6982a0967fe5838a2436a01db22d9ed58 SHA512 8cf0211e68f367457390b105d7cb0652dd82b0d36976ddbb9b5683a195157ed3ceeab683c778b05dc846a5698154b4bafaf84a89bc787da259dd5f6db5286334
-EBUILD XML-RSS-LibXML-0.310.500-r1.ebuild 598 BLAKE2B fcadc0163d968414ee783882b556022a3ffb164bf3a46be27706fb5bec6115ae758322c665598fcb1f0a55511e946a870471da6c10d7abf2e525540f7a35fffb SHA512 3696c96e7f96f11ab4d0fc62cb7789174153dc45fc6578b161bb71819d4abb1bc60391bc833b871cb98588a5216b848f15cdd89deee187c3fb468bad53ef98a7
+EBUILD XML-RSS-LibXML-0.310.500-r1.ebuild 605 BLAKE2B 67099c5329da298380f55e304a9c14cb2d93766e50562732d97352c62c77e3db7a7865e2215ab5481dcccf2e44f529552abaa1f4d149304976252217564de14d SHA512 8b04335b06f9a15ae37ed7a46126487edb26cca47f560e90b8683b1494c4165f2eda326a58e776bc888c3311d37054cf94edcc00f6e13b9c1763ac200ba2cdb4
 MISC metadata.xml 1043 BLAKE2B 08cee0bab273fb5b321e6f9c878dd7cbda6ab258ab0baf622bcf01a9b4a367fef8f81648ceacd1bc1c60a6ea70a681826b821fe87150c36ee5eff8c2117a318d SHA512 6bec8607a31dd2bcd8c9f5b99ae6220b6f90165064198f2325dd6da4a52fcd9899005793a9a7d548880a67d3a5a7349118be2566dc48735e6dc88c4af3854db0
diff --git a/dev-perl/XML-RSS-LibXML/XML-RSS-LibXML-0.310.500-r1.ebuild b/dev-perl/XML-RSS-LibXML/XML-RSS-LibXML-0.310.500-r1.ebuild
index 926ad5757c89..c6dd865f5354 100644
--- a/dev-perl/XML-RSS-LibXML/XML-RSS-LibXML-0.310.500-r1.ebuild
+++ b/dev-perl/XML-RSS-LibXML/XML-RSS-LibXML-0.310.500-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="XML::RSS with XML::LibXML"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/boolean/Manifest b/dev-perl/boolean/Manifest
index 82c5c0a3bfc3..05c14a2ceab7 100644
--- a/dev-perl/boolean/Manifest
+++ b/dev-perl/boolean/Manifest
@@ -1,3 +1,3 @@
 DIST boolean-0.46.tar.gz 15552 BLAKE2B 285d48e9d3d9e69ff3d51981582362c1836d61e0c3c21da85c9b0f1e05fde311b3333f1521cb1b220f46e9e371375ea111ce3007097d5c0c31f6b283d024fe31 SHA512 910653882f501cbf9420d775a79a000c62632a98643ac5e9f3d99765652e7c8c073f251bc36f0b69c9b259762bebeaeac18376e78494977d912da538939bb296
-EBUILD boolean-0.460.0-r1.ebuild 414 BLAKE2B e0eb7eeb89f6bf385f2fdf33f739f75360251d455f442018ae0b0bd1d72d14bf53bbfd61f659703d4be9d4632733c4ef335bced930ef2a69f54420efe9fff1c2 SHA512 7f1a52d1663cf0afbe6dcfdaac94055909b8fe8782c9a94f6d34034a048fa90bb9bd2d02b8755ddecc1e83c34ae3abdb6afc4906b0d3fe1cb7872e73699e9467
+EBUILD boolean-0.460.0-r1.ebuild 421 BLAKE2B 6b034b988e9b2e5a8f9625f628ac97b5b5aecab89a6cb5569a16cb3e1db25b191ad7f41368560442ceda18778c4a2e989537baf8ef4f1d2506c6596f576db073 SHA512 bc53209aac524473a27c0375770c211f2ee494c55c333f858c6e943ec96ff3c0b3ea085643742210039300d2ba7b492282f554f6a5513b61f7d8f20200d552ce
 MISC metadata.xml 386 BLAKE2B b59b2c4b8daadea04402f8c7cddaf3e03dba58b1b174cd215aa4f245ca526afdbc53b61eac188c1f1e6ab2c412c40ca1da633a4f5dd2e320743b907a78f3fa23 SHA512 17a4be7d55e0329fdba7127fb3d95e506677a02fb461109dbd2f3e7a8d14e61af4fc4a4d37c00d438e108746cd8d6165acaf32b11b6f8c358df0c4da6629e59e
diff --git a/dev-perl/boolean/boolean-0.460.0-r1.ebuild b/dev-perl/boolean/boolean-0.460.0-r1.ebuild
index 67abe487f03a..c3b2b4cb4115 100644
--- a/dev-perl/boolean/boolean-0.460.0-r1.ebuild
+++ b/dev-perl/boolean/boolean-0.460.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Boolean support for Perl"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6c832aa8c96a..69a46ac27a6b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 3c8bfe570e33..0795720f1f82 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -3,5 +3,5 @@ DIST black-22.3.0.tar.gz 1154456 BLAKE2B c89b43722839748dff0ce60debb684cd8eeae5e
 DIST black-22.6.0.gh.tar.gz 1165070 BLAKE2B ce2eef529e230954a13913063dbb9000fa13f4debb2e5ed33605e8efe5c6d62fc1b3c0b7847c26ad931b9becae43fa23b15701a1672c1e056f729810020cc282 SHA512 72e4b4dfc69436e4dbee5a75ea72a1be69a26dc37a5e4d7edfb84d62736f0e0aba8d14420f3069798b568bd8ba916e8850f0c958afc9b6134ee8832e54d3dc4c
 EBUILD black-22.1.0.ebuild 1397 BLAKE2B 89116657e56fb1f9a08ebdfe35de2d5d9761f43c5dff5a2ecfb0c8cf5d68581223dada3d0accb3261bbaabf4c26861dec3e35c482c7afdd8279ee8ab3422418d SHA512 0ec829dc329fab2b7c892405d195e34be8d8e1dd0850940c3727bdec6cd520b4a8d977f6b1a13e97b4622b2d853f9f372a515f457d2161e0412ed6be843f06a3
 EBUILD black-22.3.0.ebuild 1417 BLAKE2B ac11791cabf7d046f6a9a632174ff214c42983a5d152d9be29e8653b192bd8b72ea8f399d2a43bc64ec7c65590ba284082783db81685508e055a9d476f3abc80 SHA512 08f7e446dedbbf21a62b55e10828761c1e3962ce48c2009fe8a7846364386d8b206489eec09c91fb515c83fc54ee2efad5ae13d66427670659b6bad6a3911966
-EBUILD black-22.6.0.ebuild 1423 BLAKE2B 9864f3ca5c8d93515a8bc4664913f61a6478de19644d39f5cd1d9bb1918f1d419e59aed7798eea6f5f3f5b8114d95e92b6def870f0732719fcce8784cfd5be1a SHA512 98b9cd7b2b4ca3dbca15dda6bf9dcd47faec26f7e74eb486c979d02ed27c4cdb7e7d1a21ac924ee5ccb653a3be257e068ee358fd00c576aba10b593c05f11db5
+EBUILD black-22.6.0.ebuild 1421 BLAKE2B c20c133befddbc0041505f068c051ba3f0bf1f2f41bdbd1feb262ded6ff8db8c99bbef6e9fe5e3862b33a0b506e9dd45a449c1be20510666e110f483026e8563 SHA512 311cb67df86040a5504271cb965cc97d3771d1082eb5930ca424ed8fa333cb0d8516406b869ae8010bf3dc736b953870651b06e87383aa6dcb28a927c5ef1360
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.6.0.ebuild b/dev-python/black/black-22.6.0.ebuild
index 5ff4b27af61a..b8e64b7fea30 100644
--- a/dev-python/black/black-22.6.0.ebuild
+++ b/dev-python/black/black-22.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boolean-py/Manifest b/dev-python/boolean-py/Manifest
index 8f01c9997065..b54a6536f8f7 100644
--- a/dev-python/boolean-py/Manifest
+++ b/dev-python/boolean-py/Manifest
@@ -1,3 +1,3 @@
 DIST boolean.py-4.0.gh.tar.gz 33855 BLAKE2B 68e183c670684d2f92ad94f2b88616c932c2a85db40fa1a2552bc60c9bf03999bb456e0a91623afba2af4f2c89ef6cacf0c6f0267ac55aadcf02e67c8324c8f6 SHA512 2c92188645c4949478b40c2879f02a0eb6f3f92c0781a910862fcccebaa3476b9f2668ef40a5faec9d5c3a9c7361043a8e1b92ed98e282d6ce89c56b8ac0c2ad
-EBUILD boolean-py-4.0.ebuild 588 BLAKE2B f5cc42824905f3d100c88a5398762477490c41f1fc69af2d20294596907a0c820fb32031842f35c48c408d04fd9327cc26a969f784a78dcee1cd3045cc07b12f SHA512 be70b422b05dd93aaa8a5f72a416ffb9202f51de6f608c862d79bbeba3e211052533edfbe28a7ef1dfabb5850b0dd6c4eb7ec7aa6ba2bc7a96b8ef9c6dbc0ece
+EBUILD boolean-py-4.0.ebuild 587 BLAKE2B 3ded460fdd8fb926d6f79ec8b9ffc41e7771fae49cce6c8b68c8e91cf5727e23b57b1bc27e7c395585bbea0e48a6f6c3e5293bc06539dd169df9e5191d54e728 SHA512 b4737b404c4bfa353723d8a3d69829dfa10604f1c94d875e627910a962668e7e91e4369758442f2bc9c94c4405a35a523ee6fbe201c98d14f41e31fc96474b9a
 MISC metadata.xml 374 BLAKE2B 4dc485dc736f6d9e3e47ca111cb85e0770d8701bd7a10587f6aaa035723a66f225eecb633f2a127255051637c7f64d17f69d9f449a50f00b00cda766b88503c2 SHA512 940cc16f6dddb68c7154bab0be91f5c5639e4f3563a1efa2d56a4a17ec8dbe70f86f7e53be6cb082283d2c650edbfcddc406419a6acdfe2ebc8035a12b17c35f
diff --git a/dev-python/boolean-py/boolean-py-4.0.ebuild b/dev-python/boolean-py/boolean-py-4.0.ebuild
index 5b08c43bc615..65646778da9a 100644
--- a/dev-python/boolean-py/boolean-py-4.0.ebuild
+++ b/dev-python/boolean-py/boolean-py-4.0.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index 0eb81aab947d..9c6b2e7f7350 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,3 +1,3 @@
 DIST license-expression-30.0.0.gh.tar.gz 153630 BLAKE2B 4231bf14e69705fbf40cc4af5f17a1070c780d595db5ab0098b318eeb7289740b86319c683e61aaf844a1cc5b8598d832f14e4eeac354aff37f7b82e5437df1d SHA512 ce6e3a48c1e035e98c3831180bdafb1d70afe94b1d0148c47941129a8223b8b39e11af9407b255ed7a3d1247873c18848f8236c0a805e9b2333c6d59506aad12
-EBUILD license-expression-30.0.0.ebuild 736 BLAKE2B 6934b19bc7c9ed647ed3c5c79a47b5e0d57b86801e7f1e5acdd551d6fcc48d908c716177fb8e580024b1eebd34e99fc3e9e359876682f9d246be5630ac2c36fd SHA512 0268fec1067f44144c2b645c6faa968fbfc0d0c7cd47c3422b8d8fe9f322e0e0042e5bded79a4d0d963ded804c1e3a8e74470168cdab6ed4c56705b686e41105
+EBUILD license-expression-30.0.0.ebuild 735 BLAKE2B 8b259b26d7a87227e1c781ee4533bdb886aa095287bddc295f4c73de55a49d8f84dfb80c9cdc4c84f0c45856c4a836b7234dbc06e98e04cea63a0aa3a956d1a8 SHA512 4f23e71e8e6a75d3d1099f47756122a07828ae7c46936d7e4a66115f6b478e788c86cad71b2fb082232b162b3388f0cf99a5ad05edcd992f7b65f066301d5c15
 MISC metadata.xml 387 BLAKE2B 52d862f7ede77b8ab90dbd9ed2949f1c4a2b289458cff0f2e7042bf43be07b7d7e63ff94f0a10aa1db41027b3441be721656def8d59ba54155d3226e4bd30b57 SHA512 7ba89c3d94ef921fad190a85655d032a7e3a0c5794d0957c3a30ff73c75b717e87517f5f2547408426479d646ac3d157f7e659d66a18d4081689b6b41136b268
diff --git a/dev-python/license-expression/license-expression-30.0.0.ebuild b/dev-python/license-expression/license-expression-30.0.0.ebuild
index ecfd97d0a33e..e4908fea38c8 100644
--- a/dev-python/license-expression/license-expression-30.0.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index d73e1e6621f7..2774b119781c 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,5 +1,3 @@
-DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
 DIST nodeenv-1.7.0.gh.tar.gz 36209 BLAKE2B ff5853c04f9c442ffee883f7c981e574704c4ccbb37a8627257c4c7af3c86d70034a2e62b4bc6f4e7c6da32e0edb4f5b9216bf288f47991d9b42f21be454634f SHA512 1e3e4068591d51d8915de73ab0f82f04620ca628152ec5a454e7ad18001ff20b698f9818353c44b80200ab529d95fa3196a3dbc85f0c497ea49f60eaa5dc9ea7
-EBUILD nodeenv-1.6.0.ebuild 488 BLAKE2B d62471bae2ef3c5d6c1ce6d87c3e8a4243eec3cce4f330a1cf1b7edd1fd8135eede22fd766af939657df891c5b0baa6ecdc6f7a4d05e527b933c89e1f1d88d4e SHA512 8a605cfe0ef66a3071516154e0c601aee3801014a019082a7bb69b146858ea0c89b159964eec5a059198978af4fd6eb67f98a1dd069626180ba5040c1c5cffaf
-EBUILD nodeenv-1.7.0.ebuild 553 BLAKE2B 17564b89b3eff4ec46b8c27e61726da665349fc75cb1b3150961f9df9b40cabf411a9de5530321edb144af0059fa95852b816f7d5c41494578353d9299d08c8b SHA512 705917b8c4c59b834245bb45e9ef9ddc55cf6e7cfd9457f89ec6bf9d654351c245949c348da23025fde7e2e6dcb1fa641e2cb56310429268c5efb8b2e84e51cf
+EBUILD nodeenv-1.7.0.ebuild 551 BLAKE2B abdb852997782b16bc5ca4203fe752e0a7a318a4f02b367d4305908cce34e135882b2b9470e7b67a30a1b7a3846a08f59a4ec60d5b704ab9846abe81feacd2c7 SHA512 b8db1c00d3b5ca4e617a603b0471ba28d6222923ced9dafeb028da03f15f12937b011dc3b49326aaeda2ae3232c46537a8734f33b1c38a963a4ac84cc01e8282
 MISC metadata.xml 378 BLAKE2B 7dfad28224587f9df7781a7b1d8837b6c386b40fe20da3fe4b1cd4dcdc417a55ce5da03870907e44f6aa64e1d1160dda43848dac097ef881615688c511ce9a4d SHA512 06d76ecd3a1077b3bd37d37783ff37b4f58ad2e7fbb5294a0594ff748e5f64498567e4d1814a89ed0136ecf17a335a0f8a1627af2185144b4d929b25a8eaa2d3
diff --git a/dev-python/nodeenv/nodeenv-1.6.0.ebuild b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
deleted file mode 100644
index fd34280955b3..000000000000
--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Node.js virtual environment builder"
-HOMEPAGE="https://github.com/ekalinin/nodeenv"
-SRC_URI="https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-# requires network access
-RESTRICT="test"
diff --git a/dev-python/nodeenv/nodeenv-1.7.0.ebuild b/dev-python/nodeenv/nodeenv-1.7.0.ebuild
index 76eb5465f571..ad8fe458dec7 100644
--- a/dev-python/nodeenv/nodeenv-1.7.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index f895acb33b3f..5030267efc02 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -3,5 +3,5 @@ DIST pdm-pep517-1.0.2.gh.tar.gz 307938 BLAKE2B 711cc77c4ec4a3002557b5537c9312152
 DIST pdm-pep517-1.0.3.gh.tar.gz 314957 BLAKE2B d0beff961b3f324c4d4c74943387e82cbeca90e5441391347b2ea06639af9965ea27426cab9e8dbbdceb296eb1461319fb375a3e078d673bbdf386b578b8f35c SHA512 ca9983e95f803243fb04b1add424449adfac472a94973013f669440d18d2118bdaf6610830f686cc700e86973935df26a7fea0ceed415b2c7604330de3325d05
 EBUILD pdm-pep517-1.0.1.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
 EBUILD pdm-pep517-1.0.2.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
-EBUILD pdm-pep517-1.0.3.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
+EBUILD pdm-pep517-1.0.3.ebuild 1290 BLAKE2B 7381d250bca6b84e1e8645b319588c34015bba4dbc74bbaa31cd0bf038d00a3cf0d5d6f6034ad19402ec356922afeb03f7df4a1db6bf15b07712077aa74cb1c2 SHA512 09471709e972ba932b1a23a240ebb6dac574c2503383cafd5f3d3187b5abbb7b63ad0ebcac57c9930b4c625bf978c074f97c0676b4772187853bc817a1386da1
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.3.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.3.ebuild
index 65915f36678c..9c2511ebf46b 100644
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.3.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
index fbfeb1518f44..f9cd16dfe643 100644
--- a/dev-python/pytoolconfig/Manifest
+++ b/dev-python/pytoolconfig/Manifest
@@ -1,5 +1,5 @@
 DIST pytoolconfig-1.1.2.tar.gz 12066 BLAKE2B 9e1627bebd1cf8e5cd36e3d772ec3abc26d46b55bb582fb4c11f3073b2a0c1bcc64022a559791b3c63e4c92db7a762f5c2656e353f69dde223c319e419e61adb SHA512 bae9636d23ab3df1bf7f64d10ec7735b741bbab53afb79bccac3586774081c1d2170fc4086725c13bc6d296c3460098956386f9707ef9aeb6b57a21a4c9ba16f
 DIST pytoolconfig-1.2.1.tar.gz 15182 BLAKE2B 667ded3571855edd78540d60d973f09b325e614b9c85bf8b4a1d235ca4bb4bfbe992f511fd65991740a87c61e8a2bc4ec35f00723e7556bf9ca8c9c2752a5f63 SHA512 01620f98494f3f73192f530727e007aca0b7ebd7c2f0d363604d138aef13bcd4b394f59eb980504da03ad323016fe1a5f36e2abca0bb6462828aba77ed4ce1c5
 EBUILD pytoolconfig-1.1.2.ebuild 723 BLAKE2B a5c3d02d2f7a312a0641adb42e7777f6f800651ff6ff6db905b2b1cf859983db808fa70510eff2c14b1c38f52d81cc68891c18940c627377e29834dcaa70060b SHA512 ccbc3fe26187f1bf0ff8792e3880ab46a90d99ea8a377d49acf7eec65e381a687ec0abab586b5505c3c2e2651d8b469b67d4c56a82b8b886a3727e3b625f3361
-EBUILD pytoolconfig-1.2.1.ebuild 724 BLAKE2B 1db73755e5ff2954ae0a4d4a74e038333554e3025ae61bda38bb476ab56875ad1a8b25d99afa67c7ee69c8004ce934c1cc82619126666027bb0a6ad7caa15e79 SHA512 aebd2382dcc7b041edfe5561c6eb549b5247fced9311d8fc82831f89b060114388842db7c762c75816cb8be33d4445c8f5aa5303120c1e7ea23ba90c5dad2d45
+EBUILD pytoolconfig-1.2.1.ebuild 723 BLAKE2B c2b132cf9df460d1242a2f68b7a5eb746441cffc33c85d43d33854559234c6a20ff3f15ec56eaab86ee596b4be272b743ca8411d17160a0b9d07d1dd05f3602c SHA512 e8a0c03147e7036799cb30f990bd52d19bd2745b291507aceca49ba9d16457c8dd8aeb91e200daf93524f533f685ef563c7fa1dd9564c02e81b58bad67841db3
 MISC metadata.xml 423 BLAKE2B 3007e2ab50dfd0a5b91d18dfa30099586f14daf29583323da9b275fdfa8c8c2e1cfc575e78a0f5b7983c6d23b03767ebe8f2f2dfb83d35638c0577257e2de62f SHA512 556361958961c85b7f3fc8b5d15009329b0534db086c15392e0c8067357576848a5533fb5ad4d2b75295b7a245f69fd81de63cc5aad555e77211e8f46552e147
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild
index 1618bd29a961..ef93d3247f71 100644
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild
+++ b/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 28b934e4c64a..377f044f34a8 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,5 +1,5 @@
 DIST rope-1.1.1.tar.gz 274610 BLAKE2B 52354453305ee58db70f86392f7ec27179e1e4a9ec677fb8875bb9ca24663e6dae26e1bac4a1ad62143fe3a419a7a1e1fd0b7d2f03ef556143d2b060b23300af SHA512 aaf664a63ef00e3c844d6999338fe6a3384ddecfe95ef9b7eb213e5c37c9f78f7d2ea59aa7e612487bac5eaaaf7fc8ba499c0d43c740f99a7b3be64c9d7f6e07
 DIST rope-1.2.0.tar.gz 289239 BLAKE2B 314cf382e76a448dcddff0b9c52ae437cde032b54f1c9edbb05c1d47832ecc7a0b35b8eb14cf48ef5b296011a273cf3e21c5433a70e2627c11f2cdeca885e1a3 SHA512 d34a47a6453a85fcaa253287224b7b5265e08d2cba46377d17502f78642d3468d074b43d4916758c2225f98e676080af2b7896ad6194e0ee0234661343259fd1
 EBUILD rope-1.1.1.ebuild 571 BLAKE2B 9ff4cef2258e69d043c2b4fb2140959f1c17418c731b5bd294aceb693015f7c8dd063565762019479cad2f8b4b912b9e8e565e86e61841f78d385936193f79b5 SHA512 93d08ddb4b985b5b749ad5fe47756dbfeb3b7c43bc25655d52d96a27c18a85bd5ccd2e979b73f40f9d92c9dabbaf195d7d3edd5970631458627fca780923a66e
-EBUILD rope-1.2.0.ebuild 923 BLAKE2B f7a62177405535b3b867bf15c9d947a89621b7f46f19153824cdc4faf116c686ac1a27ac74b9a0506f8c1de74769a63d8a9fc50e1bea7a742e8b9439c5926ffd SHA512 b0dec73b8bb520d95026ba92c730ababa70e08b2b84f9ee4e84792620c6d393bd22df39f79082b3249fb636930b62e3d76ed7d72bc546d1a843976f4ec72ddce
+EBUILD rope-1.2.0.ebuild 922 BLAKE2B d530036ac11b8d1cf36e7c1cdd4035cfb5a426b89ee40875006e043a11269d52e331050e1ba54f02abf0a820edaf163431fae9c71f386ba2c11eeaee1815750d SHA512 8e1d1d718ebbaedb56bc46c5113b24ca4773bd1e3f8ad7926658fbe9ef812c8adaea9678ca0ad4e9af612a316a9d6d39421ab2b0cfd2ff339687085d7a8ad1d5
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-1.2.0.ebuild b/dev-python/rope/rope-1.2.0.ebuild
index 67e1183ee5b0..ffa603ad1c4c 100644
--- a/dev-python/rope/rope-1.2.0.ebuild
+++ b/dev-python/rope/rope-1.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index ff74b4992a31..2113d7f94bb4 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,5 +1,5 @@
 DIST SQLAlchemy-1.4.37.tar.gz 8155965 BLAKE2B cf21c2ab73a5ba2576a857a12f30ea516265af946e25c1b137e57019d862bf04f4757b4755cee28e6f53642d1f1b58f43c99cd1c69f87640e47ac8a1d1ff8d28 SHA512 3f8a814f9bb6fa273f7b210c4567bf7411d0cf2e5caf010a5387fb946063704c342072145a858fb906545dfb1b959155d041e6073273674e51715356fc1f39e6
 DIST SQLAlchemy-1.4.39.tar.gz 8212369 BLAKE2B d65993c4342c2cb5bc76ea4ecc986d0ec521a6eb785604ceeca0c9c22187e4af29fc8bd940a130162ca9dd5c30d58b5d0999472285382c6f6bed3863ff9f20cd SHA512 a7c6b73250044289add492b2d7df9010f3b9a3a5126c8b3448d7339cf743c4be3f1c08d238107bb12c579b2bbd7d20e216e331d3ee10dcf79c0f23ca44d496af
 EBUILD sqlalchemy-1.4.37.ebuild 2839 BLAKE2B b19eea5aad1cb6309d4b8b93777a0dbc9bafce964aea03a3cda6a80acc603fc1ff18cfcf324b6a9a65faf00354f49c778203e02277b8c277dcd484cc381654b5 SHA512 881a5a1b470dcb2c15ce0dead3ea454ec11a130202bb243e14c0622a0d7ab424747b42ac349eb3d7b4f68c27495e273f23d5d1d4c0f8d5fa4cd1efedec785e6a
-EBUILD sqlalchemy-1.4.39.ebuild 2620 BLAKE2B dfb4b5cfc9ca87f4fb10ddc690fe4e4e2f77446a4043f771c6ee8b8b737c966a5d0b8e89135c5ba91119d4ac6275c97d15e42705ede21e81812e9e4e4a2036cd SHA512 b56f0e2e941806562be3bec7e068499fd5e69ca65746c7250623ea0a15533c561d5691ade4e4a69916a2ab8a3542f07fdc1471eee478bc49e89965eb9139e112
+EBUILD sqlalchemy-1.4.39.ebuild 2618 BLAKE2B b39513f3fbbe974c80b77ee47efdc7101217d815b2bf501db5800f2661dea9816258da1bdb26deb95c0e577b6c3814b675d496d49c7725e13e073c927091a092 SHA512 3646243bc3cee65f586e1a1ca221761f051161146fb2da54cc396437a58a1cffe3055806bfb336f546731a9cf7987190d911c6b02abbcec4ca78b66c085e4d37
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
index 05cc94104e2c..3d537b3f5d7f 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/suds-community/Manifest b/dev-python/suds-community/Manifest
index 42cefeb745c8..519f49bf6570 100644
--- a/dev-python/suds-community/Manifest
+++ b/dev-python/suds-community/Manifest
@@ -1,5 +1,3 @@
-DIST suds-community-1.1.1.tar.gz 284934 BLAKE2B 9df1a5f6b4dd2ca060c639147a090cef6a194f275706e03a3fdafa46c4d18b890f7c94249db8db6202e95abea71948e0c42fe42f14f659ca14bb0aca11b4b5f5 SHA512 9b343d704b2db123ff44685fb03da8f6912cefb32d38e9b79f9f84aeebff32ba26936a0f70a6121628c6f2c5388e94d380f08ed546f55fbf84fdc8e4fdbd3d0a
 DIST suds-community-1.1.2.tar.gz 285409 BLAKE2B 6cf047bb6fa6aed147fa519fee4300f52195c94a409aaa769feffaaf4d43552a566efb0162e440092c3dcb8ec21cf441325db449e5417b81a5f859133a078b83 SHA512 9f26ebbf36fcbd915281f3c3afd4ea776ca409ede4ba9e487b746ef4e527171ee2fdb44075100d52b5bba0658fafec817eea2cbf64b8d2851bdc974aee430d57
-EBUILD suds-community-1.1.1.ebuild 610 BLAKE2B 0914b63f53741520b75f314e386cf18b3a4bcafeaa5a050d42775428c0bc7f2fd31c0317bd3aab059797b33aafb2c96723ee428139aa37d6193e791e484267a2 SHA512 dad8a96f411d6398b8be48fbf87ea65c90fe6fef5ff91402a29ede0cd7f25207f12c9923f20251ca110e7953010f2320a6c569a6a70a1ad3be117c53af64af3f
-EBUILD suds-community-1.1.2.ebuild 612 BLAKE2B efeecefe9b4a5cc5b78992ea3ddb4f1ee3e9ed9afc7b146a4dd0f662576be10c83941edbc90b8c6861856a0eb63d2abdd71b6120821c56fd844f9cddf34c43d8 SHA512 cc9e6ab41c9acb73fde1ab3d5802403dba89fb411f1edd07512676521fbcc874bc9a5209922b08f8f9878f5fba8f619ac6b264f9a17bf2ff0326841cb661aca4
+EBUILD suds-community-1.1.2.ebuild 610 BLAKE2B b7bb3d00fd0d5606a8475ae87019ac8184db1dc7919df567beef6cedafddeda4424ece6cc6b277561d5cf5e4bc4b8278d850a382d6a7032e2831fd748b38db3a SHA512 75ad0f38c164e917b181921a76e6b3d9f15b57db6caeeb758089afc9f826dcf4bff62cbe8de6b6d302e69e6b93c7d8f2d931b778592b9730c605265c726375be
 MISC metadata.xml 557 BLAKE2B 1ae35931a85cfdaf853e47471764926aaf69ecac0e4d0fb208278dbe2324bfb141d1f3a870eccb94fa10c4450c2c7a141a4c007cd24d65f51a52536f7b9839e4 SHA512 232676d84079a770034e67f6d23592375998b5940a46efb7f1a654de6a78df8296a3fef694e65a7767add3dcf3ccf0b0d947d0733c85a68f5c4ff802e09b0bec
diff --git a/dev-python/suds-community/suds-community-1.1.1.ebuild b/dev-python/suds-community/suds-community-1.1.1.ebuild
deleted file mode 100644
index 3e6e1382baab..000000000000
--- a/dev-python/suds-community/suds-community-1.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight SOAP client"
-HOMEPAGE="
-	https://github.com/suds-community/suds/
-	https://pypi.org/project/suds-community/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-DOCS=( README.md notes/. )
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/suds-community/suds-community-1.1.2.ebuild b/dev-python/suds-community/suds-community-1.1.2.ebuild
index a41f925a470f..e6cba6dd1497 100644
--- a/dev-python/suds-community/suds-community-1.1.2.ebuild
+++ b/dev-python/suds-community/suds-community-1.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README.md notes/. )
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 99b99f34e526..2c7db2d7866e 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index 3b5dc4cdb65b..76c061e3e64d 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,4 +1,4 @@
 DIST abstract-1.0.0.gem 12288 BLAKE2B c61fe73f5a5b765296e4a61acfa14b39468878a442a1ce8689e846089da9a3d6c8f5425a791040865d5aadd435ac78de6f48f809f081ca0883c71f733e4cbe5c SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c
-EBUILD abstract-1.0.0-r4.ebuild 654 BLAKE2B 0bc498ef87ef2d74b176bd9da11fd5accee8de5dc1fdc10df9f36df149acf227498a1b5cef2554f39d4afcc055f0d726239ab923c2d6dd3da5cf9692a53f262b SHA512 b6da9ada362cb020f3478b687a547c1124f4e796dacd9953e321faca01ecaf10c4af1c20cf1f14de235e46e558fe0d7ea23da910b8b8b739188ae309f77f93aa
-EBUILD abstract-1.0.0-r5.ebuild 660 BLAKE2B ed3188df24767bbc9b56e81ed555a8e9f77c7ed20f73cbdecf1cd659f08f3acd66283081c114e22aa1866e6b3544d564c59a86ecc02ff1de9291c45d971d7313 SHA512 20fb52a10951197f2487fb64408b6798892ff32d5e4194c0484842f2e018e5020dc6deb977c3b8a953d1359cf5c822d4ea9a6c0cbccaa0ed23734866ab9fd2e4
+EBUILD abstract-1.0.0-r4.ebuild 658 BLAKE2B a0566404785323ab9ae9196e4d49ca4cb6f57d9e7810440e700d9c5c26b838dfd8f2caecd753b033fee23d310f26aa727dce76537ac9bc2596c341d16b945399 SHA512 5b73f22d6dacca61a161088cd49ac89faf16f2d9eae8bad4f926a365a9445fbeb3122a0b7dcbc59575ad7628024aba22fa65132265b3c1839837c8f7f43abee4
+EBUILD abstract-1.0.0-r5.ebuild 664 BLAKE2B c7107b6143de861c296783f053a1f76c755341957d628198c5190da6cc3dad9a772768c47a1be57ca09dbe6f104cf77bf8499359d02e7e2e3668f14796250690 SHA512 81927c221777b6b4462f451fc89741693c6daf0af5e880f6ea850b39f9994a597e1ee2fc3fa1f922f536e209c7fc5f5cb7c08244074bb2227a9751450fea06e8
 MISC metadata.xml 327 BLAKE2B 4e4c1da9174d2f1b69ac7de0df4b0a1d5fe2c87ea1b0b51d4286a3765c400a25d590ae1518103e1c014c6a660ab3813b435b32c8de149209777082a784f55812 SHA512 a9745b079df7aa8a9e171de738970d50edc6191661f3168a26c670e6d492e4ba4ceaf447967cc3262505b33233b48bce160bcb3c180f4d422266ee6e72ceada0
diff --git a/dev-ruby/abstract/abstract-1.0.0-r4.ebuild b/dev-ruby/abstract/abstract-1.0.0-r4.ebuild
index a851b3e46364..b2e336decb80 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r4.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="Library which enable you to define abstract method in Ruby"
 HOMEPAGE="https://rubygems.org/gems/abstract"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
diff --git a/dev-ruby/abstract/abstract-1.0.0-r5.ebuild b/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
index 1febb53a86ce..f642da70d88d 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="Library which enable you to define abstract method in Ruby"
 HOMEPAGE="https://rubygems.org/gems/abstract"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
diff --git a/dev-ruby/amqp/Manifest b/dev-ruby/amqp/Manifest
index b117d5dd1253..c8d8aa6a0ac6 100644
--- a/dev-ruby/amqp/Manifest
+++ b/dev-ruby/amqp/Manifest
@@ -1,3 +1,3 @@
 DIST amqp-1.8.0.gem 1175040 BLAKE2B 5c623201a378ecbd501d0f30d31873cfdc47088659d79a89eab21b510cbacad220df0122b3164f543f00a5587b74aab4ffb5d6879f0c30fc06ee17bd55600dcd SHA512 8575b3704cbaab5937a5880858bcc4610ecab4be66b9ef8633c1d49858a95fbb48b1245ba71ebce1b0d31e319cb6f133640097aaa779b8a32282f6d442098e7f
-EBUILD amqp-1.8.0-r1.ebuild 955 BLAKE2B e7fc4c22d2ec26c86254048a75127dbfc2d6c08bb1c5e30d0dba468373a98ceabd599b284d50236a8a99ffa6a5af5161ad92bd693ac67d237e5a7ffb2fff1478 SHA512 d690b4340baaf2125ac71bd4c8f4bfbd22bf998d05096afd7fec92ea51afe3b2f9d4c8a646fcc11d97dd54b3e13e8096766050bf36d40e555af13a34dc4cf6b9
+EBUILD amqp-1.8.0-r1.ebuild 959 BLAKE2B c380193b6273e0738202e096cd8747bfdd5c0e8150d3e5c5e5754798b9d3fc26387ec51822f1fa65afd1687bb7504f7c9386791c25658a2f302cd42abdca6ca9 SHA512 e3e4c864ad29f2544c2e079b2eb29a656d9d6fc893f67a341c747e5a9f69616f3074cdd156b7b8ab9f69e045bbeb63b5bb7b7afef7fd1f03a7f9b33a009e3fc4
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/amqp/amqp-1.8.0-r1.ebuild b/dev-ruby/amqp/amqp-1.8.0-r1.ebuild
index 8dd9260cbc0a..88ea22db3e64 100644
--- a/dev-ruby/amqp/amqp-1.8.0-r1.ebuild
+++ b/dev-ruby/amqp/amqp-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ inherit ruby-fakegem
 DESCRIPTION="AMQP client implementation in Ruby/EventMachine"
 HOMEPAGE="http://rubyamqp.info/"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="1.4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/dev-ruby/bsearch/Manifest b/dev-ruby/bsearch/Manifest
index 0c2cac29951d..e62bacd47039 100644
--- a/dev-ruby/bsearch/Manifest
+++ b/dev-ruby/bsearch/Manifest
@@ -1,3 +1,3 @@
 DIST bsearch-1.5.0.gem 27648 BLAKE2B 6b57cfbdfbb56df9c1c8374fccc59746241a7571aa7328519ef2f5c85e13e0cf8f54c90cb55deef2b08a902c9123c63d0b299ca7026ccde9b02aad02d4411181 SHA512 6246921be42e15ac35cf862833e156a01a0de9e0d2bff53af8eaadb3e7a512b7ab1e9dbef5b05282b82b26e589e45ecb6e31567b382dfc6eb62757e658cdc660
-EBUILD bsearch-1.5.0-r3.ebuild 599 BLAKE2B c47c12c99b1f98c7233c471239c3c7538cb7baa0f77280b6536100196f2132db73d18c767d72fe507e425c59c6efaf98c3400d7d8673d8ecabfb54b39934a42f SHA512 0f34af3acef8af82fe0fe7adea03898480da99ee729ab9708067e07a10e5a0856767baea054ebb6d4b72aa0d04a095bf677da0fd37a05727e9ae2c56872171e8
+EBUILD bsearch-1.5.0-r3.ebuild 603 BLAKE2B f2e297486b984d06ed376301798f0230ee19cc9f3c1c8db156ff95d34119c4ad8fb1b8501ac151547278f790989f5b7ec9aefc08a071beb1f07709385415f534 SHA512 d891741412f9ce43aca3e17127df08241694bd098ebb9fb99c102a6f4c080fea9198a632258a4d050e9e266701c8cc5b66db47c53b4c5479afd1575db258fad4
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
index 257d47e6baff..5e44fe011fc0 100644
--- a/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
@@ -12,7 +12,7 @@ inherit ruby-fakegem
 DESCRIPTION="A binary search library for Ruby"
 HOMEPAGE="http://0xcc.net/ruby-bsearch/"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
diff --git a/dev-ruby/columnize/Manifest b/dev-ruby/columnize/Manifest
index 493c0301e1d1..680c5e4527ea 100644
--- a/dev-ruby/columnize/Manifest
+++ b/dev-ruby/columnize/Manifest
@@ -1,3 +1,3 @@
 DIST columnize-0.9.0.gem 16896 BLAKE2B 46821b72e3c0b70b5788002904fe6079dbab28f9f5d085ac269de8b2765c00f22294bbb36a288ea5688baf3a0bfeed9a4edfbe78eb41be67321433032ec99811 SHA512 b85f478db0e70740ff2d09e0c0a0e6eef378cbd0f025f8583726619412c0dd93ce85705978550ed13713f35e90db846ff087110c210742dfc3223bac3da7176c
-EBUILD columnize-0.9.0-r1.ebuild 445 BLAKE2B 102917231be683a20b8f76d3b7aa4c96756653f3326e4895f2390279ae2b7de3a35a51e6b868d9703b6451e7755103fd01bb931b64d37ea0163371c635b7f56d SHA512 a01ce8a92b887606164267478344061015cb026b9d10c9bde8014daba6dc94f965b8834cc4ccb5a303f00bcb324c6dc262421347377fde28080ba1d7e0cb0e83
+EBUILD columnize-0.9.0-r1.ebuild 458 BLAKE2B 5d9f9d0158b6f2350684fa0d6879ac97a0d3077fce603d9f0a2f25240a3e984b200243a42ea6bd8683e64ca850e485acdddde4645ef80dc85a77311e6443118b SHA512 654ae4eb215e0971725985b0162a353b51d9979be625d534f08a29a37cf642a65cdbcc2ba59196c819ffac17f0163b56855a5a4b4780683a67e1b4d65bbd8545
 MISC metadata.xml 342 BLAKE2B 2ea1721becba00103210456b83ce0fc7d0e7584dcd61a21325ed1255430eaa3aa10498c1e551c12c6018e44c85b05931351e87b89c342d95b05d6d9595e5b810 SHA512 a17db116d5836fe555a8acb5fa2689cc9954e99fcf60e83dcc81712832b2aa96743dfd0daa6d0621d2bb206a30379f01d88aa4fcc5192807e83ec8dde13035da
diff --git a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild b/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
index 61dc3cc6ac28..efd4d73094e5 100644
--- a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
+++ b/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit ruby-fakegem
 DESCRIPTION="Sorts an array in column order"
 HOMEPAGE="https://github.com/rocky/columnize"
 
-LICENSE="Ruby"
+LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/fattr/Manifest b/dev-ruby/fattr/Manifest
index a22e333e395a..eef71b7f8582 100644
--- a/dev-ruby/fattr/Manifest
+++ b/dev-ruby/fattr/Manifest
@@ -1,4 +1,3 @@
 DIST fattr-2.4.0.gem 14336 BLAKE2B 1be45d17eac08dbadec9e0a4177f7b1ad7d39c060ce1162961aa8fe3b1c9b0107f10c17a2a9a5d27e652067df7f33aca0afb57b6a268b52999ae7a7b540ad131 SHA512 df3aa4fe187f7922fceaad3b30d4ed9c869ac194f819bc6c57dd574a27e69a74cf9fb10042163d941b0edc7129dc5ede5f92c60a75c6744bb9e8f358f5cf24bc
-EBUILD fattr-2.4.0-r1.ebuild 552 BLAKE2B fd5549723173dac9e9c8ca4c248759571560567f9f4e725aa8d25b0f2eddbbc532c8f60d27ca21b2f0845e26e1ed39e3bc6eb1f7851605d83ee0ef08a45f0068 SHA512 2b293b02efd9e09664d425790b81766d450f6f9823a5b9f17d885060de62f0d7211e9ca437b610e65f18578b20285b7bbee43c446cfdf27bdabb52446f649a16
-EBUILD fattr-2.4.0.ebuild 552 BLAKE2B ef697b5a1fb873e06e03d5d85b447485aa7009dccb883aafd78d4ad3109cef511da2184bb69c3abb5250549805e88d5ed15542f2a1fa630b919d1f8d47ff6230 SHA512 f68d92166c206357cc63d957ac34bb3cfbe5a98816f97cc30b766ae6675294ebfd96a10f982f9bccc1ef9850396abf0554f9334906d47faf58f8d6134fcb5b93
+EBUILD fattr-2.4.0-r1.ebuild 556 BLAKE2B cd9261bc49cbc8f8eec1a2f1d3842d7defd8dd805ab05614fc0681a1f446711b368181ffc6874902680f1c9231271332fa97445e1cd4b26ca574f9e06809490c SHA512 ab2dbf06ce8910af6699be39dfbf651db9273f0ac134662379f548f7fbb882780a40dd3dd585d44f6a217bfb5ca831672a8c41ded8a2a80489201ebf166e50e9
 MISC metadata.xml 330 BLAKE2B 02304daa03a344d11e0a51605ad0b7bb43be5036488c14854aec2828bb5ee0333d8da411aa9db3cad542c637cd525950a2489b043efb3db3f761542534467a84 SHA512 be157986c269ecfb2abc7d140e53a9a048c4e111cba2b7ead7fd714b1ef21436370e68b66d985a4d67e33364e87a1ca8ae65f6e496807d7743723e54ae076b03
diff --git a/dev-ruby/fattr/fattr-2.4.0-r1.ebuild b/dev-ruby/fattr/fattr-2.4.0-r1.ebuild
index 4d2e4eb49724..97cea2347202 100644
--- a/dev-ruby/fattr/fattr-2.4.0-r1.ebuild
+++ b/dev-ruby/fattr/fattr-2.4.0-r1.ebuild
@@ -14,7 +14,7 @@ inherit ruby-fakegem
 DESCRIPTION="fattr.rb is a \"fatter attr\" for ruby"
 HOMEPAGE="https://github.com/ahoward/fattr"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/dev-ruby/fattr/fattr-2.4.0.ebuild b/dev-ruby/fattr/fattr-2.4.0.ebuild
deleted file mode 100644
index 5d6cedff557b..000000000000
--- a/dev-ruby/fattr/fattr-2.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="fattr.rb is a \"fatter attr\" for ruby"
-HOMEPAGE="https://github.com/ahoward/fattr"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-each_ruby_test() {
-	${RUBY} test/fattr_test.rb || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r samples
-}
diff --git a/dev-ruby/fcgi/Manifest b/dev-ruby/fcgi/Manifest
index c7338930805f..5bbbe4ffd34b 100644
--- a/dev-ruby/fcgi/Manifest
+++ b/dev-ruby/fcgi/Manifest
@@ -1,3 +1,3 @@
 DIST fcgi-0.9.2.1.gem 15872 BLAKE2B 1f3a9cfa79f06a655bbe3ecd36be8b650f7c1f856f84f82502c87c06f43ee9c91eed75e5441c65a635c700b8c682745f631e3268701555268eb3a1568347573f SHA512 1ffdd429ce4f2bbac771b7ac2368a5194015a7327b8b43b803914257edc174235573df6bb41a53fb71db0bf179fc24ce2392b244b5b55563d67e045c47da8579
-EBUILD fcgi-0.9.2.1-r2.ebuild 585 BLAKE2B a1126f6bcd3f21bf198e7a881ce51f431205d3812cca29ac0ebf3a224d776890f77463c1d47aa133049e0a1a48b650d91a0719ad3c57d7dd555f461179521aac SHA512 cfa9919402f06d3ede4adb7fc3d2bf50d8574551edac7929b23ca959d86d8ffc716965b759e74a9eaa2f9171669ccfa8e2cab96c91356f51c9d98d8a5b52ff16
+EBUILD fcgi-0.9.2.1-r2.ebuild 593 BLAKE2B a2a6e30020ff06594407d063c8287cbdf265d9bef2fcca18f31c2b95894c91cf2b501c661034659448260411540a3751d66bc19386efc63ed82b18decd10426b SHA512 9660b50f53a1c8cb011a5df6d2ab54ae9e029af8cd849d7aeeb86ac4dbeda156228f215bf395c3f08181292f5835531e681b975c15c125ad738f7fc42415f8a7
 MISC metadata.xml 348 BLAKE2B 44f57d6e39a30e0dd73b056ec092b2832bdc12d931c6c4d64ecc6c962f3c6c83c32ec0d3723036602fd92ae5050d7a923832909daf9575168168207176e26891 SHA512 d1e929373d07fe777e232c45efa4a98cf612b0dccb091366fb4b0aae7d78110be22992dd446d7395283b9175eba503c383555a803d4a97b67589acf369fe1330
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild
index e3ea29b2c4cf..10e7bf38900f 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="FastCGI library for Ruby"
 HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng"
 
 KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-LICENSE="Ruby"
+LICENSE="MIT Ruby-BSD"
 
 DEPEND+=" dev-libs/fcgi"
 RDEPEND+=" dev-libs/fcgi"
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 8333c6694934..7a5c847b4888 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,7 +1,7 @@
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
 DIST json-2.6.1.tar.gz 132705 BLAKE2B 5a8e83b8d11e360402324427de5d2520f39ee1567e2fbf3c92c738546792bb5dec4a9a3c36f3286a3de63161bb5d9f9e7b059c2560f7a3fa50271ce2aa3dc0fc SHA512 e9d0ef77d77ae54a0300b490e3e5c445d0b5aefbce1b160454916bd4f4f8f943131223047e6a7416347cc40d9e7fb1870101c3cbf3a2663a9053f07bdfbd13cf
 DIST json-2.6.2.tar.gz 133073 BLAKE2B f81202ee284d3a6afe5c6f3ddccde76655e170b64883e37bc38c47bd63d731f8dca4e8a57da15e275ad64af5e1e967def69590d1105c0069b92f322919782a84 SHA512 9c1c16ef462e7736c0306781573f32b96a0a53368ed24b4d1ae97953df62956b6cd72dcd20ed07708b0e1e3dd71baa61551bde452c87d7efac41267c0ee60b33
-EBUILD json-2.5.1-r1.ebuild 1942 BLAKE2B 9b3c3d24aa411c7afeeff47f2f282e68a42f98c331957ce7448aa89dbd595c13445e4e6e3a4a85b604a1d8571239523890c123812a86cf2051cacae9bf30f973 SHA512 f6b76f74a51618a776b265ad9d063d0169b085aec169975b59060a3463bef3ca4a1b9599e481ef000fcec5cc0329958b1c504fc810df14e12c4eec25873923ea
-EBUILD json-2.6.1.ebuild 1957 BLAKE2B d111fc5142b809e54e05c0af2e09737504574f5a0d02f13877f58b09769e0047ed3d4568e18dd0b7c3d5a433e1ffde02c737a99f035f6d578f300aa791ce8906 SHA512 77e74fed8c2c87d4f93f6af5906875bfff3f85f594543a1fcaa0e365c975d8fb7b65d60f0dffc079b1aa1367a4322d584e4e98a16e22af34916f97424be51331
-EBUILD json-2.6.2.ebuild 1577 BLAKE2B 522648a04771a4aff7939baf8be6aa64ccaf8db8525998121489014fd96fb206e7bd0de9ab0d6dfc93c66f2fcd7d5827dfc3c8e9181eada978f64dd497fe41f4 SHA512 2cf85aaadc7139fd25ab3cb8da463ac253e4cd7bba32d53d8c5774af02e2cf3ecfe1d6a4cd994bf46941ee58f7c31250e99ee6e55afad8770ef67c05d478a045
+EBUILD json-2.5.1-r1.ebuild 1955 BLAKE2B 6737796ab30d7e97f6be361a86d111e17a430c2b64b946d8e9e5fd6519396be7d4e66805f6d2ee4827708fd5451db1671ad12ec22614baa8185316e91550b862 SHA512 8eae36fb5c6664f77eb2e3801b7596e59e6b0bce1733b6749dd27cfabf1455dce1f3f8cc1f8b5077f042cab5c67827630bc1af0652ad9c9861da4bcad783ca23
+EBUILD json-2.6.1.ebuild 1970 BLAKE2B 1d7018e40d4a987ed94b5c3894bbbaa3e96089459a8287d155ccde8c8eea96813b464da311c4e3e811d182ad3aaec57a5d260949ec2e239a89921df97ace36b0 SHA512 ee6419dab91dbac2ca11f9abe0c89cb745e4d5365cd620a4329978bfaaa24601eeef52f434d609724e0750e19310a0c6fcc75618344954a6ae0d06c25f42eab6
+EBUILD json-2.6.2.ebuild 1590 BLAKE2B aaf12a53f31d94660bddc588ba6960d5ffdf03dc8385b43ed59b492f55d9a33578464613b4a168616047949406cef2a431c40f7472eaa72026e63cd08d8964c0 SHA512 33b3c95994613245cdaa369c1005ebe18ccbe11152be41f38cc8da217516032522341bab427032af0b603943ff4808d82ae399acf99bb4b3b65453302ae7588c
 MISC metadata.xml 337 BLAKE2B 6b424567109cd8947377b5f955a9b32d3c12a25001e8d68cf62ac753264a0d8785f0fc60fc2ffbe5ad4e7a16ebd763add075820e4e559b50f6a230ef2f7a61a5 SHA512 e6900f34ad0c2a8310286eae9942432533dd78a14a04fb5d2551be21437cacc1a2d83b40ec93e885b30626cf49491f7db8a19b6e16009b6931cb0fd0c8ca8d5d
diff --git a/dev-ruby/json/json-2.5.1-r1.ebuild b/dev-ruby/json/json-2.5.1-r1.ebuild
index b60bf87b53cc..ec077cbe9732 100644
--- a/dev-ruby/json/json-2.5.1-r1.ebuild
+++ b/dev-ruby/json/json-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ inherit multilib ruby-fakegem
 DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
+LICENSE="|| ( BSD-2 Ruby )"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
diff --git a/dev-ruby/json/json-2.6.1.ebuild b/dev-ruby/json/json-2.6.1.ebuild
index 8645070d8ec3..a90b9af04b1f 100644
--- a/dev-ruby/json/json-2.6.1.ebuild
+++ b/dev-ruby/json/json-2.6.1.ebuild
@@ -16,7 +16,7 @@ inherit multilib ruby-fakegem
 DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
+LICENSE="|| ( BSD-2 Ruby )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
diff --git a/dev-ruby/json/json-2.6.2.ebuild b/dev-ruby/json/json-2.6.2.ebuild
index c92a49456688..1cdeaa8478c9 100644
--- a/dev-ruby/json/json-2.6.2.ebuild
+++ b/dev-ruby/json/json-2.6.2.ebuild
@@ -16,7 +16,7 @@ inherit ruby-fakegem
 DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
+LICENSE="|| ( BSD-2 Ruby )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
diff --git a/dev-ruby/wirble/Manifest b/dev-ruby/wirble/Manifest
index 9f34c5adf8b0..6cc89c5d198c 100644
--- a/dev-ruby/wirble/Manifest
+++ b/dev-ruby/wirble/Manifest
@@ -1,3 +1,3 @@
 DIST wirble-0.1.3.gem 23552 BLAKE2B efecdea2e23e6ae9c659586d8b58fae279bacfb1470f8985a4df23407a937415d8db0eef6d7edda19452479a11549cd642e318ebb65cf23ac7067d6b2d95274a SHA512 efb3b233ed13fa28f0a9b746311af24c48266b4f80ce42670550687a24b31bd90c5d0799d68aa0e797ffbffd1d3dbebe86ba39cb02e697eb426dfc9f8d606678
-EBUILD wirble-0.1.3-r5.ebuild 681 BLAKE2B 820df0f45fbba8c4d7b146992116d4508c858079a56d2c378cc4840b8eb24e83571387f8a77ef5ca014b4f3112037ef41694f6a3d372c4a22a3446bd87a5a8b2 SHA512 4f7e3aaa01be2af70c0c84983e8357bd1edf825520f4a7e4d92614389241c30520c0265644c2142ef57e5017c848c7e62f40bb4cb9b50c5eb3c2aea6546c632c
+EBUILD wirble-0.1.3-r5.ebuild 680 BLAKE2B 3d7a1c49d5ab501fe734f105c1553285052e9f9072125199fb50a83652f82fdfa658866c714888f1ed191cacf9019483a8747ab7805a491e897fef40b027ef04 SHA512 8627e9b6f561e7940b9f119f826a0953de4a55879f7bca7bcaffa2be6c4e047cffb9c6e5130098841e33078ccc28904f3e036142aff251d82e2a8ca843432180
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/wirble/wirble-0.1.3-r5.ebuild b/dev-ruby/wirble/wirble-0.1.3-r5.ebuild
index 928c94d84f72..91435b52a8fd 100644
--- a/dev-ruby/wirble/wirble-0.1.3-r5.ebuild
+++ b/dev-ruby/wirble/wirble-0.1.3-r5.ebuild
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="Wirble is a set of enhancements for Irb"
 HOMEPAGE="http://pablotron.org/software/wirble/"
 
-LICENSE="Ruby"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 11fd3f8b671b..bcd14c48a973 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 785064aac6da..e679c1bc9303 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,6 +2,6 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91
 DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
 DIST ninja-1.11.0.tar.gz 229475 BLAKE2B 71c8b6cf9524bdc11cf73f7e761f0d7deef2498a970c1439c10cc7d361e31fed1e3b54bcb185f3c7ed041f15704851a96e42560058af61b8a5df6e918d52ebf3 SHA512 9b9c8dae2251f9ddba50680911271b8504c292994fd90a0da94902f64c69a9edc72212217df5c651ddfc2f79c2ae03e84c99b805497dcd7497c53a1617de83e7
 EBUILD ninja-1.10.2-r1.ebuild 2798 BLAKE2B fae8cb33fbd559d68120a8501fa99e7a6299227c590c9902a1cc402798e892d92718ca1e6248d22f41059e2a1a98ca92bdfb534a33ebc34cadd88615974fe565 SHA512 c26741a21ef5155ef518d219b377fbe70139406b533ff64c2a2f1cf626848f76a2172052f5b2584a7c4a50e3017c7d4ba4ea656141e8925bf8bdb4a9a06b301f
-EBUILD ninja-1.11.0.ebuild 2672 BLAKE2B 7dfc16d910bcc396f6e993738c072fcfa6f71128133cbcfa0caa90fe7dfe842f13bf4c2fac57e5cfb0eac6fab53de1e049131e99aa5f281f25c5735691fb9411 SHA512 9075656d3c3b4c35b48359c08213241430b912a96976be59aca2686d462620f58c5c81de4b583e3adc8db6775e92f02be96cfa8229cacd76d2eb110b7cd6bdce
-EBUILD ninja-9999.ebuild 2672 BLAKE2B 7dfc16d910bcc396f6e993738c072fcfa6f71128133cbcfa0caa90fe7dfe842f13bf4c2fac57e5cfb0eac6fab53de1e049131e99aa5f281f25c5735691fb9411 SHA512 9075656d3c3b4c35b48359c08213241430b912a96976be59aca2686d462620f58c5c81de4b583e3adc8db6775e92f02be96cfa8229cacd76d2eb110b7cd6bdce
+EBUILD ninja-1.11.0.ebuild 2672 BLAKE2B 62774b99edc98754f307c8a5576e148534cc21eed8fc0b0e42ac2653b27943f8b86b3368b856743011884a034601e221bcac1da81c45bede2c249b7e42b6783c SHA512 014bc565791220ba3794563973162e38237a5f5cb7247c79fbbd6ef811944d2decf9f67c8f29df2f0a39920f9077f1550625bbb4bbdbac3d2f0f4f642ec2577f
+EBUILD ninja-9999.ebuild 2672 BLAKE2B 62774b99edc98754f307c8a5576e148534cc21eed8fc0b0e42ac2653b27943f8b86b3368b856743011884a034601e221bcac1da81c45bede2c249b7e42b6783c SHA512 014bc565791220ba3794563973162e38237a5f5cb7247c79fbbd6ef811944d2decf9f67c8f29df2f0a39920f9077f1550625bbb4bbdbac3d2f0f4f642ec2577f
 MISC metadata.xml 345 BLAKE2B 62344dee3d109b90fe9cdc68f581d3dddd9ffee182af72e82509180d9382b6765ecac373680f0c3fc3e1b5c4e9641a689bb036ee877a2117d335ae4e1608718b SHA512 20d5ee6f6448835b6cdcb3ac1f6760d5bc452aa44a1c72de2241cd47432967498c30099c79a5b59a53796cbe1c373291bb62a5d48914996fa20c9e22569d68eb
diff --git a/dev-util/ninja/ninja-1.11.0.ebuild b/dev-util/ninja/ninja-1.11.0.ebuild
index 009dcff946ca..81d813fea607 100644
--- a/dev-util/ninja/ninja-1.11.0.ebuild
+++ b/dev-util/ninja/ninja-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 009dcff946ca..81d813fea607 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 93c5e90d5827..e6e160403e17 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index a5aa937c65dd..1eda2778a5a1 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,5 +1,6 @@
+AUX git-annex-8.20210330-persistent-2.12.patch 946 BLAKE2B c5fc158db402d67e411d88ec0ea3dc4b07194c382bd2245d078f59b04d80c780f4bae32eae52f5720c8e6f70fed46d2c2e33f7fa1dfad75b84db10604932d94f SHA512 f29fcd2964338b77e1c5fde4a8bccf85e0973c394916bfe083c0dccfa46040e4d0a9a47f70c95fefdcf216fda8ee23c770042eeb126e097f9cf7fe8613aaf323
 AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b6b49095f5b7724ecbc1c4f13a6f351afe66f0d015c7355b6a56b77c06cb1e9e5cf155268312c619 SHA512 89b6520e4be14af9032638c1153df936a7e5707d6453b4251fe762712b8956ba1d39a4623b06910e5ac5724e33e157e654b724e070b6893f6f26578df730d326
 AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3
-DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B 63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713 SHA512 e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f
-EBUILD git-annex-8.20200810.ebuild 4802 BLAKE2B 04e6958e4dab5428427e0ae4990b962500103ef6b856b0e68f7657115a93e4bcd05d64d8ba34eb156c662263f4750adfcd845956fd9df835bc66e1724702685e SHA512 20200d3f9c9b4ebbf5e375c75d1e001b45d4adf1b310d5cfc51f4d26867aca044558cafcfda4a5381505553480ea20f576f8cda3cb07e745716970698b037439
-MISC metadata.xml 2191 BLAKE2B 7c63cee55780cb57abac8f4cd5e2b9067fc51c8bc79cb12d0a432430f3a200b9859486ba6808ae0543db3e14b3361d6449e908f3311aebaa452c159389197236 SHA512 58294e15c74aea0c88ad7df113a6272ffbd4bf3aa0c0dd9843a9d0bc1b3b7423a18d45d7d25a02cf683567ee95d20c4ae79c20d845227875e01780656335f52b
+DIST git-annex-10.20220624.tar.gz 1426982 BLAKE2B fa3a105f9677c51dfb1a44984ac80a377380ff5e2c69486f6f213fcb709c2280c66b8d856f004016f97751abea3faeca8756663c0af19616ed237d8e4d9d25f9 SHA512 4269c3408c9368283ab280c7231953ad95687b5ff84c1e9cb725d5ed6eb4da9384c48de33e4265d2fd8b1352eea47bffaac7d335d2c998149555b050f80a75af
+EBUILD git-annex-10.20220624.ebuild 4161 BLAKE2B ca5a395a01f89af8dfdb5fff0d632c35238b53be147bc0bca082a124c66c94b9dd1ec667a6ad2b000477ddb6d4d1ee5b890251270199eb2f2973489a5ca9ab0c SHA512 5c7ec0328b757b1a43c7c06335a97bfd3d363234a94fc6b7619b96cf73d82692525f5577d79a0f50f4f08e9157fb57bf8f45be6c2ed93ddf29da2f97d369acec
+MISC metadata.xml 783 BLAKE2B e432870d3b0798fd24f3f138c1213f8497c0bc4c1b5e7f234834919b54494ae476178a2fab1df4a8908e2d555958429b757277b7d58f970de2d2fe56d8d824ed SHA512 0d40eaea4a8c3ba321f6fa27270ec542b2c05c03d2ee7e56476de0a15410f5cf1775db1bf99c0c1c46bcd3874014879c1d15ff16a9ada547737a960cdebd946d
diff --git a/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch
new file mode 100644
index 000000000000..977e5931f5f4
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch
@@ -0,0 +1,28 @@
+--- a/Database/Handle.hs
++++ b/Database/Handle.hs
+@@ -26,7 +26,7 @@ import qualified Database.Sqlite as Sqlite
+ import Control.Monad
+ import Control.Monad.IO.Class (liftIO)
+ import Control.Monad.IO.Unlift (MonadUnliftIO, withRunInIO)
+-import Control.Monad.Logger (MonadLogger)
++import Control.Monad.Logger (MonadLogger, askLoggerIO, MonadLoggerIO)
+ import Control.Concurrent
+ import Control.Concurrent.Async
+ import Control.Exception (throwIO, BlockedIndefinitelyOnMVar(..))
+@@ -246,6 +246,7 @@ runSqliteRobustly tablename db a = do
+ withSqlConnRobustly
+ 	:: (MonadUnliftIO m
+ 		, MonadLogger m
++		, MonadLoggerIO m
+ 		, IsPersistBackend backend
+ 		, BaseBackend backend ~ SqlBackend
+ 		, BackendCompatible SqlBackend backend
+@@ -254,7 +255,7 @@ withSqlConnRobustly
+ 	-> (backend -> m a)
+ 	-> m a
+ withSqlConnRobustly open f = do
+-	logFunc <- askLogFunc
++	logFunc <- askLoggerIO
+ 	withRunInIO $ \run -> bracket
+ 		(open logFunc)
+ 		closeRobustly
diff --git a/dev-vcs/git-annex/git-annex-8.20200810.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
index c80e75b51846..3104cec95ee0 100644
--- a/dev-vcs/git-annex/git-annex-8.20200810.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite,+networkbsd
 
 CABAL_FEATURES=""
 inherit haskell-cabal bash-completion-r1 desktop
 
 DESCRIPTION="manage files with git, without checking their contents into git"
-HOMEPAGE="http://git-annex.branchable.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HOMEPAGE="https://git-annex.branchable.com/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +dbus debuglocks doc +gitlfs +httpclientrestricted +magicmime +networkbsd +pairing +s3 +torrentparser +webapp +webdav" # NOTE: add local USE flag 'doc' when bumping
-
-RESTRICT=test
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
+IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp"
 
 RDEPEND="dev-haskell/aeson:=
+	>=dev-haskell/ansi-terminal-0.9:=
 	dev-haskell/async:=
-	dev-haskell/attoparsec:=
+	>=dev-haskell/attoparsec-0.13.2.2:=
+	>=dev-haskell/aws-0.20:=
 	>=dev-haskell/bloomfilter-2.0.0:=
 	dev-haskell/byteable:=
 	dev-haskell/case-insensitive:=
@@ -32,15 +31,15 @@ RDEPEND="dev-haskell/aeson:=
 	dev-haskell/crypto-api:=
 	>=dev-haskell/cryptonite-0.23:=
 	dev-haskell/data-default:=
+	>=dev-haskell/dav-1.0:=
 	dev-haskell/disk-free-space:=
 	dev-haskell/dlist:=
 	dev-haskell/edit-distance:=
-	>=dev-haskell/exceptions-0.6:=
 	>=dev-haskell/feed-1.0.0:=
 	>=dev-haskell/filepath-bytestring-1.4.2.1.1:=
 	dev-haskell/free:=
-	dev-haskell/hslogger:=
 	>=dev-haskell/http-client-0.5.3:=
+	>=dev-haskell/http-client-restricted-0.0.2:=
 	dev-haskell/http-client-tls:=
 	>=dev-haskell/http-conduit-2.3.0:=
 	>=dev-haskell/http-types-0.7:=
@@ -48,8 +47,9 @@ RDEPEND="dev-haskell/aeson:=
 	dev-haskell/memory:=
 	dev-haskell/microlens:=
 	dev-haskell/monad-control:=
-	dev-haskell/monad-logger:=
-	>=dev-haskell/mtl-2:=
+	>=dev-haskell/monad-logger-0.3.10:=
+	>=dev-haskell/network-3.0.0.0:=
+	dev-haskell/network-bsd:=
 	>=dev-haskell/network-uri-2.6:=
 	dev-haskell/old-locale:=
 	>=dev-haskell/optparse-applicative-0.14.1:=
@@ -68,32 +68,26 @@ RDEPEND="dev-haskell/aeson:=
 	>=dev-haskell/stm-2.3:=
 	dev-haskell/stm-chans:=
 	dev-haskell/tagsoup:=
-	>=dev-haskell/tasty-0.7:=
+	>=dev-haskell/tasty-1.2:=
 	dev-haskell/tasty-hunit:=
 	dev-haskell/tasty-quickcheck:=
 	dev-haskell/tasty-rerun:=
-	dev-haskell/text:=
 	>=dev-haskell/unix-compat-0.5:=
 	dev-haskell/unliftio-core:=
 	dev-haskell/unordered-containers:=
 	dev-haskell/utf8-string:=
 	>=dev-haskell/uuid-1.2.6:=
 	dev-haskell/vector:=
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-lang/ghc-8.10.1:=
 	assistant? ( >=dev-haskell/hinotify-0.3.10:=
 			dev-haskell/mountpoints:= )
 	benchmark? ( dev-haskell/criterion:= )
 	dbus? ( >=dev-haskell/dbus-0.10.7:=
 		>=dev-haskell/fdo-notify-0.3:= )
-	gitlfs? ( >=dev-haskell/git-lfs-1.1.0:= )
-	httpclientrestricted? ( >=dev-haskell/http-client-restricted-0.0.2:= )
+	gitlfs? ( >=dev-haskell/git-lfs-1.2.0:= )
 	magicmime? ( dev-haskell/magic:= )
-	networkbsd? ( >=dev-haskell/network-3.0.0.0:=
-			dev-haskell/network-bsd:= )
-	!networkbsd? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= )
 	pairing? ( dev-haskell/network-info:=
 			dev-haskell/network-multicast:= )
-	s3? ( >=dev-haskell/aws-0.20:= )
 	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
 	webapp? ( dev-haskell/blaze-builder:=
 			dev-haskell/clientsession:=
@@ -107,15 +101,14 @@ RDEPEND="dev-haskell/aeson:=
 			>=dev-haskell/yesod-core-1.6.0:=
 			>=dev-haskell/yesod-form-1.4.8:=
 			>=dev-haskell/yesod-static-1.5.1:= )
-	webdav? ( >=dev-haskell/dav-1.0:= )
-"
-# not generated by hackport:
-RDEPEND+=" dev-vcs/git
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
+	>=dev-haskell/cabal-3.2.0.0
+	>=dev-haskell/filepath-bytestring-1.4.2.1.4
 "
 # not generated by hackport:
+RDEPEND+=" dev-vcs/git
+"
 DEPEND+=" dev-lang/perl
 	doc? ( www-apps/ikiwiki net-misc/rsync )
 "
@@ -127,28 +120,15 @@ src_configure() {
 		$(cabal_flag assistant assistant) \
 		$(cabal_flag benchmark benchmark) \
 		$(cabal_flag dbus dbus) \
-		$(cabal_flag debuglocks debuglocks) \
+		$(cabal_flag debug debuglocks) \
 		$(cabal_flag gitlfs gitlfs) \
-		$(cabal_flag httpclientrestricted httpclientrestricted) \
 		$(cabal_flag magicmime magicmime) \
-		$(cabal_flag networkbsd networkbsd) \
+		--flag=networkbsd \
 		$(cabal_flag pairing pairing) \
 		--flag=-production \
-		$(cabal_flag s3 s3) \
 		--flag=-testsuite \
 		$(cabal_flag torrentparser torrentparser) \
-		$(cabal_flag webapp webapp) \
-		$(cabal_flag webdav webdav)
-}
-
-src_test() {
-	if use webapp; then
-		export GIT_CONFIG=${T}/temp-git-config
-		git config user.email "git@src_test"
-		git config user.name "Mr. ${P} The Test"
-
-		emake test
-	fi
+		$(cabal_flag webapp webapp)
 }
 
 src_install() {
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 0f121b9748a2..82dde5fc9a30 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -9,34 +9,10 @@
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
 		<flag name="benchmark">Enable benchmarking</flag>
 		<flag name="dbus">Enable dbus support</flag>
-		<flag name="debuglocks">Debug location of MVar/STM deadlocks</flag>
 		<flag name="gitlfs">Build with git-lfs library (rather than vendored copy)</flag>
-		<flag name="httpclientrestricted">Build with http-client-restricted library (rather than vendored copy)</flag>
 		<flag name="magicmime">Use libmagic to determine file MIME types</flag>
-		<flag name="networkbsd">Build with network-3.0 which split out network-bsd</flag>
 		<flag name="pairing">Enable pairing</flag>
-		<flag name="s3">Enable S3 support</flag>
 		<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
 		<flag name="webapp">Enable git-annex webapp</flag>
-		<flag name="webdav">Enable WebDAV support</flag>
 	</use>
-	<longdescription>
-		git-annex allows managing files with git, without checking the file
-		contents into git. While that may seem paradoxical, it is useful when
-		dealing with files larger than git can currently easily handle, whether due
-		to limitations in memory, time, or disk space.
-		
-		It can store large files in many places, from local hard drives, to a
-		large number of cloud storage services, including S3, WebDAV,
-		and rsync, with a dozen cloud storage providers usable via plugins.
-		Files can be stored encrypted with gpg, so that the cloud storage
-		provider cannot see your data. git-annex keeps track of where each file
-		is stored, so it knows how many copies are available, and has many
-		facilities to ensure your data is preserved.
-		
-		git-annex can also be used to keep a folder in sync between computers,
-		noticing when files are changed, and automatically committing them
-		to git and transferring them to other computers. The git-annex webapp
-		makes it easy to set up and use git-annex this way.
-	</longdescription>
 </pkgmetadata>
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b246d25cdaf2..1adb5632fef7 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index caabb5f25fa1..d4007968ac8a 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1882,12 +1882,39 @@ toolchain_src_test() {
 	# 'asan' wants to be preloaded first, so does 'sandbox'.
 	# To make asan tests work disable sandbox for all of test suite.
 	# 'backtrace' tests also does not like 'libsandbox.so' presence.
-	SANDBOX_ON=0 LD_PRELOAD= emake -k check
+	#
+	# Nonfatal here as we die if compare_tests failed
+	SANDBOX_ON=0 LD_PRELOAD= nonfatal emake -k check
+	local success_tests=$?
+
+	if [[ ! -d "${BROOT}"/var/cache/gcc/${SLOT} ]] && ! [[ ${success_tests} -eq 0 ]] ; then
+		# We have no reference data saved from a previous run to know if
+		# the failures are tolerable or not, so we bail out.
+		eerror "Reference test data does NOT exist at ${BROOT}/var/cache/gcc/${SLOT}"
+		eerror "Tests failed and nothing to compare with, so this is a fatal error."
+		eerror "(Set GCC_TESTS_IGNORE_NO_BASELINE=1 to make this non-fatal for initial run.)"
+
+		if [[ -z ${GCC_TESTS_IGNORE_NO_BASELINE} ]] ; then
+			die "Tests failed (failures occurred with no reference data)"
+		fi
+	fi
 
-	einfo "Testing complete."
+	einfo "Testing complete! Review the following output to check for success or failure."
 	einfo "Please ignore any 'mail' lines in the summary output below (no mail is sent)."
 	einfo "Summary:"
 	"${S}"/contrib/test_summary
+
+	# If previous results exist on the system, compare with it
+	# TODO: Distribute some baseline results in e.g. gcc-patches.git?
+	if [[ -d "${BROOT}"/var/cache/gcc/${SLOT} ]] ; then
+		einfo "Comparing with previous cached results at ${BROOT}/var/cache/gcc/${SLOT}"
+
+		# Exit with the following values:
+                # 0 if there is nothing of interest
+                # 1 if there are errors when comparing single test case files
+                # N for the number of errors found when comparing directories
+		"${S}"/contrib/compare_tests "${BROOT}"/var/cache/gcc/${SLOT}/ . || die "Comparison for tests results failed, error code: $?"
+	fi
 }
 
 #---->> src_install <<----
@@ -2123,6 +2150,19 @@ toolchain_src_install() {
 		pax-mark -m "${ED}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/ecj1"
 		pax-mark -m "${ED}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}/gij"
 	fi
+
+	if use test ; then
+		# TODO: In future, install orphaned to allow comparison across
+		# more versions even after unmerged? Also would be useful for
+		# historical records and tracking down regressions a while
+		# after they first appeared, but were only just reported.
+		einfo "Copying test results to ${EPREFIX}/var/cache/gcc/${SLOT} for future comparison"
+		(
+			dodir /var/cache/gcc/${SLOT}
+			cd "${WORKDIR}"/build || die
+			find . -name \*.sum -exec cp --parents -v {} "${ED}"/var/cache/gcc/${SLOT} \;
+		)
+	fi
 }
 
 # Move around the libs to the right location.  For some reason,
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 0af4e81ef67f..2ca518660bc1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 829056f68315..db2f68d1a108 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -5,6 +5,6 @@ AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1
 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737
 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.14-r3.ebuild 2505 BLAKE2B df342967cf621c3abcbe9072a17f5601c251202b7d3394342c05aa5e1a22acfc2cb8ae2b78a5d76d52f0ded679b4314f5f4a9d70de12d1f0a11101ee056db0b0 SHA512 d2cd7776da95ca9c0ff719f1709b3a50be2b7170cb33f7380e6bd9cb8f981f53bc303867b2db4797cf887d0b139ea88cb4d2eae2dfec0dea1168ad68064cc33d
+EBUILD fbida-2.14-r3.ebuild 2512 BLAKE2B 553a97c331159bd5c401d09a1cb77976417078fa3aed1118d3fa2802368e330b8e3cb55aabda7d5a925a6c2d8e71e3a8cb8fa97e031e76dfaac44d8afd6e6f64 SHA512 15ca41248253fa96af2c5c7f95381bdf80722cb7c62915374361ccbd93e97b33831808712a2825778f9465f166728506d979f63a3987de5b1ade0c6fdbeca014
 EBUILD fbida-9999.ebuild 1349 BLAKE2B b011518d4f9816d0440b1bfd853fe97514e236fa20fb5eee942924b7e30751b981e0eb13a9e819627dff1af7b866b10c3712cbe0554d30e96e3bf5e7fddaa285 SHA512 10d5b89d83f020f3c14a9a68c622a96cd864ef8081b8163967938bacf592d1594ee8c09ff248515de246835a0a4e4fb78a768590f459bf53883011bede177ca0
 MISC metadata.xml 396 BLAKE2B bb953a472b265979efd469fe16c70bfdcc358aa55393d71479b8105d442daf9dfa940eee8515748587ad3af5ff40684c70ba506468e70c59e30f917192b9d53c SHA512 9053097e148a3538aae6f3a4df83e6ed2580b37f35d82759d9dd72732b39774b92bd3c93e093272827903dc4f9019922749986cab8741f07eb957a921a67cd11
diff --git a/media-gfx/fbida/fbida-2.14-r3.ebuild b/media-gfx/fbida/fbida-2.14-r3.ebuild
index 26920f5b7089..2ab410867ab3 100644
--- a/media-gfx/fbida/fbida-2.14-r3.ebuild
+++ b/media-gfx/fbida/fbida-2.14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 55b125d665a8..33582a961628 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b0202dc2c65b..89d3065dab7a 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,7 +2,7 @@ DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 DIST harfbuzz-5.0.1.tar.gz 29291175 BLAKE2B a30512dbceba7eb339164cfe77685e6ccd8338c297a080341236e90bbcf7451eb27d5227422e040d92ff4267f4d97c377a66cdcaff45ea2b1e69de0602047ae0 SHA512 9d05b97dfce248634b6b3ff69fac5cc344f0c8265bf05595b74b0b060049dba082d358184662b8ea045cd51c3d07e7c4a4804513052094566b777c33ec5af89c
 EBUILD harfbuzz-4.3.0.ebuild 2568 BLAKE2B cd0fd13772b43e47a8c90a5912ed5839c09599766e865e5fd7633a0694b9f379ad4c19c7c4b28af4aebaa839e5eefe45138254b075954427a9b105fa0247a52c SHA512 6d4ab2b384c575df4da788cb4042ce3ea88010d1513d1a84a340881e26efeefec5eb46179758eb06b377bedeba5ad999f69ef9a5e33c0779c4d25394b9d1aaf7
-EBUILD harfbuzz-4.4.1.ebuild 2571 BLAKE2B 280aacd0d2de6a53a6379898bf459b8e7a2521d96898b6ff107f79a7031f12a03fc0542a108d08e76bebcc85f81e9baba6cd78b2b8c06b1bbe7e6cee6a2a83db SHA512 fc63bec8cbdb6d03894f09d9e7140a48ebd4fcf02818ea1c34c9189bfd24fcd60978a76ced36a02a8daaed6becd8ee22caba121e79c16fa14687f5a789bcb8ea
+EBUILD harfbuzz-4.4.1.ebuild 2570 BLAKE2B 771a4e5fbbbac3dbd3748cb1e3b33572da5acf9b75dcdfc7f16f77d5b0379a4c94ffde5e2f3019d9fba85a30b87a688ae79b78e1cdddd92e7f343796f859e22b SHA512 5583bef9bd707c760f69e975164a9a643a6f1b173f0a64428bad9562d4e75c8f4d43ce5d0dbd1ad9893a960515000190a7b820642160c9f47ab52b8c859c7029
 EBUILD harfbuzz-5.0.1.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
 EBUILD harfbuzz-9999.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
 MISC metadata.xml 763 BLAKE2B cb8679b8a67d692c73f1dc48facf6a98a442d34b51a90b2236070919b737d22e38a15babe5847cf4d30d4630c66d803f9d6e684c5e8b8b87a199d5d471a9e35c SHA512 0d87926c3e7a475bc84859d630cc8ed1b62e5766856e15b9aa74c87b5fd22345a9c05951508ccecadbea3513afdfd2244b1dbfbec8b41022d413a1401701e55e
diff --git a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
index 59f53c877f53..bcdb324e06b8 100644
--- a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 2266223e3b82..c58de294a444 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,6 +1,6 @@
 DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 EBUILD libaom-3.3.0.ebuild 3231 BLAKE2B 3ad7ddf62b2aad9be9401ac792241cc162be618d8f1c4a35e015479f5736a6970ae48b99ab2e950a890f5bddb6f44ee50edf421e46f8c072ccd82a0bf6d5dbb3 SHA512 aba993a08e60d01e6d904ba4103a761d6dcaf9290f6af726c4c0dc98eeb0644a1cd2167ade6357b0382f5629b7065d595b5bd634705fec89bf7330f364132f0e
-EBUILD libaom-3.4.0.ebuild 3252 BLAKE2B 687dfefc5f9a0d1a16b2179ba3fd1223a5c83a5434241636d8418e0f933b13f40238c7aa5785bdabf9cbdf3c5d67aa51e35ae76d4ab4d389abf92f8f888f69eb SHA512 fed754c1470e4a4d680c5889a1e3096530226274d3cea424c6ee92817d789d3769b707f803c41d1a3d51383fbf0f8865132d7f7b30db837756c693ad6d8ce93c
-EBUILD libaom-9999.ebuild 2454 BLAKE2B a0c710610035f188728e6e05d137b715206f241da4f76c74adc4a01cd4e08f1e77d534bbf49c9e3f20533dbc58579bfb217ba77c87d159807b05907635689c3f SHA512 e41de7eed71c2acb472800b68efcaff2fcf4d2f91a6447ec7099ac81742cc2c3eb6c80d903213d520e9cc7f37197750dcc05c62e1fd29b091d6ebc7cb9482632
+EBUILD libaom-3.4.0.ebuild 3252 BLAKE2B 7ae704b9923e0c6366ff153ea08b904f464ab7169085163389b1223454bd588d9edd1226cbb0e765ba8900b1e988e6e101fb0bc35fac31f5946a66f59bf495c5 SHA512 bd0e063eadbe50c5fcfc4c5219fb9be5f22ea695090471719bfb2f319a6ae75b4393900c98fcdc73ef9a28dde9cdd7a9d74944b6e093e8cff00675ed8f7b0136
+EBUILD libaom-9999.ebuild 2454 BLAKE2B a886edfc976e058ac5c05aad0371771d4fe9417fa16126c19627885e0df84ab22d8b76304e43e6b70d13031dd54dd28d2da5c0576fa6fbef2b9f61755c7b8ca6 SHA512 0733ee09d7c66aa7c1ca09f9c2c91dfb840cdfe12a461cd2f23dff6977493c628133bea3ead2055c1551808490c6bcf00ef4853404f164e2f23ecfd693a45eb2
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.4.0.ebuild b/media-libs/libaom/libaom-3.4.0.ebuild
index 73a96a1dba92..cebd64828aa4 100644
--- a/media-libs/libaom/libaom-3.4.0.ebuild
+++ b/media-libs/libaom/libaom-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index e5f515ba1a83..39cf3f69c8d2 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 5f2f4b04859c..a9494fc47f7f 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -5,5 +5,5 @@ DIST libmediainfo_21.09.tar.xz 1850688 BLAKE2B ac6b32a23a82f0c5f0901ef9b6a22b850
 DIST libmediainfo_22.03.tar.xz 1871232 BLAKE2B 1dd1a1a04adf98dbb3c28cc6fb43e393a4fd32fbc42d110e61d8a72ec8c5603570629e4a756606ccb548873b450944e642b9422f8b00703c91c2832c635e3bd9 SHA512 cae1df09f38e60363ef3c1d0f7324301b701f21c3fde84318f6389f91311b706037699fe83448f8e5b4d1f8af81ddf357b1630fe5f03aeccfa90fe0f9ae86477
 EBUILD libmediainfo-20.09-r1.ebuild 1795 BLAKE2B ebc2af15dffb2639a0074e57e0f0c822e7931fa85170412b919dd5ba36924cb971a1c337e80402eb97766537a1d2c389c22ef0e9ec4c9be7693af377c65afe68 SHA512 2df425e3944cd74d61f4eaa0b0e189ff58b78595052472fdac0532c73b736563f96dd551cbfbea07b2b26376bcd104c6309dbef9427d3cd961665152cae9ac75
 EBUILD libmediainfo-21.09.ebuild 1832 BLAKE2B 2a3344ff28752d49dcff446590ee9cbb947f6dd5ec50eeb30b80cb3cd57c802ab929830423c91c246e9312e6308941a94a02f48f84af00d63f5a2ed877fba240 SHA512 338167801c0ceb7fb1afa9378391a04c443c91fc660ce5f1c4da9940c5d0abd0f97cac4cc5431d16ea424c63ca5877c0b28cf08cfa0b4197913c707e8e49adaf
-EBUILD libmediainfo-22.03.ebuild 1810 BLAKE2B 6f1adb31e8228b3ab20b960856e41c69ee2aa2d11b4c2de07c2d2bc5820636cbc02f47cb4703e5b646d98825caa5b1733c2b3e9f604cf5f5105c4f82497c9f1a SHA512 066b7b57eb544a05fbf8c2af8c211e73215ef4fc9bfa72e7b6b825cdf81f789d3d973a78dc90270d6c2e34c8fad27c01d7a80cc9417916b5906cc118677ff6c4
+EBUILD libmediainfo-22.03.ebuild 1817 BLAKE2B 05ea36bafed454a257310168c9eb6222f078194782c22617a59f3843cce61775885bc9ed529394b697303c5ff13d19493edfff5d8029eaad572538f611600c4f SHA512 5fe16173f24db7f765d3bdf8ed22cd2ad9c1e7f64e1b15ea52b704c69a98ca35ccad4e8195cf018762c4dced58c3729199ebef595c2d17e90e70f9df623fce09
 MISC metadata.xml 347 BLAKE2B 66f84361f792efe1817c3427292038fd8dc244aea4263c2e2b571b7c5adfc9bd3fd4801cfc3154512a1892590f91c8248f603273d3e1c8d241285a7d863871fb SHA512 b33309009eb8ce3104f5995a4baf050ffe93d53e5a9e422e58abdfbc5c3c4c32406b126b9e1d0421656a73ed42ee662a1b5cec052f73e85ce16d4d278669b607
diff --git a/media-libs/libmediainfo/libmediainfo-22.03.ebuild b/media-libs/libmediainfo/libmediainfo-22.03.ebuild
index 728b662d400f..40c1484a2200 100644
--- a/media-libs/libmediainfo/libmediainfo-22.03.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-22.03.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_PN}Lib/Project/GNU/Library
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="curl doc mms"
 
 # Tests try to fetch data from online sources
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index b2b85a9481ae..b11975c2aaaa 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -1,5 +1,5 @@
 DIST libzen_0.4.38.tar.bz2 129706 BLAKE2B 3e40e31663f655885f47b7674936a765cce032da25fcc3f57604b116414bf4348db363a4745bf98126879de9d2de5d4443af1fe3a1f64a7bafd3525eb1ca38da SHA512 d946cd2349848925e13a3fb6aab5ad4f5aca28bc89b3263faca3096d7bbcae3a4ff9ed2552bf005b4ca1f4c8c8f59856f4c4aafa7c734ecebd078e6fc40a9a0b
 DIST libzen_0.4.39.tar.bz2 129816 BLAKE2B ff3ffe1b53234e567be12e86deb5dddd54584c112d297bd50764a980f4a3bcd51a08af630d482cca3157fcc9b8452f644807d6055d88420dcc6c311725ed402d SHA512 f261a676cbde9a877b85df536306a035ede1acdc5d827049698d19b3ecd8a65e5f6cfe66851fda034e1b31c95f6d6e82b78b0bc35989ec1568a010fb88a5a2d8
 EBUILD libzen-0.4.38.ebuild 1286 BLAKE2B 7f666b78875bc270bfa1d6dae4863e4975a373ad817fd5ca6fa7c2a3acf340759360a0a8ee4a3f3921c71a19f6da10f0a1ce24e1c74e16deef8c5226e40afcbd SHA512 5f7e0a4cb84edbf021e06e6b0fad7ba3f9c23940b0fa4fb8d7f1abf1d10121fba40b9a1f732f662bc3b74ed810cf41939d3bdb19e24f2c5026d82524f29873c2
-EBUILD libzen-0.4.39.ebuild 1313 BLAKE2B 01555b183337ab2f5852b8cdda03667a0022c6ccad8e470680d1c95d80b83e32a64eda3d562ac7a73035bc1e407de3c1d09980c2fa4dc041c66635072dcfedca SHA512 ac40b5fc769ca084eedf17480ea20a71ede958533bb5fe91367e204f2cca8d101fa2757511b9ec9d37799e7af3ec9e311b367d76b0a88989828ce7cb6ca41eba
+EBUILD libzen-0.4.39.ebuild 1320 BLAKE2B f221baa636b53879604527273642a10043a78d175671b7c3af27f15c08ef20b1e2e7e10d96c3d3d30276ed7dc09076486c8a3fb2a72991995123128bc06fcc1c SHA512 8516a41280144190733ca477210d74bbf4e3a97e1f4b0a8b571fe692c9eedfc3acc625b1ae28e050239fff7c522f4f2ad718caaa9560e038fb604d7ec91096d6
 MISC metadata.xml 392 BLAKE2B a57d4f857e1716b904183c862184654212a31e3d3ce089891f85c88b627b9a4b956d542c434e9565843b582e9f35c9e5fc8d4c14b647131c9bf239c383df9bba SHA512 77eff51f73560975ee03ea94a3d0880ad8adb4c6a2ae4930d986436562fcafa09677d18843c2dac366b74e8233f7a900f8ae74b7b82335c8b4067a703f6b3d6b
diff --git a/media-libs/libzen/libzen-0.4.39.ebuild b/media-libs/libzen/libzen-0.4.39.ebuild
index 0f49f8e97194..dd36d4debeb4 100644
--- a/media-libs/libzen/libzen-0.4.39.ebuild
+++ b/media-libs/libzen/libzen-0.4.39.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 0fe840b33db0..fc5d17901407 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,3 @@
-DIST openal-soft-1.22.0.tar.bz2 606420 BLAKE2B c244c28a253168a6651230d31608449b885d3519d07bf66669befb51a5618c2cab6166496f69230969ff38982eb2c82e1e467a741376a2af38dfe59687143411 SHA512 1e3df371d126e19e369dd01e3c5e95d6a32b664adf54ee37836d51ca7bc829f275d945388d8a40a3ac92c1151380bd68bbab4f8a08f59ea67dd1bd9b9a1d0cbd
 DIST openal-soft-1.22.2.tar.bz2 606151 BLAKE2B 78cb5ad38635908a59850aeb511223fd6a28f7699294836cbbfdd09cbfd9016250d68b26115131a7cb4af5d5d0a4d2cbd52813d813f78a045b797c5fb601bc7a SHA512 2271968955d55746caf514b6d4304d09d5e552d5640552e2503186ef36bc872a836804ebf79ffbda663931bd13d4e2ce53e0c46cc4faf4134bdb3c08983a5e47
-EBUILD openal-1.22.0.ebuild 2532 BLAKE2B 4efd84cd8a6ce4ff69adbf489893e82faba8cf726db6ca59b5c0f54b31fb9645c7ae24bc900bf360a0eeb3e172f798d47c563e0d6175caec21768bfed3217cfa SHA512 8943431a04600991e73205091ca7a22fb109260bb3cb3ed6184943a09062dfba9d157587c30a5f1973a16fc27b5fd560a54e0609c15e54169c1da5dc1049f96d
 EBUILD openal-1.22.2.ebuild 2492 BLAKE2B e4de99aefe95d682ed9d1aa4a57f88b3faca047c85bfbf2fd29d74315ab25540d74ced93820362964c1ce7d3c804006d5dff25772242bf43474e003fe5e1ffcc SHA512 41d72e5ca47132e81341d22dde5a55758c60c36aaec22cc16ed5e6c36eea99ce42aeefe09afa6abe7000f715beff7ca249970ea0e1804f5be323e0028d8fb18f
 MISC metadata.xml 438 BLAKE2B 27d299451c7845881fb3167a7147ddd0efa55af8bcc1e7b69cebbb8b27d9f66282962e0ebc7392fe48c1dec5ec287203a0407fd3ae4aa272cd4c112d446af1c7 SHA512 4733496e5f7aeb692f6218cc7a9ed3b44636746c44a7b8e9e86ac0395c0586c761fa877e49976abd6ae5cceae94265e1d0a7c3b25cb892c73268bfd1a76b82ba
diff --git a/media-libs/openal/openal-1.22.0.ebuild b/media-libs/openal/openal-1.22.0.ebuild
deleted file mode 100644
index b85e02154822..000000000000
--- a/media-libs/openal/openal-1.22.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="https://www.openal-soft.org/"
-SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
-
-# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
-# Some components are under BSD
-LICENSE="LGPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
-			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
-			-DALSOFT_REQUIRE_JACK=$(usex jack)
-			-DALSOFT_REQUIRE_OSS=$(usex oss)
-			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
-			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
-			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
-			# See bug #809314 for getting both options for sndio
-			-DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
-			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
-			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
-			-DALSOFT_EXAMPLES=OFF
-		)
-
-		# Avoid unused variable warnings, bug #738240
-		if use amd64 || use x86 ; then
-			mycmakeargs+=(
-				-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
-				-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
-				-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-			)
-		fi
-
-		if use arm || use arm64 ; then
-			mycmakeargs+=(
-				-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
-			)
-		fi
-
-		cmake_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index af7f157c1b52..8eb6f8c8729c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 47e37c609561..e2aacc3bbe93 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,5 @@
-DIST mpg123-1.29.3.tar.bz2 1069979 BLAKE2B d01a8d77ffb6c344592d1b90026ee25ae12eb2e063446e88370e0aa508705a843b987f1a400351b5ed87d211251057b7b31a2e653401b800fe9871ac2a5756fc SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6
 DIST mpg123-1.30.0.tar.bz2 1091578 BLAKE2B 6acdbfcc1119507c63d9da95afc747c43698ef385368b417e1716eadde6b74fc0618c3aa03a495e4415b5f14aef26d85f98832b3ba5f5bd17083651808a7f53b SHA512 cf508bdff1f75320c7c4d77653ba8170cc0dd8c565390cfb6ba745ce3853816071c86becff3ce304b80481d220cac2113ad244930832ccc78d3d8da74112562f
 DIST mpg123-1.30.1.tar.bz2 1092735 BLAKE2B 8ce6b964acf307ce4358b33468b7560e53024df2551a17602032260ac799d6c1ff0512cfb5fa6a59e3983c054fa82b1520f8329502fa4c351b94f66f9ccdee13 SHA512 098fcecc6a570e32ccd164b62428417186265905d148d009ea592c948a02027d67fc43e015ece21cf900008f31bbe35b3ec770faba5ae0b914db0022cb6b37fd
-EBUILD mpg123-1.29.3.ebuild 2999 BLAKE2B 179133f33e9c17de507caf6416b413808faf84a083e1cdefe6380931e21d0d368e898ad44a02fdd0d5581934712279fdb00645cb5974d5b4996fb4e21df062db SHA512 cad78654ea54c420135f2878d07825cdb3c67241fa6f376fe5828ef4c5e600bf8adcd5e1af61f430d70c2ffdd0f23f412971ef574836dd5f912266bc9dea904e
 EBUILD mpg123-1.30.0.ebuild 2999 BLAKE2B 179133f33e9c17de507caf6416b413808faf84a083e1cdefe6380931e21d0d368e898ad44a02fdd0d5581934712279fdb00645cb5974d5b4996fb4e21df062db SHA512 cad78654ea54c420135f2878d07825cdb3c67241fa6f376fe5828ef4c5e600bf8adcd5e1af61f430d70c2ffdd0f23f412971ef574836dd5f912266bc9dea904e
 EBUILD mpg123-1.30.1.ebuild 3006 BLAKE2B 0c587a897a607c29f7192156e54618441667478361f2ea3a59b48944ab8c1a58d73ffc89b0910f227beeeb13388d3e48a4e14db2efd72f79d5e329eede813cb9 SHA512 a100bc2beb52f75de60726554a6409bb7064bb7c647103dd7061f9dd78c3095b7ba8b02a344d09225cc1ccb74569b07ba399c90f09e07b9b4e641f3009730e8e
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.29.3.ebuild b/media-sound/mpg123/mpg123-1.29.3.ebuild
deleted file mode 100644
index e82d3a628fb4..000000000000
--- a/media-sound/mpg123/mpg123-1.29.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-# Note: build system prefers libsdl2 > libsdl. We could in theory add both
-# but it's tricky when it comes to handling switching between them properly.
-# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
-RDEPEND="
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-IDEPEND="app-eselect/eselect-mpg123"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ac3ec4c1ac08..31828df4bf52 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/celluloid/Manifest b/media-video/celluloid/Manifest
index 58343c7b95ca..5e5d317b3b3d 100644
--- a/media-video/celluloid/Manifest
+++ b/media-video/celluloid/Manifest
@@ -1,5 +1,5 @@
 DIST celluloid-0.20.tar.xz 388972 BLAKE2B 9f60bef311a33ed86a78b11742e9ea547dafe0431aba41d9f11a786c17ed6f67480f65507cca27223e7f0d1dfadc2c98f16eb3160a5e25f2165b696f15107e17 SHA512 53bb7ea155cf0b2b96da67851ec598782601ecb68504d4355aa03544fc89c0f64aefb507217d08f8ce49d2b7877215365c9ccce69f5f355ed1792a94ea1a6093
 DIST celluloid-0.21.tar.xz 413072 BLAKE2B 726eb035f15c24333151833ded843be611b6d6340d77de13f38d29f92307da1e30c63c657e654327f10b617987f8800e59b72e28bcc65cdcad4ef9ab002214c4 SHA512 6e48d982be127c21cc6afeec8e94ae5c78c667f865690f8fad6db2f0b8290922682334c4d905827e99765dc2084c1b8a36927ff3de485a7a456f4a2fb7058ae6
 EBUILD celluloid-0.20.ebuild 699 BLAKE2B dd4ff1e613ec1e4be49318b92fde90d07a4c3d33176f16c8ffc79bc13e034e1714b28e9c039b87db6731dcb3c09cef8a884c299aa57dbd888c473356e4fa0ae1 SHA512 d5be2ee8bb621a1cb39de249cb96a4452212cf067ad5707a8cf61179c963ed22467df4ba620d0c56d87b7ca64c764f46ca14060284fe7f9496aa507ce0243ebd
-EBUILD celluloid-0.21.ebuild 707 BLAKE2B 8ed3a00e907070f2e79aa92717be2f9dd5c0ff055914d66f5204b26b23ab63afccae2bf38eae095204cae39fbfe1bd7dab6ba57c5299f1631e8eb0b67980b475 SHA512 d2ab39ca5cd1dd39a5dd04d648481b0c9d8a897265832e83ff946693623efbaf271e01f63575b7bd3eff52b48eb3020d1110f18f093e107996a06bcecd46d726
+EBUILD celluloid-0.21.ebuild 706 BLAKE2B d88cfdc7af694da34a784dc56d8416f518f496f90c78c0614124abe77f24950af93c68e47ea92330ff03929d929b685f9ee85e284016e0b7f3efb64961b76d31 SHA512 60411f443d8a522c7c946b351edf6ea02224bf0abb8465284fac8a274a9a393276154ebd0015e40bc3168016a019c9e1e5031cbb7105d97d75c37987cfbee268
 MISC metadata.xml 241 BLAKE2B 976bb17a5de85e86e06973e02e7dfe782e7b4c2942907deaa9ec15a2d9a47d7eec5ff256069f78e789b7059a061c98641aaff1d21618b68c27fdccdc9474b08d SHA512 6a57f01af8ea264571202d1dcce35b702a444fb9da3e3fdc3930a349b19f9edac50fc04fa4facea682e9584c585c145aec629b2845a4c344332d7dac7d7005e3
diff --git a/media-video/celluloid/celluloid-0.21.ebuild b/media-video/celluloid/celluloid-0.21.ebuild
index 6427cae1f4e7..447feb7364ca 100644
--- a/media-video/celluloid/celluloid-0.21.ebuild
+++ b/media-video/celluloid/celluloid-0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/celluloid-player/celluloid/releases/download/v${PV}/
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 RDEPEND=">=dev-libs/glib-2.44
 	>=x11-libs/gtk+-3.22.23:3
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 78fdc56faa1a..ad3a739d74de 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -4,5 +4,5 @@ DIST mediainfo_22.03.tar.xz 2005340 BLAKE2B 232f077a1e202271de8c0d07f1f2a27efac3
 EBUILD mediainfo-20.09-r1.ebuild 1613 BLAKE2B d2cbc44406a1b9f1389b636a236fd2c1961e4c50494d14268e851db3cdb591ace48adf6021cd620d63f010a262180b14a98fae92b8fa85d1fab57d99a5585775 SHA512 42d2fcdd06b6d5bc0e9d02ab779a300085e60093cb47690a0713ddb7f08d9ce92239f4dd40bb5ddd9cbb2eaa10ff10bdb788905ba6c6d6921bb669782fab198d
 EBUILD mediainfo-20.09.ebuild 1603 BLAKE2B 5c0dc5cd5992ce35df04b60e0f870a1203cd60bc67e923f20b7575827695d01f092785149fab5e2aad3297215d1128599b9177590bad13ad28226a1b05b4dd7f SHA512 d0779a099600b1478d234fa61f2696961266d2137c904e648ca77d52433588fe7015e929f2ced4eb5444fa4ee63fb05461f5f26a7cd86c7b7da6203a58ff2804
 EBUILD mediainfo-21.09.ebuild 1657 BLAKE2B f93738fb8db95a76c3fe44cc9b3c86a52fcb979b33f89588abaa8c4acc91efe94de9d5ba26d12d4cee0c4abae47a680a493f7bcacd0f68a11b28f8d9c927b3b6 SHA512 2f69e14296cd8c95a5abbd9fe24288fe2e763de32e8b710294c9ee27fdb03e23922cacf7fa3f3026e4bd128255aa408454af6702d249396294c1c9399f8284e2
-EBUILD mediainfo-22.03.ebuild 1683 BLAKE2B e71352f48a9d441a21352f91383b95702a30465c7f60cca4a63da25ad1cd0026667a0b30631df3a2cf03d33d15d79bd6cad012c62c4f3f1c325c5bd4e9f92c5b SHA512 6d125744ba358b3bbf4c6f373b71709bab5c7c815a48baee7bd659cd2a76190c4513ae1f750e105deec31bc0bbe515fbf2124e9cd58a9daad4dd76d1048950ca
+EBUILD mediainfo-22.03.ebuild 1690 BLAKE2B 9308f2bf9649ff4aa6d8a66c57580a02740faac2243cf90764a5e102c912fda42350ea09932ca3e1a906a7a2b4d98d3dd92b451761958f67c2467bfde74550c6 SHA512 5c97ba08084337d33547ffe5d86c0aba709d33f875e0aabaed7a277dd3f8bd977324065c32f6b5d5a65a2c4de549b8192363d06bdf5a3660d6fbe57d2c3fea03
 MISC metadata.xml 344 BLAKE2B c70240ab3644a4c1d2367d1eb094a01b60198549456dfae21604c03bb30298f0abde2afda7dfdcf16425ca90856e98f57869481b85358e1724595454c8fdb308 SHA512 cdf31d4cd6185e0fdf604b611ee54b0bb90ffd369119cfd0bcc759e1e3d63a0d5ce673f508d3963b06c0c6152cdc1ef7d369ad2e84327ebd91c1e4a196e75d2e
diff --git a/media-video/mediainfo/mediainfo-22.03.ebuild b/media-video/mediainfo/mediainfo-22.03.ebuild
index c2e67b8d3dde..c14b99437c34 100644
--- a/media-video/mediainfo/mediainfo-22.03.ebuild
+++ b/media-video/mediainfo/mediainfo-22.03.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/MediaInfo"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="~media-libs/libmediainfo-${PV}[curl=,mms=]
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index dbc9ac1202e1..c009eb7ea75b 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index eb8604da6a6f..f5ee81bc6a1d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Jul 2022 00:39:31 +0000
+Sat, 30 Jul 2022 06:39:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index bbf87757f93a..c1ec7fb075a5 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-30T00:39:35Z
+TIMESTAMP 2022-07-30T06:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkfcdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLk0jFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCkqQ//UYtZTTbEKYuhFds4IjlbnxYKszsWPfnLEJ8dCOIBixbcj+7qoryH4JMU
-ZZ9JMexnkiGZMDaQEqPmEPcggHGFmG+opvUkXhVxudOqc8/UHcpdTB7Hl/ka09JL
-qm7/mW6FBQAPY08RehN8B2tSZPWlQ1K4thaOSvLgWW4lHvVMPzM4sWNz38c5jOOv
-0EH3VDWqpHQ+r4RtQHgOhdsZmvR9NAOYjtACr4GB1VpNzeHj69/OInIlkJzAoANt
-qrCCbq6Oe0Nuq/r+G65ODuX2GHYSLQXjuTSiYLlZCIQx972qCf7K1IOxTgb0peIP
-KAla7w2AYK2fTwOyXbtCuMn2HzzaA8MaxCv2EWyVuGpkBtr7erkEFlUJ9ihvuiTc
-IRt0NnfZ+7Gmu/kmXu0Y+7GVCac8ReNZvqjgQqf7g1QQFhwaD6lmRXN9h7Su1OIC
-R03Qn8aZP0XHIQEVWFN89CLky7qE2crnWchO5/aUeBh0Lr3/cQs/uOUM4ZrOHxte
-zCkh142SvxBp5jk59Xh5LG8JUzDhbBkRZ0b4Lk3VAe3rvOaJ3CKaFPn9o0w8q37P
-huCziYYjC7gFc12LUaD4J4s52SPs4R8WWeyS/oY1EkoLr1XaI+l9H/ZK8urUsfkQ
-O8BKvr1FeRRsoH9+F0Z8j6xUAM75HrelXEx8lgpLOyqEWcItFIw=
-=y/e9
+klBayhAAg0LthS7iykKSCoKQbTLaExgvWlieesyOSNklUPiwLjNuhT+wqiLsyV0g
+jO16iAnOfb63HN4CJFRppItlT6MiClQtM9VUBeghKcWHpfDHPq0GkGUpVfaqGGfQ
+egY6G/8e9cExCTHVM7fv430EaTIvtyUa6X1vGXGeEn9udzA+RRcOZaNsSUWgiylL
+GXE6k3lhoqT9tizxFFakhNpBZKMfzIIY2y7xA7fGDVo4Vfq4v81/PZlbjvss/3wA
+Gf2KE2WZnpovVNjW+HXSyCYZ/8ysy2LgEln4ThzLM+crm+q942uf+xiUfi7KMzqv
++hMJXTqQ/X1YR61nm4Ygl44YKXM+6m6LlRi4JpSPcBXo7gI4Jk6XPzGcIxLAxUHk
+qs0NvMYGXWvMjtqlpwRn1qvDaFVOhL3xBElNkbGQd8w5TXEY25AVtm+U0tr5WDtp
+dHjcmj8mzb1f9aLEbQXAu1BzqS13WQTsSbD1XZQyhDar6OvD4VCvQnKxalSnQzFr
+ypYC85PrI+bRTPyMbkBAs/mPZXeX6I7Z99tH38B8ejtK7+uim03GEhHsgbB4q4M6
+2ZM4BXsFio93n1PjOZ4pWkioLyBBvpt2tzNsRv7sH7+C+ijgj8T7aNP4VKCyhV8d
+Nvwa4r/f/ZFK0PlGDHJm+F12Fu+DOYpZQB7Ze3UawSOmR9HX3vw=
+=+hOz
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index eb8604da6a6f..f5ee81bc6a1d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Jul 2022 00:39:31 +0000
+Sat, 30 Jul 2022 06:39:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7f68da250a06..ef681a43c0ac 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e7ace9ee4116..b17b9c90062f 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730
new file mode 100644
index 000000000000..bf569d7440a7
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
+INHERIT=elisp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=MIT GPL-2+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20220730.tar.xz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=3e167a65fe8749819670aca149e37033
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index ab9031284cdf..2ca29602bbce 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0
deleted file mode 100644
index 342576098954..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] )
-DESCRIPTION=Completion input method for IBus
-EAPI=8
-HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
-INHERIT=gnome2-utils python-single-r1 xdg
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) >=dev-db/m17n-db-1.7
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.16.0/ibus-typing-booster-2.16.0.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3e9bba7901abc599de829d0d0b3dc9c2
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.7 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.7
index 5c65edeaf369..507854644135 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.7
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
 INHERIT=gnome2-utils python-single-r1 xdg
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) >=dev-db/m17n-db-1.7
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.16.7/ibus-typing-booster-2.16.7.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=00e7e2ac0d8312474428fb542606f864
+_md5_=3e9bba7901abc599de829d0d0b3dc9c2
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.18.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.18.6
index cc79bc4dc5be..6a49187fdead 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.18.0
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.18.6
@@ -12,6 +12,6 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.18.0/ibus-typing-booster-2.18.0.tar.gz
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.18.6/ibus-typing-booster-2.18.6.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=00e7e2ac0d8312474428fb542606f864
diff --git a/metadata/md5-cache/app-i18n/man-pages-l10n-4.14.0 b/metadata/md5-cache/app-i18n/man-pages-l10n-4.14.0-r1
index 456c32eb10ce..59956e6d2ae6 100644
--- a/metadata/md5-cache/app-i18n/man-pages-l10n-4.14.0
+++ b/metadata/md5-cache/app-i18n/man-pages-l10n-4.14.0-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/man l10n_de? ( !app-i18n/man-pages-de ) l10n_fr? ( !app-i18n/man
 REQUIRED_USE=|| ( l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi )
 SLOT=0
 SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/4.14.0/manpages-l10n-4.14.0.tar.bz2
-_md5_=319a9bff50507d36c00ddbf84ec77b1f
+_md5_=147c6b759a9133505341caa02144de80
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 2c03c1e298c8..0a8242006827 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-24 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-24
new file mode 100644
index 000000000000..ad80ee8e2401
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-24
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Handy scripts for ebuild development and more
+EAPI=8
+HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-portage/gentoolkit dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
+SLOT=0
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v24.tar.gz -> mgorny-dev-scripts-24.tar.gz
+_md5_=b0e72ae6229ed2fc7c229891080a8e70
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 820491295bc3..b7087f50de8f 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/pandoc-2.18 b/metadata/md5-cache/app-text/pandoc-2.18-r2
index 3e450a952bf1..a5d443f440ac 100644
--- a/metadata/md5-cache/app-text/pandoc-2.18
+++ b/metadata/md5-cache/app-text/pandoc-2.18-r2
@@ -1,17 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?] >=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?] >=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?] >=dev-haskell/connection-0.3.1:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?] >=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?] >=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?] >=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?] >=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?] >=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?] >=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?] >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?] >=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] >=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?] >=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?] >=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?] >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?] >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.10.1:= lua? ( >=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.2:=[profile?] >=dev-haskell/hslua-aeson-2.1:=[profile?] <dev-haskell/hslua-aeson-2.3:=[profile?] ) !lua? ( >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] >=dev-haskell/wai-extra-3.0.24:=[profile?] ) >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5 >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5 >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?] >=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?] >=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?] >=dev-haskell/connection-0.3.1:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?] >=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?] >=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?] >=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?] >=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?] >=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?] >=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?] >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?] >=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] >=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?] >=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?] >=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?] >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?] >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] >=dev-haskell/wai-extra-3.0.24:=[profile?] ) >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5 >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5 >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Conversion between markup formats
 EAPI=8
 HOMEPAGE=https://pandoc.org
-INHERIT=haskell-cabal lua-single
-IUSE=embed-data-files lua trypandoc doc hscolour profile test +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~ppc64 ~x86
+INHERIT=haskell-cabal
+IUSE=embed-data-files trypandoc doc hscolour profile test
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?] >=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?] >=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?] >=dev-haskell/connection-0.3.1:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?] >=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?] >=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?] >=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?] >=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?] >=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?] >=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?] >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?] >=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] >=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?] >=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?] >=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?] >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?] >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.10.1:= lua? ( >=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.2:=[profile?] >=dev-haskell/hslua-aeson-2.1:=[profile?] <dev-haskell/hslua-aeson-2.3:=[profile?] ) !lua? ( >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] >=dev-haskell/wai-extra-3.0.24:=[profile?] )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?] >=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?] >=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?] >=dev-haskell/connection-0.3.1:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?] >=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?] >=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?] >=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?] >=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?] >=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?] >=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?] >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?] >=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] >=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?] >=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?] >=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?] >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?] >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] >=dev-haskell/wai-extra-3.0.24:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/2.18
 SRC_URI=https://hackage.haskell.org/package/pandoc-2.18/pandoc-2.18.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aaa1164972e15724a251f3295fcfa8a1
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b7cf0a4e77e8e69975ebefba3543b2c5
diff --git a/metadata/md5-cache/app-text/poppler-22.06.0 b/metadata/md5-cache/app-text/poppler-22.06.0
index a3c2cc1df89d..7a24fa85fc22 100644
--- a/metadata/md5-cache/app-text/poppler-22.06.0
+++ b/metadata/md5-cache/app-text/poppler-22.06.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
 INHERIT=cmake toolchain-funcs xdg-utils verify-sig
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils verify-sig
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/122
 SRC_URI=https://poppler.freedesktop.org/poppler-22.06.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-22.06.0.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8555a04d09bfa4fae196c4b4289a9aaa
+_md5_=76e0c74571b2d70b9e1bc3b16af4a301
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index e19aa24568fe..a96df4c53732 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r8 b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r8
new file mode 100644
index 000000000000..d98867e24e28
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r8
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( >=app-doc/doxygen-1.4.2 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=High-performance, full-featured text search engine based off of lucene in C++
+EAPI=7
+HOMEPAGE=http://clucene.sourceforge.net/
+INHERIT=cmake
+IUSE=debug doc static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( Apache-2.0 LGPL-2.1 )
+RESTRICT=test
+SLOT=1
+SRC_URI=mirror://sourceforge/clucene/clucene-core-2.3.3.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1aef8bdc7ac2cbc6ec2232f913f80fda
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index a9029ed42084..8c2e3a0e1507 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/abstract-deque-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
index 066f3f8978e7..449d9d8cfc28 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
 INHERIT=haskell-cabal
 IUSE=usecas doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/abstract-deque-0.3/abstract-deque-0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=83df5b2508b46c057e3e10d52b954362
+_md5_=45e61c49c87e827b8db4a62574f5f57d
diff --git a/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
index 64e13044740f..03f592b28d91 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/abstract-deque-tests-0.3/abstract-deque-tests-0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=31a2ca0eeb42e954085e5b0005f98476
+_md5_=3da1667bbce45b2bcdaa627e1e3918f4
diff --git a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1 b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
index 3cfc1507ba90..4284a9f79490 100644
--- a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/simonmar/monad-par
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/abstract-par-0.3.3/abstract-par-0.3.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=65daf1de9f320e79c539e13876da75cd
+_md5_=e937ead49cb9d47839d1874be5e0b070
diff --git a/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.13 b/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.13
new file mode 100644
index 000000000000..aebf28e41234
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.13
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-2.0.3:=[profile?] dev-haskell/edit-distance-vector:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 <dev-haskell/cabal-4 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.18.2 dev-haskell/glob dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extract and apply patches to JSON documents
+EAPI=8
+HOMEPAGE=https://github.com/ysangkok/aeson-diff
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-2.0.3:=[profile?] dev-haskell/edit-distance-vector:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=test !test? ( test )
+SLOT=0/1.1.0.13
+SRC_URI=https://hackage.haskell.org/package/aeson-diff-1.1.0.13/aeson-diff-1.1.0.13.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b7defbc9899b806326a691489f6de783
diff --git a/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.9 b/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.9
deleted file mode 100644
index 9d4132760640..000000000000
--- a/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/edit-distance-vector:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/doctest-0.9 dev-haskell/glob dev-haskell/quickcheck dev-haskell/quickcheck-instances ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Extract and apply patches to JSON documents
-EAPI=7
-HOMEPAGE=https://github.com/thsutton/aeson-diff
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/edit-distance-vector:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=test
-SLOT=0/1.1.0.9
-SRC_URI=https://hackage.haskell.org/package/aeson-diff-1.1.0.9/aeson-diff-1.1.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a3ed5410e9bd1683aea06d4fb72b2680
diff --git a/metadata/md5-cache/dev-haskell/alex-3.2.7.1 b/metadata/md5-cache/dev-haskell/alex-3.2.7.1
index 7f0c8c9fffdf..936f72f2c2c5 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.2.7.1
+++ b/metadata/md5-cache/dev-haskell/alex-3.2.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.haskell.org/alex/
 INHERIT=autotools haskell-cabal
 IUSE=doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/alex-3.2.7.1/alex-3.2.7.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ccfda52a3adca92ab425bd0f74b31903
+_md5_=237719316104d2bf540d4a18f5d459c3
diff --git a/metadata/md5-cache/dev-haskell/async-2.2.2 b/metadata/md5-cache/dev-haskell/async-2.2.2
deleted file mode 100644
index 3a68dafd87b6..000000000000
--- a/metadata/md5-cache/dev-haskell/async-2.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Run IO operations asynchronously and wait for their results
-EAPI=7
-HOMEPAGE=https://github.com/simonmar/async
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.2.2
-SRC_URI=https://hackage.haskell.org/package/async-2.2.2/async-2.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a479d77f1c3ade7508261bc033db9b12
diff --git a/metadata/md5-cache/dev-haskell/atomic-primops-0.8.4 b/metadata/md5-cache/dev-haskell/atomic-primops-0.8.4
index 715c465e16e3..d8d190867f34 100644
--- a/metadata/md5-cache/dev-haskell/atomic-primops-0.8.4
+++ b/metadata/md5-cache/dev-haskell/atomic-primops-0.8.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
 INHERIT=haskell-cabal
 IUSE=debug doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.8.4
 SRC_URI=https://hackage.haskell.org/package/atomic-primops-0.8.4/atomic-primops-0.8.4.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4acde318ca43c5ef70bb47b78d0048a
+_md5_=78be065a5eda01e19741d0b46eac865e
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3 b/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
deleted file mode 100644
index 2e569bcc9920..000000000000
--- a/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Fast combinator parsing for bytestrings and text
-EAPI=7
-HOMEPAGE=https://github.com/bos/attoparsec
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/0.13.2.3
-SRC_URI=https://hackage.haskell.org/package/attoparsec-0.13.2.3/attoparsec-0.13.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7b2040f3327975a84647395550f8d0f8
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1 b/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
deleted file mode 100644
index 9e256c406742..000000000000
--- a/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.13.0.1:=[profile?] >=dev-haskell/base-compat-0.9.1:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Parsing of ISO 8601 dates, originally from aeson
-EAPI=7
-HOMEPAGE=https://github.com/bos/aeson
-INHERIT=haskell-cabal
-IUSE=developer fast doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.13.0.1:=[profile?] >=dev-haskell/base-compat-0.9.1:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/1.0.1.0
-SRC_URI=https://hackage.haskell.org/package/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601-1.0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cbf1eb9c75f5bea8759fe1f80832118a
diff --git a/metadata/md5-cache/dev-haskell/aws-0.22-r4 b/metadata/md5-cache/dev-haskell/aws-0.22-r4
deleted file mode 100644
index 67a7856fd009..000000000000
--- a/metadata/md5-cache/dev-haskell/aws-0.22-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/errors-2.0:=[profile?] ) >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Amazon Web Services (AWS) for Haskell
-EAPI=8
-HOMEPAGE=https://github.com/aristidb/aws
-INHERIT=haskell-cabal
-IUSE=examples doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/errors-2.0:=[profile?] ) >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
-RESTRICT=test
-SLOT=0/0.22
-SRC_URI=https://hackage.haskell.org/package/aws-0.22/aws-0.22.tar.gz https://hackage.haskell.org/package/aws-0.22/revision/3.cabal -> aws-0.22-r4.cabal
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=140fba918fb14ead2f1a508392e02db0
diff --git a/metadata/md5-cache/dev-haskell/aws-0.22-r5 b/metadata/md5-cache/dev-haskell/aws-0.22-r5
new file mode 100644
index 000000000000..d53ecd452bfb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/aws-0.22-r5
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-2.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?] >=dev-lang/ghc-8.10.1:= examples? ( >=dev-haskell/errors-2.0:=[profile?] ) >=dev-haskell/cabal-3.2.0.0 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Amazon Web Services (AWS) for Haskell
+EAPI=8
+HOMEPAGE=https://github.com/aristidb/aws
+INHERIT=haskell-cabal
+IUSE=examples doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-2.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?] >=dev-lang/ghc-8.10.1:= examples? ( >=dev-haskell/errors-2.0:=[profile?] )
+RESTRICT=test
+SLOT=0/0.22
+SRC_URI=https://hackage.haskell.org/package/aws-0.22/aws-0.22.tar.gz https://hackage.haskell.org/package/aws-0.22/revision/3.cabal -> aws-0.22-rev3.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fd11f6fb6b6d98e1d65adab6888e334e
diff --git a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1 b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
deleted file mode 100644
index 3b4a956a2684..000000000000
--- a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-haskell/base-compat-0.11.1:=[profile?] >=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=base-compat with extra batteries
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/base-compat-batteries
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=~dev-haskell/base-compat-0.11.1:=[profile?] >=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.11.1
-SRC_URI=https://hackage.haskell.org/package/base-compat-batteries-0.11.1/base-compat-batteries-0.11.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ccf08d266b226a39f37bd2528cdc620c
diff --git a/metadata/md5-cache/dev-haskell/base-prelude-1.3 b/metadata/md5-cache/dev-haskell/base-prelude-1.3
index d56afae432d9..9637cf03bb78 100644
--- a/metadata/md5-cache/dev-haskell/base-prelude-1.3
+++ b/metadata/md5-cache/dev-haskell/base-prelude-1.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/nikita-volkov/base-prelude
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.6.1:=
 SLOT=0/1.3
 SRC_URI=https://hackage.haskell.org/package/base-prelude-1.3/base-prelude-1.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1845d725e7fba56f82aae96289243d73
+_md5_=f1101ba3cd5c12e4050fe8c8f65eb2ef
diff --git a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1 b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
index 5cf0da79864d..ad3b73429de2 100644
--- a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
+++ b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/bencode
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.6.1.1
 SRC_URI=https://hackage.haskell.org/package/bencode-0.6.1.1/bencode-0.6.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=82186cf79d64aeb3c3e1a402c52391fb
+_md5_=ea508288ccf9ff52e719a86bd009411b
diff --git a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1 b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
deleted file mode 100644
index 0683646bae93..000000000000
--- a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7 >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Orphan instances for binary
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/binary-orphans
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0.1
-SRC_URI=https://hackage.haskell.org/package/binary-orphans-1.0.1/binary-orphans-1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7e4c26653aad86d38f35ec165b7b37f8
diff --git a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.2 b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.2
new file mode 100644
index 000000000000..d07df383555c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.2
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compatibility package for binary; provides instances
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/binary-orphans
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=test
+SLOT=0/1.0.2
+SRC_URI=https://hackage.haskell.org/package/binary-orphans-1.0.2/binary-orphans-1.0.2.tar.gz https://hackage.haskell.org/package/binary-orphans-1.0.2/revision/1.cabal -> binary-orphans-1.0.2.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bed1c797eaeb022a3151037409cd8a50
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0 b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
deleted file mode 100644
index 60e287a095f2..000000000000
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 dev-haskell/utf8-string ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Efficient buffered output
-EAPI=8
-HOMEPAGE=https://github.com/lpsmith/blaze-builder
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.4.1.0
-SRC_URI=https://hackage.haskell.org/package/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ae7488b1378f909abd3cdecaccd7b8c0
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2 b/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
deleted file mode 100644
index e4ab008886cf..000000000000
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A blazingly fast HTML combinator library for Haskell
-EAPI=7
-HOMEPAGE=https://jaspervdj.be/blaze/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.9.1.2
-SRC_URI=https://hackage.haskell.org/package/blaze-html-0.9.1.2/blaze-html-0.9.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d1f9346f9ee6b361db44ed2bf2e5d8fd
diff --git a/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0 b/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
index 6025bee4188a..2d614c7cdbe1 100644
--- a/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
+++ b/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/bloomfilter
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.1.0
 SRC_URI=https://hackage.haskell.org/package/bloomfilter-2.0.1.0/bloomfilter-2.0.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0de5adcafd0fe21e1ec6f3ae24435da4
+_md5_=86fe48ea37eb063465ddaaedc685dc57
diff --git a/metadata/md5-cache/dev-haskell/byteable-0.1.1 b/metadata/md5-cache/dev-haskell/byteable-0.1.1
index e8b8542049c1..76181a36cd91 100644
--- a/metadata/md5-cache/dev-haskell/byteable-0.1.1
+++ b/metadata/md5-cache/dev-haskell/byteable-0.1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-byteable
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/byteable-0.1.1/byteable-0.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=20c5a39a81ce10325c5ac40b98e4e5ee
+_md5_=47bd363d955ed2e14ecd57ce959a5ca3
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0 b/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0
deleted file mode 100644
index 02ed1053a96a..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:= >=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.3:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:= >=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= ) >=dev-haskell/cabal-1.22.2.0
-DESCRIPTION=The command-line interface for Cabal and Hackage
-EAPI=7
-HOMEPAGE=https://www.haskell.org/cabal/
-INHERIT=haskell-cabal ghc-package
-IUSE=+native-dns
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:= >=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.3:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:= >=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/cabal-install-3.2.0.0/cabal-install-3.2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9218bccc7beea83bb361fc1bc5e0248b
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0-r2 b/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0-r2
deleted file mode 100644
index 08662d41702e..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= >=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.3:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:= >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= ) >=dev-haskell/cabal-1.22.2.0
-DESCRIPTION=The command-line interface for Cabal and Hackage
-EAPI=8
-HOMEPAGE=https://www.haskell.org/cabal/
-INHERIT=haskell-cabal
-IUSE=+native-dns
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= >=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.3:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:= >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/cabal-install-3.2.0.0/cabal-install-3.2.0.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5dbdb0bb9339b824ca23c663ae506916
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r1 b/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r1
deleted file mode 100644
index d291376e313d..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:= >=dev-haskell/cabal-3.4.1:= <dev-haskell/cabal-3.4.2:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1.2:= <dev-haskell/random-1.3:= >=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:= >=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-8.4.3:= lukko? ( >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= ) native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= ) >=dev-haskell/cabal-2.2.0.1
-DESCRIPTION=The command-line interface for Cabal and Hackage
-EAPI=8
-HOMEPAGE=https://www.haskell.org/cabal/
-INHERIT=haskell-cabal ghc-package
-IUSE=debug +lukko +native-dns
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:= >=dev-haskell/cabal-3.4.1:= <dev-haskell/cabal-3.4.2:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1.2:= <dev-haskell/random-1.3:= >=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:= >=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-8.4.3:= lukko? ( >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= ) native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/cabal-install-3.4.1.0/cabal-install-3.4.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=75c8b9682b8b4a4c7eea58d6e5a192ed
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r2 b/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r2
index 5e9fefa22430..65369bde4de5 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r2
+++ b/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r2
@@ -4,12 +4,12 @@ DEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-b
 DESCRIPTION=The command-line interface for Cabal and Hackage
 EAPI=8
 HOMEPAGE=https://www.haskell.org/cabal/
-INHERIT=haskell-cabal
+INHERIT=haskell-cabal ghc-package
 IUSE=debug +lukko +native-dns
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:= >=dev-haskell/cabal-3.4.1:= <dev-haskell/cabal-3.4.2:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1.2:= <dev-haskell/random-1.3:= >=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:= >=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-8.4.3:= lukko? ( >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= ) native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/cabal-install-3.4.1.0/cabal-install-3.4.1.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f66e6fa0339ccd8afc9b8d79501bb3c
+_md5_=8912e93e36ae93827af84fbf3e2b2d8a
diff --git a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0 b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0
deleted file mode 100644
index 60d976f6fa93..000000000000
--- a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A CSV parsing and encoding library
-EAPI=7
-HOMEPAGE=https://github.com/hvr/cassava
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.5.2.0
-SRC_URI=https://hackage.haskell.org/package/cassava-0.5.2.0/cassava-0.5.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=29c0a4aaf1f3f01b2edc58955e2c52fc
diff --git a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0-r1 b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0-r1
new file mode 100644
index 000000000000..38b458b55c6c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15 >=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A CSV parsing and encoding library
+EAPI=8
+HOMEPAGE=https://github.com/hvr/cassava
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/0.5.2.0
+SRC_URI=https://hackage.haskell.org/package/cassava-0.5.2.0/cassava-0.5.2.0.tar.gz https://hackage.haskell.org/package/cassava-0.5.2.0/revision/7.cabal -> cassava-0.5.2.0-rev7.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4e0bcb87b8277b3ab1cca2d6a5f19008
diff --git a/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5 b/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
index 9ba206d67dcf..e3865659cfb2 100644
--- a/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
+++ b/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
 INHERIT=haskell-cabal
 IUSE=debug doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?] >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.5
 SRC_URI=https://hackage.haskell.org/package/chaselev-deque-0.5.0.5/chaselev-deque-0.5.0.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5f3d438498b269bb80c562c495d33151
+_md5_=ad8c539de6ae7f4bf8a9608f22aec119
diff --git a/metadata/md5-cache/dev-haskell/chell-0.4.0.2 b/metadata/md5-cache/dev-haskell/chell-0.4.0.2
index ce7708fdd3b6..c5a133f7d10e 100644
--- a/metadata/md5-cache/dev-haskell/chell-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/chell-0.4.0.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://john-millikin.com/software/chell/
 INHERIT=haskell-cabal
 IUSE=+color-output doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] >=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.8.2:= color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] )
 SLOT=0/0.4.0.2
 SRC_URI=https://hackage.haskell.org/package/chell-0.4.0.2/chell-0.4.0.2.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f30e6cca90c3e60b289f58ba1196613
+_md5_=3011f9b29165e9828c24f07a00f87feb
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11 b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
index d699f495c4c8..2261de4934f1 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
+++ b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cipher-aes
 INHERIT=haskell-cabal
 IUSE=cpu_flags_x86_aes cpu_flags_x86_ssse3 doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.11
 SRC_URI=https://hackage.haskell.org/package/cipher-aes-0.2.11/cipher-aes-0.2.11.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=564ec9f2ce2c909ba9c7ad230ec4c30f
+_md5_=c5b8100f90d36123faea866bb354c41b
diff --git a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2 b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
index b89625219206..56d13a2d2f7e 100644
--- a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
+++ b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/yesodweb/clientsession/tree/master
 INHERIT=haskell-cabal
 IUSE=test doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.1.2
 SRC_URI=https://hackage.haskell.org/package/clientsession-0.9.1.2/clientsession-0.9.1.2.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9a746da857287cff377500e83ca1bab5
+_md5_=2b08fefb05df54476afc1d57bfcad5c7
diff --git a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0 b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
index 62fc46fd2d76..80690372e33f 100644
--- a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
+++ b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/1.3.0
 SRC_URI=https://hackage.haskell.org/package/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e329e1862df2e8794f1b20ae633b8407
+_md5_=bfc505a3ce5a52c9252388416a506231
diff --git a/metadata/md5-cache/dev-haskell/constraints-0.11.2 b/metadata/md5-cache/dev-haskell/constraints-0.11.2
deleted file mode 100644
index ababad2b1530..000000000000
--- a/metadata/md5-cache/dev-haskell/constraints-0.11.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Constraint manipulation
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/constraints/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.11.2
-SRC_URI=https://hackage.haskell.org/package/constraints-0.11.2/constraints-0.11.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9bd6e36f705aa9b1750fa3d1c769977d
diff --git a/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2 b/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
index c090acc7db27..c1b2b81bc9ea 100644
--- a/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
+++ b/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/nikita-volkov/contravariant-extras
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/template-haskell-compat-v0208-0.1.4:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/0.3.5.2
 SRC_URI=https://hackage.haskell.org/package/contravariant-extras-0.3.5.2/contravariant-extras-0.3.5.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0e2c783a85b58e03c065e5bcb17687c7
+_md5_=fe04c0a616d1f24fc992fd3c0e91cd55
diff --git a/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1 b/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
index 62f1db8628d6..4ae5d88c1097 100644
--- a/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
+++ b/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cprng-aes
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.1
 SRC_URI=https://hackage.haskell.org/package/cprng-aes-0.6.1/cprng-aes-0.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=50a3104f6267bc58beefd0c7e532d31a
+_md5_=db26229ae68b745999228dac51e26ff2
diff --git a/metadata/md5-cache/dev-haskell/criterion-1.5.11.0 b/metadata/md5-cache/dev-haskell/criterion-1.5.11.0
new file mode 100644
index 000000000000..f3c11128bf97
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/criterion-1.5.11.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?] >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?] >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/js-chart-2.9.4:=[profile?] <dev-haskell/js-chart-3:=[profile?] >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.6.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-8.4.3:= embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/base-compat dev-haskell/hunit >=dev-haskell/quickcheck-2.4 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Robust, reliable performance measurement and analysis
+EAPI=8
+HOMEPAGE=https://www.serpentine.com/criterion
+INHERIT=haskell-cabal
+IUSE=embed-data-files doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?] >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?] >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/js-chart-2.9.4:=[profile?] <dev-haskell/js-chart-3:=[profile?] >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.6.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-8.4.3:= embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.5.11.0
+SRC_URI=https://hackage.haskell.org/package/criterion-1.5.11.0/criterion-1.5.11.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fea06370aa50ab477d78c2ed3947d0f7
diff --git a/metadata/md5-cache/dev-haskell/criterion-1.5.6.2 b/metadata/md5-cache/dev-haskell/criterion-1.5.6.2
deleted file mode 100644
index 888af03435c1..000000000000
--- a/metadata/md5-cache/dev-haskell/criterion-1.5.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?] >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] dev-haskell/js-flot:=[profile?] dev-haskell/js-jquery:=[profile?] >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.6.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base-compat dev-haskell/hunit >=dev-haskell/quickcheck-2.4 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Robust, reliable performance measurement and analysis
-EAPI=7
-HOMEPAGE=http://www.serpentine.com/criterion
-INHERIT=haskell-cabal
-IUSE=embed-data-files doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?] >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] dev-haskell/js-flot:=[profile?] dev-haskell/js-jquery:=[profile?] >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.6.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.5.6.2
-SRC_URI=https://hackage.haskell.org/package/criterion-1.5.6.2/criterion-1.5.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0b84dc875c6d28be7928a9f93121079f
diff --git a/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0 b/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
index b50201002e53..e73d255f8292 100644
--- a/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/criterion
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/criterion-measurement-0.1.2.0/criterion-measurement-0.1.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c5447d778c9e94e8863b7c8ac8029329
+_md5_=dc7515f34fd809f58cace3b0aa8c02b8
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-0.13.3 b/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
index fe6a25913ba8..97986d78bd8a 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
+++ b/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/TomMD/crypto-api
 INHERIT=haskell-cabal
 IUSE=all-cpolys doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.13.3
 SRC_URI=https://hackage.haskell.org/package/crypto-api-0.13.3/crypto-api-0.13.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=222dce1fb4da5874123833a5dba5b6a4
+_md5_=b9e0e1e73ff040c287113606cedf211e
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1 b/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
index 5b935d0f5d7f..8f469893787a 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://trac.haskell.org/crypto-api/wiki
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/test-framework-0.4:=[profile?] >=dev-haskell/test-framework-hunit-0.2:=[profile?] >=dev-haskell/test-framework-quickcheck2-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/crypto-api-tests-0.3/crypto-api-tests-0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=29e8d101ac639374458bb93cf085867c
+_md5_=b2532c6b2fb4eff7cb4b05485336ed15
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1 b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
index 4c977c354d29..eaf0e92c7e22 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.11
 SRC_URI=https://hackage.haskell.org/package/crypto-cipher-tests-0.0.11/crypto-cipher-tests-0.0.11.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6d2e2b1e5bbdf9f7e9acd90e5b195496
+_md5_=f346340d7717fc89982168f15ae5f9a5
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
index cee84c58a377..23035f4f684f 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/crypto-cipher-types-0.0.9/crypto-cipher-types-0.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cfb20d4d08657619b69967d40e2a82ea
+_md5_=e3de29f326935c9005f0777f8810c3ed
diff --git a/metadata/md5-cache/dev-haskell/crypto-random-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
index b5140a6ae254..30428fbf2f4e 100644
--- a/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-random
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/securemem:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/crypto-random-0.0.9/crypto-random-0.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9fb4227cbc86899d4f4ef55d84a2ad09
+_md5_=3608fb90118897221402efd3a45d7c4e
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1 b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
index d1f7db7044ec..903a5f9f0df8 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hvr/cryptohash-md5
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.100.1
 SRC_URI=https://hackage.haskell.org/package/cryptohash-md5-0.11.100.1/cryptohash-md5-0.11.100.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=331183c0827294115335a3f6379fc7db
+_md5_=9ece33db9358eff1f1e9fb950a36bbae
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1 b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
index a8e32ffa557f..6245b7679336 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hvr/cryptohash-sha1
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.100.1
 SRC_URI=https://hackage.haskell.org/package/cryptohash-sha1-0.11.100.1/cryptohash-sha1-0.11.100.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=392289d390b159e8b4ec8ce59a9816b3
+_md5_=a684b7ec7e28acc0fecff964ce0b5861
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0 b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
index 0b0fbf529722..34927b5385cc 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hvr/cryptohash-sha256
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.101.0
 SRC_URI=https://hackage.haskell.org/package/cryptohash-sha256-0.11.101.0/cryptohash-sha256-0.11.101.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8fb380a5cea6c8dc4ceb161aa1995793
+_md5_=41f64cd65f695eebc95d892305b9709a
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2 b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
index 52e1cfd63cd5..20795ef20f8e 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
+++ b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-crypto/cryptonite-conduit
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=test !test? ( test )
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/cryptonite-conduit-0.2.2/cryptonite-conduit-0.2.2.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d894581a5e404a25e21df897d1d0344b
+_md5_=ada0713c2d2683d7bb36fa8f7cf77021
diff --git a/metadata/md5-cache/dev-haskell/css-text-0.1.3.0 b/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
index 1f5bd4127737..43c90de64d16 100644
--- a/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
+++ b/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/yesodweb/css-text.git#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test !test? ( test )
 SLOT=0/0.1.3.0
 SRC_URI=https://hackage.haskell.org/package/css-text-0.1.3.0/css-text-0.1.3.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=66a69bee64c4f336f5c38226a17c585a
+_md5_=bb4f099cfd73e134614aa5d7954983b2
diff --git a/metadata/md5-cache/dev-haskell/dav-1.3.4 b/metadata/md5-cache/dev-haskell/dav-1.3.4
index abeefc9ab1ba..48a1e02aea73 100644
--- a/metadata/md5-cache/dev-haskell/dav-1.3.4
+++ b/metadata/md5-cache/dev-haskell/dav-1.3.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://floss.scru.org/hDAV
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] dev-haskell/haskeline:=[profile?] >=dev-haskell/http-client-0.4:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/network-2.6.10:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.3.4
 SRC_URI=https://hackage.haskell.org/package/DAV-1.3.4/DAV-1.3.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fc7c609c0eeb480148085d0850dc0418
+_md5_=acd1574f1a9f88efbbc8c7033a1a11d6
diff --git a/metadata/md5-cache/dev-haskell/dbus-1.2.16 b/metadata/md5-cache/dev-haskell/dbus-1.2.16
deleted file mode 100644
index ae9bcb84e585..000000000000
--- a/metadata/md5-cache/dev-haskell/dbus-1.2.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] <dev-haskell/lens-4.20:=[profile?] >=dev-haskell/network-3.0.1.0:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] <dev-haskell/random-1.3:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( <dev-haskell/extra-1.8 <dev-haskell/quickcheck-2.15 <dev-haskell/resourcet-1.3 <dev-haskell/tasty-1.4 <dev-haskell/tasty-hunit-0.11 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A client library for the D-Bus IPC system
-EAPI=7
-HOMEPAGE=https://github.com/rblaze/haskell-dbus#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] <dev-haskell/lens-4.20:=[profile?] >=dev-haskell/network-3.0.1.0:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] <dev-haskell/random-1.3:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/1.2.16
-SRC_URI=https://hackage.haskell.org/package/dbus-1.2.16/dbus-1.2.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ee27d09451ebaf53600919e358d0644b
diff --git a/metadata/md5-cache/dev-haskell/dbus-1.2.22 b/metadata/md5-cache/dev-haskell/dbus-1.2.22
new file mode 100644
index 000000000000..8a9c95f8000f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/dbus-1.2.22
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] <dev-haskell/lens-5.2:=[profile?] >=dev-haskell/network-3.1.2.1:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/random-1.3:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( <dev-haskell/extra-1.8 <dev-haskell/quickcheck-2.15 <dev-haskell/resourcet-1.3 <dev-haskell/tasty-1.5 <dev-haskell/tasty-hunit-0.11 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A client library for the D-Bus IPC system
+EAPI=8
+HOMEPAGE=https://github.com/rblaze/haskell-dbus#readme
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] <dev-haskell/lens-5.2:=[profile?] >=dev-haskell/network-3.1.2.1:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/random-1.3:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-8.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.2.22
+SRC_URI=https://hackage.haskell.org/package/dbus-1.2.22/dbus-1.2.22.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8f280368882576de3165b364e8495f11
diff --git a/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0 b/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
index 57853cc70169..7800e3d9f273 100644
--- a/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/dense-linear-algebra
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/math-functions-0.1.7:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/dense-linear-algebra-0.1.0.0/dense-linear-algebra-0.1.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8b41fc5b6b7002a20aa108e6d20cf766
+_md5_=9ebb4b2c4588e92233950e925a28fd20
diff --git a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1 b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
index 033b73763d3d..3efca1c39d83 100644
--- a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/redneb/disk-free-space
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/disk-free-space-0.1.0.1/disk-free-space-0.1.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=33f69d00969c4ae0d1aaa9a423e44bda
+_md5_=c33ceb389713882821df0771c31da8d6
diff --git a/metadata/md5-cache/dev-haskell/dlist-0.8.0.7 b/metadata/md5-cache/dev-haskell/dlist-1.0
index 086c10615854..1c79ce16565a 100644
--- a/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
+++ b/metadata/md5-cache/dev-haskell/dlist-1.0
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.14 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.15 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Difference lists
 EAPI=7
 HOMEPAGE=https://github.com/spl/dlist
 INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
+IUSE=werror doc hscolour profile test
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
-SLOT=0/0.8.0.7
-SRC_URI=https://hackage.haskell.org/package/dlist-0.8.0.7/dlist-0.8.0.7.tar.gz
+SLOT=0/1.0
+SRC_URI=https://hackage.haskell.org/package/dlist-1.0/dlist-1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=80c1c13a28e11079c151a01c86dd2750
+_md5_=22cec0bfa577bf669d232a1b508c3faa
diff --git a/metadata/md5-cache/dev-haskell/echo-0.1.3 b/metadata/md5-cache/dev-haskell/echo-0.1.3
index c2202af41e8e..4b0b97af6634 100644
--- a/metadata/md5-cache/dev-haskell/echo-0.1.3
+++ b/metadata/md5-cache/dev-haskell/echo-0.1.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/RyanGlScott/echo
 INHERIT=haskell-cabal
 IUSE=examples doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/echo-0.1.3/echo-0.1.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5f3de70e10cf2d7af45ca4ccab9a215a
+_md5_=99eaeeafc447c58f174930c890c0c275
diff --git a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0 b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
index d5998f7778e7..2b266175bfc1 100644
--- a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
+++ b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://thoughtpolice.github.com/hs-ed25519
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.0.5.0
 SRC_URI=https://hackage.haskell.org/package/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cf6957bdce534fb9ad9466d1a9260eee
+_md5_=5b3b402e3cf5d2787d8ef7192fc9b097
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1 b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
index f6566c6f9d30..2ae1ad036ea2 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/phadej/edit-distance
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.2.1
 SRC_URI=https://hackage.haskell.org/package/edit-distance-0.2.2.1/edit-distance-0.2.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=baf4f6c21d67126314d4382869e0ac18
+_md5_=6c672d5a71452562a2c1fdcae5ec46e3
diff --git a/metadata/md5-cache/dev-haskell/either-5.0.1.1 b/metadata/md5-cache/dev-haskell/either-5.0.1.1-r1
index 45a76b511465..79d67838a42c 100644
--- a/metadata/md5-cache/dev-haskell/either-5.0.1.1
+++ b/metadata/md5-cache/dev-haskell/either-5.0.1.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 >=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An either monad transformer
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/either/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/5.0.1.1
 SRC_URI=https://hackage.haskell.org/package/either-5.0.1.1/either-5.0.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b25d5b1633354a35e9bd551bcb49a446
+_md5_=074bfa067fbc9cf01793f5612fdd1e56
diff --git a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.15 b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.15
index b96d867c4fad..95c24a7e8d64 100644
--- a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.15
+++ b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.15
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Porges/email-validate-hs
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.3.2.15
 SRC_URI=https://hackage.haskell.org/package/email-validate-2.3.2.15/email-validate-2.3.2.15.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8b1347ab852ddafaf65e9f2c499db4b7
+_md5_=4c3f9d03bbe1825e4b6c9ec6e284ec09
diff --git a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1 b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1
index 4c1282ba29f8..369063719ed6 100644
--- a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1
+++ b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/TomMD/entropy
 INHERIT=haskell-cabal
 IUSE=halvm doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.1:=
 SLOT=0/0.4.1.6
 SRC_URI=https://hackage.haskell.org/package/entropy-0.4.1.6/entropy-0.4.1.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=dbdbdd784b53774e6e3c0e031a09a711
+_md5_=6ae8e4df74827c2a722648c34ac09f05
diff --git a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0 b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
index 4b8f8e1fbc85..08579d7fb262 100644
--- a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+++ b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/errorcall-eq-instance
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/base-orphans:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/errorcall-eq-instance-0.3.0/errorcall-eq-instance-0.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=73a56340d455fb2e2478bc9e6a25eb0b
+_md5_=8e9bc35795e4b6434b7aff3b9a612130
diff --git a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1 b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
index c116ab83260f..bb08f0514be0 100644
--- a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
+++ b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://bitbucket.org/taejo/fdo-notify/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/fdo-notify-0.3.1/fdo-notify-0.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=aa211ae0736954ba604ef8f56643f0b1
+_md5_=6a9f016b5f6c782cfd56c05c937d57d1
diff --git a/metadata/md5-cache/dev-haskell/feed-1.3.2.1 b/metadata/md5-cache/dev-haskell/feed-1.3.2.1
index 1ace0af86de4..59f71c26cc3a 100644
--- a/metadata/md5-cache/dev-haskell/feed-1.3.2.1
+++ b/metadata/md5-cache/dev-haskell/feed-1.3.2.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-party/feed
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.13:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2.1
 SRC_URI=https://hackage.haskell.org/package/feed-1.3.2.1/feed-1.3.2.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1ee38fe39b95d19e871b4b7708daf6db
+_md5_=ac11e3dc41d8128c1c7285de46fc2b64
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.7.0.2 b/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
deleted file mode 100644
index b5253db32f11..000000000000
--- a/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Martin Erwig's Functional Graph Library
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/fgl
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/5.7.0.2
-SRC_URI=https://hackage.haskell.org/package/fgl-5.7.0.2/fgl-5.7.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b47a57593ac412e5e07f1fbd4b74c47
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.7.0.3 b/metadata/md5-cache/dev-haskell/fgl-5.7.0.3
new file mode 100644
index 000000000000..87f6e1c91632
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/fgl-5.7.0.3
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.1 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Martin Erwig's Functional Graph Library
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/fgl
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/5.7.0.3
+SRC_URI=https://hackage.haskell.org/package/fgl-5.7.0.3/fgl-5.7.0.3.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6305dd9de6875b29fb5eaa3e60d0871e
diff --git a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6 b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
deleted file mode 100644
index 56db57b0aded..000000000000
--- a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Library for manipulating RawFilePaths in a cross platform way
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/filepath-bytestring
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.4.2.1.6
-SRC_URI=https://hackage.haskell.org/package/filepath-bytestring-1.4.2.1.6/filepath-bytestring-1.4.2.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9709e4cbb08f917bc7fbc6da00d9c180
diff --git a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.9 b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.9
new file mode 100644
index 000000000000..1ea64253069c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.9
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library for manipulating RawFilePaths in a cross platform way
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/filepath-bytestring
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.4.2.1.9
+SRC_URI=https://hackage.haskell.org/package/filepath-bytestring-1.4.2.1.9/filepath-bytestring-1.4.2.1.9.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=59282358413588f0326803087a74b09c
diff --git a/metadata/md5-cache/dev-haskell/foldl-1.4.7 b/metadata/md5-cache/dev-haskell/foldl-1.4.7
deleted file mode 100644
index 0b040d60ae23..000000000000
--- a/metadata/md5-cache/dev-haskell/foldl-1.4.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.15:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.6:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1.20:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] <dev-haskell/vector-builder-0.4:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/doctest-0.16 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Composable, streaming, and efficient left folds
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/foldl
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.15:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.6:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1.20:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] <dev-haskell/vector-builder-0.4:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=test
-SLOT=0/1.4.7
-SRC_URI=https://hackage.haskell.org/package/foldl-1.4.7/foldl-1.4.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=970b3371361b142bde28f9be235af11b
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2 b/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
deleted file mode 100644
index 9a9a92b33397..000000000000
--- a/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/hspec dev-haskell/hspec-core ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Testing utilities for the validity library
-EAPI=7
-HOMEPAGE=https://github.com/NorfairKing/validity#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-8.2.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.10.0.2
-SRC_URI=https://hackage.haskell.org/package/genvalidity-0.10.0.2/genvalidity-0.10.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9f6acdd6727c4de71817bdcaacc43262
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-1.0.0.1 b/metadata/md5-cache/dev-haskell/genvalidity-1.0.0.1
new file mode 100644
index 000000000000..399e5e896706
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/genvalidity-1.0.0.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/quickcheck-2.13:2=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-haskell/validity-0.12:=[profile?] >=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-3.0.0.0 test? ( dev-haskell/hspec dev-haskell/hspec-core ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Testing utilities for the validity library
+EAPI=8
+HOMEPAGE=https://github.com/NorfairKing/validity#readme
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/quickcheck-2.13:2=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-haskell/validity-0.12:=[profile?] >=dev-lang/ghc-8.8.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.0.1
+SRC_URI=https://hackage.haskell.org/package/genvalidity-1.0.0.1/genvalidity-1.0.0.1.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ef3d12ddf1610fd57203d99908c9c80f
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4 b/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
deleted file mode 100644
index 74070f7b418d..000000000000
--- a/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/genvalidity-0.8:=[profile?] >=dev-haskell/genvalidity-property-0.5:=[profile?] dev-haskell/hspec:=[profile?] dev-haskell/hspec-core:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.5:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Standard spec's for GenValidity instances
-EAPI=7
-HOMEPAGE=https://github.com/NorfairKing/validity#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/genvalidity-0.8:=[profile?] >=dev-haskell/genvalidity-property-0.5:=[profile?] dev-haskell/hspec:=[profile?] dev-haskell/hspec-core:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.5:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.7.0.4
-SRC_URI=https://hackage.haskell.org/package/genvalidity-hspec-0.7.0.4/genvalidity-hspec-0.7.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8eec9242bc1f428f1e7b2e2ba039e215
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-hspec-1.0.0.0 b/metadata/md5-cache/dev-haskell/genvalidity-hspec-1.0.0.0
new file mode 100644
index 000000000000..4247f060560a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/genvalidity-hspec-1.0.0.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/genvalidity-1.0:=[profile?] >=dev-haskell/genvalidity-property-0.5:=[profile?] dev-haskell/hspec:=[profile?] >=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.5:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Standard spec's for GenValidity instances
+EAPI=8
+HOMEPAGE=https://github.com/NorfairKing/validity#readme
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/genvalidity-1.0:=[profile?] >=dev-haskell/genvalidity-property-0.5:=[profile?] dev-haskell/hspec:=[profile?] >=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.5:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.0.0
+SRC_URI=https://hackage.haskell.org/package/genvalidity-hspec-1.0.0.0/genvalidity-hspec-1.0.0.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=209702c57bd96c6eb0f2f83a6a3a8469
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1 b/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
deleted file mode 100644
index c6e11b9e9cae..000000000000
--- a/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/genvalidity-0.7:=[profile?] >=dev-haskell/hspec-2.1:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/doctest ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Standard properties for functions on 'Validity' types
-EAPI=7
-HOMEPAGE=https://github.com/NorfairKing/validity#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/genvalidity-0.7:=[profile?] >=dev-haskell/hspec-2.1:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.5.0.1
-SRC_URI=https://hackage.haskell.org/package/genvalidity-property-0.5.0.1/genvalidity-property-0.5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=97d5bd48c7fe2abf420109c7a7e5ca8a
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-property-1.0.0.0 b/metadata/md5-cache/dev-haskell/genvalidity-property-1.0.0.0
new file mode 100644
index 000000000000..d7e12e845f31
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/genvalidity-property-1.0.0.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/genvalidity-1.0:=[profile?] >=dev-haskell/hspec-2.1:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Standard properties for functions on 'Validity' types
+EAPI=8
+HOMEPAGE=https://github.com/NorfairKing/validity#readme
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/genvalidity-1.0:=[profile?] >=dev-haskell/hspec-2.1:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.0.0
+SRC_URI=https://hackage.haskell.org/package/genvalidity-property-1.0.0.0/genvalidity-property-1.0.0.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=175b1c59a4a9d2fe97f87bafee6f792a
diff --git a/metadata/md5-cache/dev-haskell/git-lfs-1.1.2 b/metadata/md5-cache/dev-haskell/git-lfs-1.2.0
index e811483e493d..77d94ce6b776 100644
--- a/metadata/md5-cache/dev-haskell/git-lfs-1.1.2
+++ b/metadata/md5-cache/dev-haskell/git-lfs-1.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/git-lfs
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-haskell/aeson-1.3:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-lang/ghc-8.4.3:=
-SLOT=0/1.1.2
-SRC_URI=https://hackage.haskell.org/package/git-lfs-1.1.2/git-lfs-1.1.2.tar.gz
+SLOT=0/1.2.0
+SRC_URI=https://hackage.haskell.org/package/git-lfs-1.2.0/git-lfs-1.2.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ecff52828fb8998fab68941cdd452b01
+_md5_=dc94f8991ad2ab87fa5022cbf32c35ea
diff --git a/metadata/md5-cache/dev-haskell/glob-0.10.1 b/metadata/md5-cache/dev-haskell/glob-0.10.1
deleted file mode 100644
index 153d84830a29..000000000000
--- a/metadata/md5-cache/dev-haskell/glob-0.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Globbing library
-EAPI=7
-HOMEPAGE=http://iki.fi/matti.niemenmaa/glob/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.10.1
-SRC_URI=https://hackage.haskell.org/package/Glob-0.10.1/Glob-0.10.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b3e6786cb0982650d0ed3de57950934e
diff --git a/metadata/md5-cache/dev-haskell/groups-0.5.3 b/metadata/md5-cache/dev-haskell/groups-0.5.3
index f69056d42a7f..427c0d098d8c 100644
--- a/metadata/md5-cache/dev-haskell/groups-0.5.3
+++ b/metadata/md5-cache/dev-haskell/groups-0.5.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/groups
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/0.5.3
 SRC_URI=https://hackage.haskell.org/package/groups-0.5.3/groups-0.5.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8c07f87fb13e2d535e0676157be22cf9
+_md5_=519147c38b2d907fcf306d91e8911aba
diff --git a/metadata/md5-cache/dev-haskell/hackage-security-0.6.1.0 b/metadata/md5-cache/dev-haskell/hackage-security-0.6.1.0
index be6974002626..5abfe0f33577 100644
--- a/metadata/md5-cache/dev-haskell/hackage-security-0.6.1.0
+++ b/metadata/md5-cache/dev-haskell/hackage-security-0.6.1.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/hackage-security
 INHERIT=haskell-cabal
 IUSE=+lukko doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?] >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.8:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.1.0
 SRC_URI=https://hackage.haskell.org/package/hackage-security-0.6.1.0/hackage-security-0.6.1.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8ab8935aeaf3fde3dcc2b12d99babdb6
+_md5_=94dc314a57cff7a2fc953eec3b705f1b
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.2.7.0 b/metadata/md5-cache/dev-haskell/hashable-1.2.7.0
deleted file mode 100644
index 373fa4b15c00..000000000000
--- a/metadata/md5-cache/dev-haskell/hashable-1.2.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:= hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A class for types that can be converted to a hash value
-EAPI=8
-HOMEPAGE=https://github.com/tibbe/hashable
-INHERIT=haskell-cabal
-IUSE=cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 examples +gmp doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/1.2.7.0
-SRC_URI=https://hackage.haskell.org/package/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4dfd2be32ce67bd851df405745000371
diff --git a/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1 b/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
deleted file mode 100644
index a91922321131..000000000000
--- a/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Hashable instances for Data.Time
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/hashable-time
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/0.2.0.2
-SRC_URI=https://hackage.haskell.org/package/hashable-time-0.2.0.2/hashable-time-0.2.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6d8e4c2d3912748364b14ac2c56c4173
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1 b/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
deleted file mode 100644
index 43d127f1dceb..000000000000
--- a/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16 >=dev-haskell/quickcheck-2.3.0.2 >=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3 >=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Mutable hash tables in the ST monad
-EAPI=7
-HOMEPAGE=https://github.com/gregorycollins/hashtables
-INHERIT=haskell-cabal
-IUSE=bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling portable +unsafe-tricks doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-RESTRICT=!test? ( test )
-SLOT=0/1.2.4.1
-SRC_URI=https://hackage.haskell.org/package/hashtables-1.2.4.1/hashtables-1.2.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=025fd7d4d94b2a6629ea53fbb2d4a233
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.3 b/metadata/md5-cache/dev-haskell/hashtables-1.3
new file mode 100644
index 000000000000..b42449ce42e9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.3
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hashable-1.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16 >=dev-haskell/quickcheck-2.3.0.2 >=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3 >=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Mutable hash tables in the ST monad
+EAPI=8
+HOMEPAGE=https://github.com/gregorycollins/hashtables
+INHERIT=haskell-cabal
+IUSE=bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.3
+SRC_URI=https://hackage.haskell.org/package/hashtables-1.3/hashtables-1.3.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=689e49aa5aefeadbc53c179a6802829b
diff --git a/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4 b/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
index 5f8ad8179f4d..6aff26875286 100644
--- a/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
+++ b/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/erikd/hjsmin
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=test
 SLOT=0/0.2.0.4
 SRC_URI=https://hackage.haskell.org/package/hjsmin-0.2.0.4/hjsmin-0.2.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e248adb12b4a25bbea519c6a08e6d112
+_md5_=020fd5979a7bdd6f18d99da3775f22a2
diff --git a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1 b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
deleted file mode 100644
index a70585027967..000000000000
--- a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( || ( ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.4 ) ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Versatile logging framework
-EAPI=7
-HOMEPAGE=https://github.com/hvr/hslogger/wiki
-INHERIT=haskell-cabal
-IUSE=+network-3 doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.3.1.0
-SRC_URI=https://hackage.haskell.org/package/hslogger-1.3.1.0/hslogger-1.3.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=27e6df689e006a22d3eb37bd9ff50088
diff --git a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r2 b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r2
new file mode 100644
index 000000000000..ed091a219916
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Versatile logging framework
+EAPI=7
+HOMEPAGE=https://github.com/hvr/hslogger/wiki
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+RESTRICT=!test? ( test )
+SLOT=0/1.3.1.0
+SRC_URI=https://hackage.haskell.org/package/hslogger-1.3.1.0/hslogger-1.3.1.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=36fb678de905b3f72a96971ff0d8dde2
diff --git a/metadata/md5-cache/dev-haskell/hslua-1.0.3.1 b/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
deleted file mode 100644
index c4f3da64a1c8..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A Lua language interpreter embedding in Haskell
-EAPI=8
-HOMEPAGE=https://hslua.github.io/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0.3.1
-SRC_URI=https://hackage.haskell.org/package/hslua-1.0.3.1/hslua-1.0.3.1.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e1927e5683729561203ecd28e4d4af76
diff --git a/metadata/md5-cache/dev-haskell/hslua-1.1.2 b/metadata/md5-cache/dev-haskell/hslua-1.1.2
deleted file mode 100644
index e8ffd382c3b0..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-1.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A Lua language interpreter embedding in Haskell
-EAPI=7
-HOMEPAGE=https://hslua.github.io/
-INHERIT=haskell-cabal
-IUSE=hardcode-reg-keys doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.1.2
-SRC_URI=https://hackage.haskell.org/package/hslua-1.1.2/hslua-1.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f64acea6a18ef8d9d48eb5cc8fa2b9f6
diff --git a/metadata/md5-cache/dev-haskell/hslua-1.3.0.1 b/metadata/md5-cache/dev-haskell/hslua-1.3.0.1
deleted file mode 100644
index 811a5f16ba13..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-1.3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Bindings to Lua, an embeddable scripting language
-EAPI=7
-HOMEPAGE=https://hslua.github.io/
-INHERIT=haskell-cabal
-IUSE=hardcode-reg-keys doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/1.3.0.1
-SRC_URI=https://hackage.haskell.org/package/hslua-1.3.0.1/hslua-1.3.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=107aedf7e8cc1f69eef3b674439dad48
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-path-0.1.0.1 b/metadata/md5-cache/dev-haskell/hslua-module-path-0.1.0.1
deleted file mode 100644
index 18b8fe8b7775..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-module-path-0.1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/tasty dev-haskell/tasty-hunit >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lua module to work with file paths
-EAPI=7
-HOMEPAGE=https://github.com/hslua/hslua-module-path
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1.0.1
-SRC_URI=https://hackage.haskell.org/package/hslua-module-path-0.1.0.1/hslua-module-path-0.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4ebcc9ea6d26179a799fbe1bb4a2d106
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.2.1 b/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.2.1
deleted file mode 100644
index 21888e0d0983..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/tasty dev-haskell/tasty-hunit >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 dev-haskell/text ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lua module wrapper around Haskell's System module
-EAPI=7
-HOMEPAGE=https://github.com/hslua/hslua-module-system
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-lang/ghc-8.0.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.2.2.1
-SRC_URI=https://hackage.haskell.org/package/hslua-module-system-0.2.2.1/hslua-module-system-0.2.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=de5963a676601b4f5bcf0dde2a067f9d
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1 b/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
deleted file mode 100644
index 145740b0d88b..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lua module for text
-EAPI=7
-HOMEPAGE=https://github.com/hslua/hslua-module-text
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.2.1
-SRC_URI=https://hackage.haskell.org/package/hslua-module-text-0.2.1/hslua-module-text-0.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0c7de546a9a151c3badfa79bfb5952e5
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-text-0.3.0.1 b/metadata/md5-cache/dev-haskell/hslua-module-text-0.3.0.1
deleted file mode 100644
index f4224e2a32cf..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-module-text-0.3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/tasty dev-haskell/tasty-hunit >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lua module for text
-EAPI=7
-HOMEPAGE=https://github.com/hslua/hslua-module-text
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.0.1
-SRC_URI=https://hackage.haskell.org/package/hslua-module-text-0.3.0.1/hslua-module-text-0.3.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=aa7a49571774cbabd8d9182066e0729c
diff --git a/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17-r1 b/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17-r1
index 48d0e401e736..5254173b9bcc 100644
--- a/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17-r1
+++ b/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vshabanov/HsOpenSSL
 INHERIT=haskell-cabal
 IUSE=fast-bignum doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=public-domain
 RDEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/openssl:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.4.17
 SRC_URI=https://hackage.haskell.org/package/HsOpenSSL-0.11.4.17/HsOpenSSL-0.11.4.17.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d7377113b40d882528709c38d6999618
+_md5_=0b45aa1b241ad59e6aea9d96b9dd9fce
diff --git a/metadata/md5-cache/dev-haskell/hspec-megaparsec-2.2.0 b/metadata/md5-cache/dev-haskell/hspec-megaparsec-2.2.0
new file mode 100644
index 000000000000..4ec8fac4ad4b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hspec-megaparsec-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?] >=dev-haskell/megaparsec-9.0:=[profile?] <dev-haskell/megaparsec-10.0:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utility functions for testing Megaparsec parsers with Hspec
+EAPI=7
+HOMEPAGE=https://github.com/mrkkrp/hspec-megaparsec
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?] >=dev-haskell/megaparsec-9.0:=[profile?] <dev-haskell/megaparsec-10.0:=[profile?] >=dev-lang/ghc-8.6.3:=
+RESTRICT=!test? ( test )
+SLOT=0/2.2.0
+SRC_URI=https://hackage.haskell.org/package/hspec-megaparsec-2.2.0/hspec-megaparsec-2.2.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=79f02e04ddd591d035a8730684cd37c6
diff --git a/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1 b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
index d92c19e668a6..d00f68e894eb 100644
--- a/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
+++ b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/xml
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2.1
 SRC_URI=https://hackage.haskell.org/package/html-conduit-1.3.2.1/html-conduit-1.3.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=da6acd1337de78d1d223d3f9eb46c588
+_md5_=3a6090c09683da904dbd64df50750aa7
diff --git a/metadata/md5-cache/dev-haskell/http-4000.3.16 b/metadata/md5-cache/dev-haskell/http-4000.3.16
deleted file mode 100644
index 250282cb4694..000000000000
--- a/metadata/md5-cache/dev-haskell/http-4000.3.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5 >=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7 >=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2 >=dev-haskell/split-0.1.3 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A library for client-side HTTP
-EAPI=8
-HOMEPAGE=https://github.com/haskell/HTTP
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-RESTRICT=!test? ( test )
-SLOT=0/4000.3.16
-SRC_URI=https://hackage.haskell.org/package/HTTP-4000.3.16/HTTP-4000.3.16.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b45fe4b5bfc7c91f3ec39a779f00db2d
diff --git a/metadata/md5-cache/dev-haskell/http-4000.4.1 b/metadata/md5-cache/dev-haskell/http-4000.4.1
index 672e713e8680..9bd83ac33300 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.4.1
+++ b/metadata/md5-cache/dev-haskell/http-4000.4.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/HTTP
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/4000.4.1
 SRC_URI=https://hackage.haskell.org/package/HTTP-4000.4.1/HTTP-4000.4.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2ba4ead2f31f72ebc86893c7ccc98c63
+_md5_=b7bf2327c2470fc6275b399b0de96475
diff --git a/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1 b/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
deleted file mode 100644
index 9e8d65bccd60..000000000000
--- a/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?] >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-compat-1.9.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.8 >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Converting to/from HTTP API data like URL pieces, headers and query parameters
-EAPI=7
-HOMEPAGE=https://github.com/fizruk/http-api-data
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?] >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-compat-1.9.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.4.1.1
-SRC_URI=https://hackage.haskell.org/package/http-api-data-0.4.1.1/http-api-data-0.4.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=16e66c4e7acad8dab7309ecc0ab87ff1
diff --git a/metadata/md5-cache/dev-haskell/http-client-0.6.4.1 b/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
deleted file mode 100644
index 0561738a0d20..000000000000
--- a/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/memory-0.7:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/async dev-haskell/hspec dev-haskell/monad-control >=dev-haskell/streaming-commons-0.1.1 dev-haskell/zlib !network-uri? ( dev-haskell/network-uri ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=An HTTP client engine, intended as a base layer for more user-friendly packages
-EAPI=7
-HOMEPAGE=https://github.com/snoyberg/http-client
-INHERIT=haskell-cabal
-IUSE=+network-uri doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/memory-0.7:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-RESTRICT=test
-SLOT=0/0.6.4.1
-SRC_URI=https://hackage.haskell.org/package/http-client-0.6.4.1/http-client-0.6.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0a1b4a342b4ace90f7c85669359d9ef9
diff --git a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3 b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
deleted file mode 100644
index 466c6e262b7f..000000000000
--- a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=restricting the servers that http-client will use
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/http-client-restricted
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:=
-SLOT=0/0.0.3
-SRC_URI=https://hackage.haskell.org/package/http-client-restricted-0.0.3/http-client-restricted-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fa8eb38be64aef405f44eac68a4277b
diff --git a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.5 b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.5
new file mode 100644
index 000000000000..54818943418c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.5
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.7.11:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.3.6:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=restricting the servers that http-client will use
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/http-client-restricted
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.7.11:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.3.6:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/0.0.5
+SRC_URI=https://hackage.haskell.org/package/http-client-restricted-0.0.5/http-client-restricted-0.0.5.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f9e193e0409d566486963d2a02096f52
diff --git a/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3 b/metadata/md5-cache/dev-haskell/http-client-tls-0.3.6.1
index 21e5df8e2b93..df74673967a4 100644
--- a/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
+++ b/metadata/md5-cache/dev-haskell/http-client-tls-0.3.6.1
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/http-client-0.5.0:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.7.11:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-uri:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=http-client backend using the connection package and tls library
 EAPI=8
 HOMEPAGE=https://github.com/snoyberg/http-client
@@ -8,9 +8,9 @@ INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/http-client-0.5.0:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+RDEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.7.11:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-uri:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=test !test? ( test )
-SLOT=0/0.3.5.3
-SRC_URI=https://hackage.haskell.org/package/http-client-tls-0.3.5.3/http-client-tls-0.3.5.3.tar.gz
+SLOT=0/0.3.6.1
+SRC_URI=https://hackage.haskell.org/package/http-client-tls-0.3.6.1/http-client-tls-0.3.6.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ba44f8ca39ebce75bfcd4ca0917eb083
+_md5_=adeba250e8cceb255501d0e56e09fe8a
diff --git a/metadata/md5-cache/dev-haskell/http-common-0.8.2.1 b/metadata/md5-cache/dev-haskell/http-common-0.8.2.1
deleted file mode 100644
index 0e4d045d18da..000000000000
--- a/metadata/md5-cache/dev-haskell/http-common-0.8.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.24 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Common types for HTTP clients and servers
-EAPI=7
-HOMEPAGE=https://github.com/istathar/http-common
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/0.8.2.1
-SRC_URI=https://hackage.haskell.org/package/http-common-0.8.2.1/http-common-0.8.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=18ca5791be9e2215a32965f220ed7fcf
diff --git a/metadata/md5-cache/dev-haskell/http-common-0.8.3.4 b/metadata/md5-cache/dev-haskell/http-common-0.8.3.4
new file mode 100644
index 000000000000..4173380a6074
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-common-0.8.3.4
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common types for HTTP clients and servers
+EAPI=8
+HOMEPAGE=https://github.com/aesiniath/http-common
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/0.8.3.4
+SRC_URI=https://hackage.haskell.org/package/http-common-0.8.3.4/http-common-0.8.3.4.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f4194a340a16ec092b142591b3cf344e
diff --git a/metadata/md5-cache/dev-haskell/http-streams-0.8.7.2 b/metadata/md5-cache/dev-haskell/http-streams-0.8.7.2
deleted file mode 100644
index 0c911c8f4a1c..000000000000
--- a/metadata/md5-cache/dev-haskell/http-streams-0.8.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hsopenssl-0.11.2:=[profile?] >=dev-haskell/http-common-0.8.2:=[profile?] >=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=An HTTP client using io-streams
-EAPI=7
-HOMEPAGE=https://github.com/afcowie/http-streams/
-INHERIT=haskell-cabal
-IUSE=+network-uri doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hsopenssl-0.11.2:=[profile?] >=dev-haskell/http-common-0.8.2:=[profile?] >=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
-RESTRICT=test
-SLOT=0/0.8.7.2
-SRC_URI=https://hackage.haskell.org/package/http-streams-0.8.7.2/http-streams-0.8.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=68cb6311da8088ef8e3b1d9608bfbc2b
diff --git a/metadata/md5-cache/dev-haskell/http-streams-0.8.9.4 b/metadata/md5-cache/dev-haskell/http-streams-0.8.9.4
new file mode 100644
index 000000000000..225a43ffd205
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-streams-0.8.9.4
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hsopenssl-0.11.2:=[profile?] >=dev-haskell/http-common-0.8.3.4:=[profile?] >=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An HTTP client using io-streams
+EAPI=8
+HOMEPAGE=https://github.com/aesiniath/http-streams/
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hsopenssl-0.11.2:=[profile?] >=dev-haskell/http-common-0.8.3.4:=[profile?] >=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?]
+RESTRICT=test
+SLOT=0/0.8.9.4
+SRC_URI=https://hackage.haskell.org/package/http-streams-0.8.9.4/http-streams-0.8.9.4.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=426fa7060eaddfd7f75e87b6face10c7
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
deleted file mode 100644
index 0c8daa01f6b7..000000000000
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-2.7:=[profile?] ) !network-bsd? ( <dev-haskell/network-2.7:=[profile?] ) network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/network-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A simple web-server with an interact style API
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/httpd-shed
-INHERIT=haskell-cabal
-IUSE=buildexamples +network-bsd +network-uri doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-2.7:=[profile?] ) !network-bsd? ( <dev-haskell/network-2.7:=[profile?] ) network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/network-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
-SLOT=0/0.4.1.1
-SRC_URI=https://hackage.haskell.org/package/httpd-shed-0.4.1.1/httpd-shed-0.4.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=391e6750c4ff4c2e7251d4b618e62b04
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1-r1 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1-r1
new file mode 100644
index 000000000000..b9f7c2f83626
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A simple web-server with an interact style API
+EAPI=7
+HOMEPAGE=https://hackage.haskell.org/package/httpd-shed
+INHERIT=haskell-cabal
+IUSE=buildexamples doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?]
+SLOT=0/0.4.1.1
+SRC_URI=https://hackage.haskell.org/package/httpd-shed-0.4.1.1/httpd-shed-0.4.1.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ae0de0f4c9c8b3e059a0786e1497e6a2
diff --git a/metadata/md5-cache/dev-haskell/hxt-9.3.1.18 b/metadata/md5-cache/dev-haskell/hxt-9.3.1.22
index 9ed3300f8a30..70277734b5bf 100644
--- a/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
+++ b/metadata/md5-cache/dev-haskell/hxt-9.3.1.22
@@ -1,15 +1,15 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A collection of tools for processing XML with Haskell
 EAPI=7
 HOMEPAGE=https://github.com/UweSchmidt/hxt
 INHERIT=haskell-cabal
-IUSE=doc hscolour profile
+IUSE=profile doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-uri-2.6:=[profile?]
-SLOT=0/9.3.1.18
-SRC_URI=https://hackage.haskell.org/package/hxt-9.3.1.18/hxt-9.3.1.18.tar.gz
+RDEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/9.3.1.22
+SRC_URI=https://hackage.haskell.org/package/hxt-9.3.1.22/hxt-9.3.1.22.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=118a6df1a915e1a42b23adc36891a6e4
+_md5_=221dc7edbd9028022e09d21e72fa9b7d
diff --git a/metadata/md5-cache/dev-haskell/ieee754-0.7.8 b/metadata/md5-cache/dev-haskell/ieee754-0.7.8
index 39954a1d43ba..1effae72a0d9 100644
--- a/metadata/md5-cache/dev-haskell/ieee754-0.7.8
+++ b/metadata/md5-cache/dev-haskell/ieee754-0.7.8
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/patperry/hs-ieee754
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.8
 SRC_URI=https://hackage.haskell.org/package/ieee754-0.7.8/ieee754-0.7.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=35bc49bf1db739218b93eeb5b6a6b781
+_md5_=d3a22bfdd5f9311eae06e1fec072f9a4
diff --git a/metadata/md5-cache/dev-haskell/ifelse-0.85-r1 b/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
index 83aa56fc52a1..fff14691cbf1 100644
--- a/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
+++ b/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/IfElse
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.85
 SRC_URI=https://hackage.haskell.org/package/IfElse-0.85/IfElse-0.85.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=693b724c6457b03479c7a79cc3875094
+_md5_=09d43651d766f6d47927978200a4f4c9
diff --git a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1 b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1
deleted file mode 100644
index e2bfd6ac6475..000000000000
--- a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=FunctorWithIndex, FoldableWithIndex, TraversableWithIndex
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/indexed-traversable
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/0.1
-SRC_URI=https://hackage.haskell.org/package/indexed-traversable-0.1/indexed-traversable-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ea4c0734db7ea67b28ee9068ada0d8a6
diff --git a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.1 b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.1
deleted file mode 100644
index 21980d8036af..000000000000
--- a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=FunctorWithIndex, FoldableWithIndex, TraversableWithIndex
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/indexed-traversable
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/0.1.1
-SRC_URI=https://hackage.haskell.org/package/indexed-traversable-0.1.1/indexed-traversable-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1cd95ff50db7914ee352e17072bfbc53
diff --git a/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0 b/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
deleted file mode 100644
index 61a6256b6567..000000000000
--- a/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/mtl-2 <dev-haskell/mtl-3 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Simple, composable, and easy-to-use stream I/O
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/io-streams
-INHERIT=haskell-cabal
-IUSE=+network +zlib doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] )
-RESTRICT=test
-SLOT=0/1.5.2.0
-SRC_URI=https://hackage.haskell.org/package/io-streams-1.5.2.0/io-streams-1.5.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=46b4d410dfbee10b4113e744300cfadd
diff --git a/metadata/md5-cache/dev-haskell/io-streams-1.5.2.1 b/metadata/md5-cache/dev-haskell/io-streams-1.5.2.1
new file mode 100644
index 000000000000..8dcb74a92b74
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/io-streams-1.5.2.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple, composable, and easy-to-use stream I/O
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/io-streams
+INHERIT=haskell-cabal
+IUSE=+network +zlib doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.5.2.1
+SRC_URI=https://hackage.haskell.org/package/io-streams-1.5.2.1/io-streams-1.5.2.1.tar.gz https://hackage.haskell.org/package/io-streams-1.5.2.1/revision/2.cabal -> io-streams-1.5.2.1-rev2.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a6ccefd5ee0fd101a4d552fdce39d951
diff --git a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1 b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
deleted file mode 100644
index f20d33a678f6..000000000000
--- a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=HAProxy protocol 1.5 support for io-streams
-EAPI=7
-HOMEPAGE=http://snapframework.com/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/1.0.1.0
-SRC_URI=https://hackage.haskell.org/package/io-streams-haproxy-1.0.1.0/io-streams-haproxy-1.0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f6a7defa73962c7a63cf3e830dcb73eb
diff --git a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r2 b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r2
new file mode 100644
index 000000000000..d4b58a871fe8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HAProxy protocol 1.5 support for io-streams
+EAPI=8
+HOMEPAGE=https://snapframework.com/
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.1.0
+SRC_URI=https://hackage.haskell.org/package/io-streams-haproxy-1.0.1.0/io-streams-haproxy-1.0.1.0.tar.gz https://hackage.haskell.org/package/io-streams-haproxy-1.0.1.0/revision/3.cabal -> io-streams-haproxy-1.0.1.0-rev3.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a9bc017b03a9b6019116749b86533020
diff --git a/metadata/md5-cache/dev-haskell/ipynb-0.1 b/metadata/md5-cache/dev-haskell/ipynb-0.1
deleted file mode 100644
index a5f9a3db41fe..000000000000
--- a/metadata/md5-cache/dev-haskell/ipynb-0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/aeson-diff dev-haskell/microlens dev-haskell/microlens-aeson dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/vector ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Data structure for working with Jupyter notebooks (ipynb)
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/ipynb
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1
-SRC_URI=https://hackage.haskell.org/package/ipynb-0.1/ipynb-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9ae4e4d7643aefb1c9ca7c993cc7e206
diff --git a/metadata/md5-cache/dev-haskell/ipynb-0.1.0.2 b/metadata/md5-cache/dev-haskell/ipynb-0.1.0.2
deleted file mode 100644
index a6a246546974..000000000000
--- a/metadata/md5-cache/dev-haskell/ipynb-0.1.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/aeson-diff dev-haskell/microlens dev-haskell/microlens-aeson dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/vector ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Data structure for working with Jupyter notebooks (ipynb)
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/ipynb
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1.0.2
-SRC_URI=https://hackage.haskell.org/package/ipynb-0.1.0.2/ipynb-0.1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f7c34cad539006cbe1995b1863e37b04
diff --git a/metadata/md5-cache/dev-haskell/js-chart-2.9.4.1 b/metadata/md5-cache/dev-haskell/js-chart-2.9.4.1
new file mode 100644
index 000000000000..7ec36699ea05
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/js-chart-2.9.4.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Obtain minified chart.js code
+EAPI=8
+HOMEPAGE=https://github.com/jonascarpay/js-chart#readme
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/2.9.4.1
+SRC_URI=https://hackage.haskell.org/package/js-chart-2.9.4.1/js-chart-2.9.4.1.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=40fcf878510f3a0e481511911a94e47c
diff --git a/metadata/md5-cache/dev-haskell/js-flot-0.8.3 b/metadata/md5-cache/dev-haskell/js-flot-0.8.3
index 400950cd84ad..d9203a8946c6 100644
--- a/metadata/md5-cache/dev-haskell/js-flot-0.8.3
+++ b/metadata/md5-cache/dev-haskell/js-flot-0.8.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/js-flot#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/js-flot-0.8.3/js-flot-0.8.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9bc1a03f2eb4883e2c7bd4563d00824a
+_md5_=7b6ea05d071a7b2529ece4f69c051ce3
diff --git a/metadata/md5-cache/dev-haskell/js-jquery-3.3.1 b/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
index 7711a19020dc..9b079119dcf8 100644
--- a/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
+++ b/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/js-jquery#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/3.3.1
 SRC_URI=https://hackage.haskell.org/package/js-jquery-3.3.1/js-jquery-3.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fc53819de019b444ff69bbfe375e9e7b
+_md5_=ab58da5cf0aa2fcb4c36b15b5f314523
diff --git a/metadata/md5-cache/dev-haskell/keys-3.12.3 b/metadata/md5-cache/dev-haskell/keys-3.12.3
deleted file mode 100644
index e137cfbccd42..000000000000
--- a/metadata/md5-cache/dev-haskell/keys-3.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Keyed functors and containers
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/keys/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/3.12.3
-SRC_URI=https://hackage.haskell.org/package/keys-3.12.3/keys-3.12.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8b21845a4eb1f8146565d2c14f0b5581
diff --git a/metadata/md5-cache/dev-haskell/keys-3.12.3-r1 b/metadata/md5-cache/dev-haskell/keys-3.12.3-r1
new file mode 100644
index 000000000000..b55ce3cccceb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/keys-3.12.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Keyed functors and containers
+EAPI=8
+HOMEPAGE=https://github.com/ekmett/keys/
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/3.12.3
+SRC_URI=https://hackage.haskell.org/package/keys-3.12.3/keys-3.12.3.tar.gz https://hackage.haskell.org/package/keys-3.12.3/revision/1.cabal -> keys-3.12.3-r1.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fdd609dc3ce8d5b0d87bc52efd9f8cbf
diff --git a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1 b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
index f78c349d5442..03d900fa2981 100644
--- a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
+++ b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/finnsson/template-helper
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/language-haskell-extract-0.2.4/language-haskell-extract-0.2.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ba927d5bf6e803a72c62abc9d924d7f6
+_md5_=e7bf98d0f167979e75e54e6c998e9622
diff --git a/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14 b/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
index b91b92adb91d..d6b4385cd7e2 100644
--- a/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
+++ b/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/erikd/language-javascript
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.6.0.14
 SRC_URI=https://hackage.haskell.org/package/language-javascript-0.6.0.14/language-javascript-0.6.0.14.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=11c731656d07741714c4218ce2e90062
+_md5_=1c66da596dc7ac68502a02b958ca0740
diff --git a/metadata/md5-cache/dev-haskell/lens-4.19.2-r2 b/metadata/md5-cache/dev-haskell/lens-4.19.2-r2
deleted file mode 100644
index 5140c1930fb3..000000000000
--- a/metadata/md5-cache/dev-haskell/lens-4.19.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.4:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-quickcheck2-0.2 dev-haskell/generic-deriving dev-haskell/nats >=dev-haskell/semigroups-0.9 >=dev-haskell/simple-reflect-0.3.1 >=dev-haskell/doctest-0.11.4 <dev-haskell/doctest-0.18 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lenses, Folds and Traversals
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/lens/
-INHERIT=haskell-cabal
-IUSE=benchmark-uniplate dump-splices +inlining j safe +trustworthy doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.4:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=test
-SLOT=0/4.19.2
-SRC_URI=https://hackage.haskell.org/package/lens-4.19.2/lens-4.19.2.tar.gz https://hackage.haskell.org/package/lens-4.19.2/revision/3.cabal -> lens-4.19.2-r2.cabal
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5e88e4719997e59ab929a9ec392ec722
diff --git a/metadata/md5-cache/dev-haskell/lift-type-0.1.0.1 b/metadata/md5-cache/dev-haskell/lift-type-0.1.0.1
index bbdc4987af6b..3d45dda11b55 100644
--- a/metadata/md5-cache/dev-haskell/lift-type-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/lift-type-0.1.0.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/parsonsmatt/lift-type#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/lift-type-0.1.0.1/lift-type-0.1.0.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d0fb21f4f6a00ffa1ced1b75d816fbcf
+_md5_=d724ddd16eb62679e3b4635c14495cad
diff --git a/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6 b/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
deleted file mode 100644
index d0b2a16a3083..000000000000
--- a/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.13:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl dev-haskell/tasty <dev-haskell/tasty-expected-failure-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 dev-haskell/tasty-th ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
-EAPI=7
-HOMEPAGE=https://github.com/maoe/lifted-async
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.13:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.10.0.6
-SRC_URI=https://hackage.haskell.org/package/lifted-async-0.10.0.6/lifted-async-0.10.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=684614bf1d40dabc9ec927a3600f820f
diff --git a/metadata/md5-cache/dev-haskell/lukko-0.1.1.3 b/metadata/md5-cache/dev-haskell/lukko-0.1.1.3
index 37db7c9e744c..2740406f6fbe 100644
--- a/metadata/md5-cache/dev-haskell/lukko-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/lukko-0.1.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/lukko
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.3
 SRC_URI=https://hackage.haskell.org/package/lukko-0.1.1.3/lukko-0.1.1.3.tar.gz https://hackage.haskell.org/package/lukko-0.1.1.3/revision/2.cabal -> lukko-0.1.1.3.cabal
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7fdd8576c6c310057aea4ca37c2c551d
+_md5_=9d596b16a9b74c04be51f414284fb0d5
diff --git a/metadata/md5-cache/dev-haskell/magic-1.1 b/metadata/md5-cache/dev-haskell/magic-1.1
index d2ee805808bb..56df8305c9bf 100644
--- a/metadata/md5-cache/dev-haskell/magic-1.1
+++ b/metadata/md5-cache/dev-haskell/magic-1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/magic
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-apps/file
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/magic-1.1/magic-1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=51b385f30a6964e089defc1f0d3139d2
+_md5_=0b39bc4e76cb378a1461b7e2bf94420b
diff --git a/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0 b/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
index 49702f88222e..743baa258808 100644
--- a/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
+++ b/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/sol/markdown-unlit#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/base-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://hackage.haskell.org/package/markdown-unlit-0.5.0/markdown-unlit-0.5.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=62392b8eb8b0246512b74c96e5b39e08
+_md5_=d31ca379a69c8210a1b53cec5d4e8a4e
diff --git a/metadata/md5-cache/dev-haskell/megaparsec-9.0.1 b/metadata/md5-cache/dev-haskell/megaparsec-9.0.1
deleted file mode 100644
index 1e0ad5c68e70..000000000000
--- a/metadata/md5-cache/dev-haskell/megaparsec-9.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Monadic parser combinators
-EAPI=7
-HOMEPAGE=https://github.com/mrkkrp/megaparsec
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.6.3:=
-SLOT=0/9.0.1
-SRC_URI=https://hackage.haskell.org/package/megaparsec-9.0.1/megaparsec-9.0.1.tar.gz https://hackage.haskell.org/package/megaparsec-9.0.1/revision/1.cabal -> megaparsec-9.0.1.cabal
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cd40f50d35d918c010e4ad437965ff73
diff --git a/metadata/md5-cache/dev-haskell/megaparsec-9.2.1 b/metadata/md5-cache/dev-haskell/megaparsec-9.2.1
new file mode 100644
index 000000000000..3f51f26f4969
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/megaparsec-9.2.1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-3.0.0.0 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monadic parser combinators
+EAPI=8
+HOMEPAGE=https://github.com/mrkkrp/megaparsec
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-lang/ghc-8.8.1:=
+SLOT=0/9.2.1
+SRC_URI=https://hackage.haskell.org/package/megaparsec-9.2.1/megaparsec-9.2.1.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=55fa887746eeb4eaef00bcaf2c40be27
diff --git a/metadata/md5-cache/dev-haskell/megaparsec-tests-9.2.1 b/metadata/md5-cache/dev-haskell/megaparsec-tests-9.2.1
new file mode 100644
index 000000000000..1983d208cebd
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/megaparsec-tests-9.2.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hspec-2.0:=[profile?] <dev-haskell/hspec-3.0:=[profile?] >=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?] >=dev-haskell/hspec-megaparsec-2.0:=[profile?] <dev-haskell/hspec-megaparsec-3.0:=[profile?] ~dev-haskell/megaparsec-9.2.1:=[profile?] >=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-3.0.0.0 test? ( >=dev-haskell/case-insensitive-1.2 <dev-haskell/case-insensitive-1.3 >=dev-haskell/parser-combinators-1.0 <dev-haskell/parser-combinators-2.0 >=dev-haskell/scientific-0.3.1 <dev-haskell/scientific-0.4 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Test utilities and the test suite of Megaparsec
+EAPI=8
+HOMEPAGE=https://github.com/mrkkrp/megaparsec
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/hspec-2.0:=[profile?] <dev-haskell/hspec-3.0:=[profile?] >=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?] >=dev-haskell/hspec-megaparsec-2.0:=[profile?] <dev-haskell/hspec-megaparsec-3.0:=[profile?] ~dev-haskell/megaparsec-9.2.1:=[profile?] >=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-lang/ghc-8.8.1:=
+RESTRICT=!test? ( test )
+SLOT=0/9.2.1
+SRC_URI=https://hackage.haskell.org/package/megaparsec-tests-9.2.1/megaparsec-tests-9.2.1.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=82f790e6807b10213706b56b0d32c33b
diff --git a/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1 b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
index 683371b2685a..35c32b0aebb6 100644
--- a/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/monadfix/microlens
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/microlens-mtl-0.2.0.1/microlens-mtl-0.2.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e77043386a26834ee8a5506036fed5ce
+_md5_=0ab828f867ba169d37cc270716f95f08
diff --git a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.10 b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.10
index caea36c980fb..2c915f078283 100644
--- a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.10
+++ b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/stevenfontanella/microlens
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3.10
 SRC_URI=https://hackage.haskell.org/package/microlens-th-0.4.3.10/microlens-th-0.4.3.10.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=623045f456f64096b1cb082c3a4b7b41
+_md5_=812c45db69da8c3c8f0e4225fa5a4cf6
diff --git a/metadata/md5-cache/dev-haskell/microstache-1.0.1.1 b/metadata/md5-cache/dev-haskell/microstache-1.0.1.1
deleted file mode 100644
index 7348c047c288..000000000000
--- a/metadata/md5-cache/dev-haskell/microstache-1.0.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-6.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Mustache templates for Haskell
-EAPI=8
-HOMEPAGE=https://github.com/phadej/microstache
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-6.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0.1.1
-SRC_URI=https://hackage.haskell.org/package/microstache-1.0.1.1/microstache-1.0.1.1.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3968774d95ab0005e56b02d9610daba4
diff --git a/metadata/md5-cache/dev-haskell/microstache-1.0.2 b/metadata/md5-cache/dev-haskell/microstache-1.0.2
new file mode 100644
index 000000000000..b791e8a0d377
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/microstache-1.0.2
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/aeson >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Mustache templates for Haskell
+EAPI=8
+HOMEPAGE=https://github.com/haskellari/microstache
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.2
+SRC_URI=https://hackage.haskell.org/package/microstache-1.0.2/microstache-1.0.2.tar.gz https://hackage.haskell.org/package/microstache-1.0.2/revision/3.cabal -> microstache-1.0.2-rev3.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e91d92616f4e4b22acf58f27336ee94a
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0 b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0-r1
index ea67e96465a3..7f343a2c6f06 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
+++ b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?] >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?] >=dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4 >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?] >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] dev-haskell/random >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4 >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Large utility library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/MissingH
 INHERIT=haskell-cabal
-IUSE=+network-3 doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?] >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?] >=dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] )
+RDEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?] >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] dev-haskell/random >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
 RESTRICT=test
 SLOT=0/1.4.3.0
 SRC_URI=https://hackage.haskell.org/package/MissingH-1.4.3.0/MissingH-1.4.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=01104d6fc11fb05ffedc05f34afe1fc8
+_md5_=9fc738387c46eceeb2d3f6faa8ea8056
diff --git a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32 b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
index 8a6338180459..d5221b6439ae 100644
--- a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
+++ b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/monad-logger#readme
 INHERIT=haskell-cabal
 IUSE=+template-haskell doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-3.1:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.3.32
 SRC_URI=https://hackage.haskell.org/package/monad-logger-0.3.32/monad-logger-0.3.32.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=21db67ceb75c1bca17f019aabe40f4a5
+_md5_=c3982afcc9597ef48cc7c91a2c51a2e2
diff --git a/metadata/md5-cache/dev-haskell/monad-loops-0.4.3 b/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
index ccc0ef7ba750..247327732eef 100644
--- a/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
+++ b/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/mokus0/monad-loops
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=public-domain
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3
 SRC_URI=https://hackage.haskell.org/package/monad-loops-0.4.3/monad-loops-0.4.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5014e4c863411dee5e1b43e7ad564cf3
+_md5_=5d40904fccc79ca002759022f1692fac
diff --git a/metadata/md5-cache/dev-haskell/monad-par-0.3.5-r1 b/metadata/md5-cache/dev-haskell/monad-par-0.3.5-r1
index b82d33ea8eb9..597f49e9e351 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-0.3.5-r1
+++ b/metadata/md5-cache/dev-haskell/monad-par-0.3.5-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A library for parallel programming based on a monad
 EAPI=8
 HOMEPAGE=https://github.com/simonmar/monad-par
 INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+IUSE=chaselev doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/monad-par-0.3.5/monad-par-0.3.5.tar.gz https://hackage.haskell.org/package/monad-par-0.3.5/revision/2.cabal -> monad-par-0.3.5-rev2.cabal
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4dac822eb6cbd6a09be23f9469cfd9a
+_md5_=18ae4c56271099bf6a2836947aa48e8b
diff --git a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1 b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
index dadd061809ae..eb5648df1579 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/simonmar/monad-par
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/monad-par-extras-0.3.3/monad-par-extras-0.3.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=42a30d8b317c763e6942e1d98ce077bf
+_md5_=5e4b17f71750f6ed1a3c2e337990cd71
diff --git a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3 b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
index 3181c7c4a4c2..589032d18363 100644
--- a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/monads-tf
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.3
 SRC_URI=https://hackage.haskell.org/package/monads-tf-0.1.0.3/monads-tf-0.1.0.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=449bcec94acada70475ffb3b13951b0a
+_md5_=36bcde0371b6ee441b870336d02d5e3b
diff --git a/metadata/md5-cache/dev-haskell/mountpoints-1.0.2 b/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
index 5696d71ee1b4..8be6f50ebefc 100644
--- a/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
+++ b/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/mountpoints
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/mountpoints-1.0.2/mountpoints-1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fcc35c2318b86f75dfd403d37073b84c
+_md5_=29762d5864fe648f9e85ea79a6ff8782
diff --git a/metadata/md5-cache/dev-haskell/mustache-2.3.1 b/metadata/md5-cache/dev-haskell/mustache-2.3.1
deleted file mode 100644
index 5d9a20fe415e..000000000000
--- a/metadata/md5-cache/dev-haskell/mustache-2.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/cmdargs:=[profile?] dev-haskell/either:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base-unicode-symbols dev-haskell/hspec dev-haskell/lens dev-haskell/tar dev-haskell/temporary dev-haskell/wreq dev-haskell/zlib ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A mustache template parser library
-EAPI=7
-HOMEPAGE=https://github.com/JustusAdam/mustache
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/cmdargs:=[profile?] dev-haskell/either:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/2.3.1
-SRC_URI=https://hackage.haskell.org/package/mustache-2.3.1/mustache-2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=37761571eaef0ea21cd4e6c2da8f7e91
diff --git a/metadata/md5-cache/dev-haskell/mustache-2.4.0 b/metadata/md5-cache/dev-haskell/mustache-2.4.0
new file mode 100644
index 000000000000..a1c8d789bde5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/mustache-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/cmdargs:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/base-unicode-symbols dev-haskell/hspec dev-haskell/lens dev-haskell/tar dev-haskell/temporary dev-haskell/wreq dev-haskell/zlib ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A mustache template parser library
+EAPI=8
+HOMEPAGE=https://github.com/JustusAdam/mustache
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/cmdargs:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/2.4.0
+SRC_URI=https://hackage.haskell.org/package/mustache-2.4.0/mustache-2.4.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=057ced6da07602a904caa328b6ae6294
diff --git a/metadata/md5-cache/dev-haskell/nats-1.1.2 b/metadata/md5-cache/dev-haskell/nats-1.1.2
deleted file mode 100644
index 6981f0cde43f..000000000000
--- a/metadata/md5-cache/dev-haskell/nats-1.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] ) hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-DESCRIPTION=Natural numbers
-EAPI=8
-HOMEPAGE=https://github.com/ekmett/nats/
-INHERIT=haskell-cabal
-IUSE=+binary +hashable +template-haskell profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:= binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] ) hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-RESTRICT=test
-SLOT=0/1.1.2
-SRC_URI=https://hackage.haskell.org/package/nats-1.1.2/nats-1.1.2.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e61fb87baefd29b66f05d18e0599d1af
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.1.2 b/metadata/md5-cache/dev-haskell/network-2.4.1.2
deleted file mode 100644
index 8dae1fe71577..000000000000
--- a/metadata/md5-cache/dev-haskell/network-2.4.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Low-level networking interface
-EAPI=7
-HOMEPAGE=https://github.com/haskell/network
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
-RESTRICT=!test? ( test )
-SLOT=0/2.4.1.2
-SRC_URI=https://hackage.haskell.org/package/network-2.4.1.2/network-2.4.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2f88eb0cc0d6aacce506c13546b85f7b
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.2.2 b/metadata/md5-cache/dev-haskell/network-2.4.2.2
deleted file mode 100644
index 228a07a4ef26..000000000000
--- a/metadata/md5-cache/dev-haskell/network-2.4.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Low-level networking interface
-EAPI=7
-HOMEPAGE=https://github.com/haskell/network
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
-RESTRICT=!test? ( test )
-SLOT=0/2.4.2.2
-SRC_URI=https://hackage.haskell.org/package/network-2.4.2.2/network-2.4.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d0efb9f7d02b7dc0d643a8645347c3fe
diff --git a/metadata/md5-cache/dev-haskell/network-2.5.0.0 b/metadata/md5-cache/dev-haskell/network-2.5.0.0
deleted file mode 100644
index 3e1670ac3f16..000000000000
--- a/metadata/md5-cache/dev-haskell/network-2.5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Low-level networking interface
-EAPI=7
-HOMEPAGE=https://github.com/haskell/network
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.5.0.0
-SRC_URI=https://hackage.haskell.org/package/network-2.5.0.0/network-2.5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=26980f4109426e20a26d5e3d510b5f77
diff --git a/metadata/md5-cache/dev-haskell/network-2.6.2.1 b/metadata/md5-cache/dev-haskell/network-2.6.2.1
deleted file mode 100644
index 0181e072f5da..000000000000
--- a/metadata/md5-cache/dev-haskell/network-2.6.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Low-level networking interface
-EAPI=7
-HOMEPAGE=https://github.com/haskell/network
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.6.2.1
-SRC_URI=https://hackage.haskell.org/package/network-2.6.2.1/network-2.6.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0300616145ec8e68657890a313b4945a
diff --git a/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1 b/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
deleted file mode 100644
index 3c12d9d96e52..000000000000
--- a/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.10.1 dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Low-level networking interface
-EAPI=7
-HOMEPAGE=https://github.com/haskell/network
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/2.6.3.1
-SRC_URI=https://hackage.haskell.org/package/network-2.6.3.1/network-2.6.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0bed46a53ec00fc21039279dad6adbd8
diff --git a/metadata/md5-cache/dev-haskell/network-3.0.1.1 b/metadata/md5-cache/dev-haskell/network-3.0.1.1
deleted file mode 100644
index cb589c766633..000000000000
--- a/metadata/md5-cache/dev-haskell/network-3.0.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.6 dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Low-level networking interface
-EAPI=7
-HOMEPAGE=https://github.com/haskell/network
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/3.0.1.1
-SRC_URI=https://hackage.haskell.org/package/network-3.0.1.1/network-3.0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0ccd740719fadd4cf4699de3c311ba76
diff --git a/metadata/md5-cache/dev-haskell/network-3.1.2.5 b/metadata/md5-cache/dev-haskell/network-3.1.2.5
new file mode 100644
index 000000000000..606fa5afb0d7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/network-3.1.2.5
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2.6 dev-haskell/hunit dev-haskell/quickcheck dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Low-level networking interface
+EAPI=8
+HOMEPAGE=https://github.com/haskell/network
+INHERIT=haskell-cabal
+IUSE=devel doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/3.1.2.5
+SRC_URI=https://hackage.haskell.org/package/network-3.1.2.5/network-3.1.2.5.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=64e8d40778f232331325893f27029761
diff --git a/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0 b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0-r1
index c2ea6e2441bc..5b1726594bc6 100644
--- a/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
+++ b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?] >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Network.BSD
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network-bsd
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?]
+RDEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
 SLOT=0/2.8.1.0
 SRC_URI=https://hackage.haskell.org/package/network-bsd-2.8.1.0/network-bsd-2.8.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=54c1fcc147efa576b3c3fcd8c57975d1
+_md5_=a2dfe5dcc36b07be39a9bb673af1238a
diff --git a/metadata/md5-cache/dev-haskell/network-info-0.2.0.10 b/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
index cdd3e4cdc576..38c871221360 100644
--- a/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
+++ b/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/jystic/network-info
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0.10
 SRC_URI=https://hackage.haskell.org/package/network-info-0.2.0.10/network-info-0.2.0.10.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=99494cfe1f56e7e86cfdd2fdfaca4728
+_md5_=ec70f9acebcf5f6da323b4cd8ed5da1b
diff --git a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2 b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
index 9c7a92a5e205..87f73dd6866b 100644
--- a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
+++ b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/network-multicast
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-haskell/network:=[profile?] dev-haskell/network-bsd:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.2
 SRC_URI=https://hackage.haskell.org/package/network-multicast-0.3.2/network-multicast-0.3.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cd4af9e13d89a196f97ef5013fc58221
+_md5_=d0e3d9c4e1523296ac49b7685e8f7d43
diff --git a/metadata/md5-cache/dev-haskell/only-0.1 b/metadata/md5-cache/dev-haskell/only-0.1
index a1ff68819f7a..a35b32efd1f5 100644
--- a/metadata/md5-cache/dev-haskell/only-0.1
+++ b/metadata/md5-cache/dev-haskell/only-0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/Only
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/Only-0.1/Only-0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7815da8c093351298cd580275b3c167f
+_md5_=8a1689b8cdcbf79831aa752ca6be1200
diff --git a/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0 b/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
index 97b13b5f1062..3e04ed5a775a 100644
--- a/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
+++ b/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/openssl-streams
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.2.3.0
 SRC_URI=https://hackage.haskell.org/package/openssl-streams-1.2.3.0/openssl-streams-1.2.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f66f6ff09042282490acbd9fdaa3976b
+_md5_=a803d8432b00ffbcce1e1dc6ee77d83e
diff --git a/metadata/md5-cache/dev-haskell/options-1.2.1.1 b/metadata/md5-cache/dev-haskell/options-1.2.1.1
index 94e222bb1ca5..2e9fd74f1a9d 100644
--- a/metadata/md5-cache/dev-haskell/options-1.2.1.1
+++ b/metadata/md5-cache/dev-haskell/options-1.2.1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://john-millikin.com/software/haskell-options/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.2.1.1
 SRC_URI=https://hackage.haskell.org/package/options-1.2.1.1/options-1.2.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fa162e608c9646737ab463057226db6
+_md5_=027fd24bcc4516647f064681192d60f6
diff --git a/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0 b/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
deleted file mode 100644
index e7b5ad2bc488..000000000000
--- a/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Utilities and combinators for parsing command line options
-EAPI=7
-HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.15.1.0
-SRC_URI=https://hackage.haskell.org/package/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a8fcea588cdcfa3b2b62d7aa5f912be0
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0 b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
deleted file mode 100644
index d761de250abc..000000000000
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Monadic parser combinators
-EAPI=7
-HOMEPAGE=https://github.com/haskell/parsec
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-RESTRICT=test
-SLOT=0/3.1.14.0
-SRC_URI=https://hackage.haskell.org/package/parsec-3.1.14.0/parsec-3.1.14.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=da70394f8992b1458a99718149dbd247
diff --git a/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0 b/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
deleted file mode 100644
index 453e86e7f7af..000000000000
--- a/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lightweight package providing commonly useful parser combinators
-EAPI=8
-HOMEPAGE=https://github.com/mrkkrp/parser-combinators
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:=
-SLOT=0/1.0.0
-SRC_URI=https://hackage.haskell.org/package/parser-combinators-1.0.0/parser-combinators-1.0.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=049697e4f39926b0ff627ae59badb317
diff --git a/metadata/md5-cache/dev-haskell/parser-combinators-1.3.0 b/metadata/md5-cache/dev-haskell/parser-combinators-1.3.0
new file mode 100644
index 000000000000..d1a2a61eabd9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/parser-combinators-1.3.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 >=dev-haskell/hspec-expectations-0.8 <dev-haskell/hspec-expectations-0.9 >=dev-haskell/hspec-megaparsec-2.0 <dev-haskell/hspec-megaparsec-3.0 >=dev-haskell/megaparsec-8.0 <dev-haskell/megaparsec-10.0 >=dev-haskell/megaparsec-tests-8.0 <dev-haskell/megaparsec-tests-10.0 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lightweight package providing commonly useful parser combinators
+EAPI=8
+HOMEPAGE=https://github.com/mrkkrp/parser-combinators
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.6.3:=
+RESTRICT=test !test? ( test )
+SLOT=0/1.3.0
+SRC_URI=https://hackage.haskell.org/package/parser-combinators-1.3.0/parser-combinators-1.3.0.tar.gz https://hackage.haskell.org/package/parser-combinators-tests-1.3.0/parser-combinators-tests-1.3.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f6b2b0e01d935d7f2474c21580d3765a
diff --git a/metadata/md5-cache/dev-haskell/parsers-0.12.10 b/metadata/md5-cache/dev-haskell/parsers-0.12.10
deleted file mode 100644
index 91b988b58023..000000000000
--- a/metadata/md5-cache/dev-haskell/parsers-0.12.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] ) parsec? ( >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/quickcheck dev-haskell/quickcheck-instances ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Parsing combinators
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/parsers/
-INHERIT=haskell-cabal
-IUSE=+attoparsec +parsec doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] ) parsec? ( >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/0.12.10
-SRC_URI=https://hackage.haskell.org/package/parsers-0.12.10/parsers-0.12.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7325cd397b9fea9285eda2aa7fb05a13
diff --git a/metadata/md5-cache/dev-haskell/path-0.7.0 b/metadata/md5-cache/dev-haskell/path-0.7.0
deleted file mode 100644
index fdc2090bcb4c..000000000000
--- a/metadata/md5-cache/dev-haskell/path-0.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/genvalidity-0.8 >=dev-haskell/genvalidity-hspec-0.7 >=dev-haskell/genvalidity-property-0.4 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 dev-haskell/quickcheck >=dev-haskell/validity-0.8.0.0 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Support for well-typed paths
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/path
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.2.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.7.0
-SRC_URI=https://hackage.haskell.org/package/path-0.7.0/path-0.7.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=354970f70e5aa8c5a35b60ed99721367
diff --git a/metadata/md5-cache/dev-haskell/path-0.9.2 b/metadata/md5-cache/dev-haskell/path-0.9.2
new file mode 100644
index 000000000000..161e3144dd1d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/path-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/genvalidity-1.0 >=dev-haskell/genvalidity-hspec-0.7 >=dev-haskell/genvalidity-property-0.4 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 dev-haskell/quickcheck >=dev-haskell/validity-0.8.0.0 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for well-typed paths
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/path
+INHERIT=haskell-cabal
+IUSE=dev doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.6.3:=
+RESTRICT=!test? ( test )
+SLOT=0/0.9.2
+SRC_URI=https://hackage.haskell.org/package/path-0.9.2/path-0.9.2.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=094f60f97950d85fff3af8b009808738
diff --git a/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1 b/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
deleted file mode 100644
index efb23692e8fa..000000000000
--- a/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/path-0.6:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-8.6.1:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Interface to 'directory' package for users of 'path'
-EAPI=7
-HOMEPAGE=https://github.com/mrkkrp/path-io
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/path-0.6:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-8.6.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.6.0
-SRC_URI=https://hackage.haskell.org/package/path-io-1.6.0/path-io-1.6.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=88cb3413d7f49d0ec6c551e276068d62
diff --git a/metadata/md5-cache/dev-haskell/path-io-1.6.3 b/metadata/md5-cache/dev-haskell/path-io-1.6.3
new file mode 100644
index 000000000000..4332b8adfff4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/path-io-1.6.3
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-2.0:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/path-0.6:=[profile?] <dev-haskell/path-0.10:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-3.0.0.0 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interface to 'directory' package for users of 'path'
+EAPI=8
+HOMEPAGE=https://github.com/mrkkrp/path-io
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-2.0:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/path-0.6:=[profile?] <dev-haskell/path-0.10:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-8.8.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.3
+SRC_URI=https://hackage.haskell.org/package/path-io-1.6.3/path-io-1.6.3.tar.gz https://hackage.haskell.org/package/path-io-1.6.3/revision/3.cabal -> path-io-1.6.3.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=eaad14347770a9902251eaad4ec52c5b
diff --git a/metadata/md5-cache/dev-haskell/path-pieces-0.2.1 b/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
index 4f428f01d5e2..a47ba0696f3c 100644
--- a/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
+++ b/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/path-pieces
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.6.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1
 SRC_URI=https://hackage.haskell.org/package/path-pieces-0.2.1/path-pieces-0.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cf1dec02c461cf3704d83a313070991e
+_md5_=cf365ad2474bb526d6e3a1a7d1005155
diff --git a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1 b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
index dfa863bd2873..6c1aec2219d3 100644
--- a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/patience
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/patience-0.1.1/patience-0.1.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b9bdd6b611dc8b2263ba5b17f313b091
+_md5_=1ab7da0399b7b54bd95b178760469d81
diff --git a/metadata/md5-cache/dev-haskell/persistent-2.14.0.3 b/metadata/md5-cache/dev-haskell/persistent-2.14.0.3
index 5e04ec485746..fdef7bf62bc7 100644
--- a/metadata/md5-cache/dev-haskell/persistent-2.14.0.3
+++ b/metadata/md5-cache/dev-haskell/persistent-2.14.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/book/persistent
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/fast-logger-2.4:=[profile?] >=dev-haskell/http-api-data-0.3:=[profile?] >=dev-haskell/lift-type-0.1.0.0:=[profile?] <dev-haskell/lift-type-0.2.0.0:=[profile?] >=dev-haskell/monad-logger-0.3.28:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/resource-pool-0.2.3:=[profile?] >=dev-haskell/resourcet-1.1.10:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/silently:=[profile?] >=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vault:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.14.0.3
 SRC_URI=https://hackage.haskell.org/package/persistent-2.14.0.3/persistent-2.14.0.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=84826550aaae813e5e60bcbf24806a21
+_md5_=8b6f19a1607737a8f04e3fe1bfccca1a
diff --git a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2 b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
deleted file mode 100644
index 4176ec2b0b68..000000000000
--- a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/microlens-th-0.4.1.1:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.0.1:= virtual/libc >=dev-db/sqlite-3.0 >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/exceptions dev-haskell/fast-logger >=dev-haskell/hspec-2.4 dev-haskell/hunit dev-haskell/persistent-template dev-haskell/persistent-test dev-haskell/quickcheck dev-haskell/system-fileio dev-haskell/system-filepath dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Backend for the persistent library using sqlite3
-EAPI=7
-HOMEPAGE=https://www.yesodweb.com/book/persistent
-INHERIT=haskell-cabal
-IUSE=build-sanity-exe doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/microlens-th-0.4.1.1:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.0.1:= virtual/libc >=dev-db/sqlite-3.0
-RESTRICT=!test? ( test )
-SLOT=0/2.10.6.2
-SRC_URI=https://hackage.haskell.org/package/persistent-sqlite-2.10.6.2/persistent-sqlite-2.10.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2d4ce2d5dc9ed7ff598fe4189b943807
diff --git a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.13.1.0 b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.13.1.0
new file mode 100644
index 000000000000..a392838ec46c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.13.1.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/microlens-th-0.4.1.1:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.13.3:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1.9:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= virtual/libc >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/exceptions dev-haskell/fast-logger >=dev-haskell/hspec-2.4 dev-haskell/hunit dev-haskell/microlens dev-haskell/persistent-test dev-haskell/quickcheck dev-haskell/system-fileio dev-haskell/system-filepath dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Backend for the persistent library using sqlite3
+EAPI=8
+HOMEPAGE=https://www.yesodweb.com/book/persistent
+INHERIT=haskell-cabal
+IUSE=build-sanity-exe doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/microlens-th-0.4.1.1:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.13.3:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1.9:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= virtual/libc
+RESTRICT=!test? ( test )
+SLOT=0/2.13.1.0
+SRC_URI=https://hackage.haskell.org/package/persistent-sqlite-2.13.1.0/persistent-sqlite-2.13.1.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1c5b8dadf47fb7dfc6b23a1631900762
diff --git a/metadata/md5-cache/dev-haskell/persistent-template-2.12.0.0 b/metadata/md5-cache/dev-haskell/persistent-template-2.12.0.0
index 41b389c5320e..46b3beffb11b 100644
--- a/metadata/md5-cache/dev-haskell/persistent-template-2.12.0.0
+++ b/metadata/md5-cache/dev-haskell/persistent-template-2.12.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/persistent
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/2.12.0.0
 SRC_URI=https://hackage.haskell.org/package/persistent-template-2.12.0.0/persistent-template-2.12.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6f40271e17d2db76290f3d4cdaffa827
+_md5_=4e828f7064e468dd03cf2613aa20034b
diff --git a/metadata/md5-cache/dev-haskell/persistent-test-2.13.1.3 b/metadata/md5-cache/dev-haskell/persistent-test-2.13.1.3
index 6173eb18a06f..7f7078a7322e 100644
--- a/metadata/md5-cache/dev-haskell/persistent-test-2.13.1.3
+++ b/metadata/md5-cache/dev-haskell/persistent-test-2.13.1.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/book/persistent
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/hspec-2.4:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/http-api-data:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/persistent-2.14:=[profile?] <dev-haskell/persistent-2.15:=[profile?] >=dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/quickcheck-instances-0.3:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.10.1:=
 SLOT=0/2.13.1.3
 SRC_URI=https://hackage.haskell.org/package/persistent-test-2.13.1.3/persistent-test-2.13.1.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b3978fe7053abe695acf2e75d58afd65
+_md5_=fe0468f7d33fcbf691f6c012de11362e
diff --git a/metadata/md5-cache/dev-haskell/pointed-5.0.2 b/metadata/md5-cache/dev-haskell/pointed-5.0.3
index 20ec400afc49..5bffd6b644b3 100644
--- a/metadata/md5-cache/dev-haskell/pointed-5.0.2
+++ b/metadata/md5-cache/dev-haskell/pointed-5.0.3
@@ -1,15 +1,15 @@
-BDEPEND=app-text/dos2unix
+BDEPEND=app-text/dos2unix app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-8.4.3:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pointed and copointed data
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/ekmett/pointed/
 INHERIT=haskell-cabal
-IUSE=+comonad +containers +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers doc hscolour profile
-KEYWORDS=~amd64 ~x86
+IUSE=+comonad +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-SLOT=0/5.0.2
-SRC_URI=https://hackage.haskell.org/package/pointed-5.0.2/pointed-5.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7b73a7b92bd4c2ba4daa06286db97bb2
+RDEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-8.4.3:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
+SLOT=0/5.0.3
+SRC_URI=https://hackage.haskell.org/package/pointed-5.0.3/pointed-5.0.3.tar.gz https://hackage.haskell.org/package/pointed-5.0.3/revision/1.cabal -> pointed-5.0.3.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2fa38b1568209bf8431b8fa9b7233af2
diff --git a/metadata/md5-cache/dev-haskell/pretty-hex-1.0 b/metadata/md5-cache/dev-haskell/pretty-hex-1.0
index 4669576f9691..26a722df4a95 100644
--- a/metadata/md5-cache/dev-haskell/pretty-hex-1.0
+++ b/metadata/md5-cache/dev-haskell/pretty-hex-1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/pretty-hex
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/pretty-hex-1.0/pretty-hex-1.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e5c2d0004eabb5fe29a0cc067375e8f1
+_md5_=b09c4736d68cfcfedc4e501d5cdf0b88
diff --git a/metadata/md5-cache/dev-haskell/profunctors-5.5.1 b/metadata/md5-cache/dev-haskell/profunctors-5.5.1
deleted file mode 100644
index cd1a9a70497c..000000000000
--- a/metadata/md5-cache/dev-haskell/profunctors-5.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Haskell98 profunctors package
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/profunctors/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/5.5.1
-SRC_URI=https://hackage.haskell.org/package/profunctors-5.5.1/profunctors-5.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e742f963f97700d5416bc6702421a958
diff --git a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2 b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
deleted file mode 100644
index aef2b7062897..000000000000
--- a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 dev-haskell/tagged >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Pure priority search queues
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/psqueues
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.2.7.2
-SRC_URI=https://hackage.haskell.org/package/psqueues-0.2.7.2/psqueues-0.2.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=24cca263868c4c7e48226f832b796846
diff --git a/metadata/md5-cache/dev-haskell/puremd5-2.1.3 b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
index ec24a50e59d5..441ef56902fc 100644
--- a/metadata/md5-cache/dev-haskell/puremd5-2.1.3
+++ b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/pureMD5
 INHERIT=haskell-cabal
 IUSE=test doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profile?] dev-haskell/crypto-api:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/2.1.3
 SRC_URI=https://hackage.haskell.org/package/pureMD5-2.1.3/pureMD5-2.1.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=442ee08a2f0954232dfaeaef4ebde133
+_md5_=850f9752ec4b41848f84c30ab901c5f3
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.13.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
deleted file mode 100644
index 3d5733ba6c1e..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=7
-HOMEPAGE=https://github.com/nick8325/quickcheck
-INHERIT=haskell-cabal
-IUSE=+template-haskell doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=2/2.13.2
-SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.13.2/QuickCheck-2.13.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7d55758f6bd509697ce0bfe6a7f19c50
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22 b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
deleted file mode 100644
index 8f76b32c2bfa..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-compat-0.9.3:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/hashable-1.2.5.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.13.2:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?] >=dev-haskell/scientific-0.2.0.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.1:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Common quickcheck instances
-EAPI=7
-HOMEPAGE=https://github.com/phadej/qc-instances
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-compat-0.9.3:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/hashable-1.2.5.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.13.2:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?] >=dev-haskell/scientific-0.2.0.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.1:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.22
-SRC_URI=https://hackage.haskell.org/package/quickcheck-instances-0.3.22/quickcheck-instances-0.3.22.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fe1e3479593a777a6d4bd8c165836914
diff --git a/metadata/md5-cache/dev-haskell/readable-0.3.1 b/metadata/md5-cache/dev-haskell/readable-0.3.1
index 8b508cc20bd6..552b4abe7bb1 100644
--- a/metadata/md5-cache/dev-haskell/readable-0.3.1
+++ b/metadata/md5-cache/dev-haskell/readable-0.3.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mightybyte/readable
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/readable-0.3.1/readable-0.3.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=70f1d8d7643abfb9e85d4042bc9c9c47
+_md5_=8e35937d0b7687826ad6f87c29192356
diff --git a/metadata/md5-cache/dev-haskell/rebase-1.15.0.3 b/metadata/md5-cache/dev-haskell/rebase-1.15.0.3
index b5011a1b96f1..468034cfe355 100644
--- a/metadata/md5-cache/dev-haskell/rebase-1.15.0.3
+++ b/metadata/md5-cache/dev-haskell/rebase-1.15.0.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/nikita-volkov/rebase
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/bifunctors-5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-5.1:=[profile?] >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-1.1:=[profile?] >=dev-haskell/either-5:=[profile?] <dev-haskell/either-5.1:=[profile?] >=dev-haskell/groups-0.5.3:=[profile?] <dev-haskell/groups-0.6:=[profile?] >=dev-haskell/hashable-1.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/invariant-0.5.5:=[profile?] <dev-haskell/invariant-0.6:=[profile?] >=dev-haskell/profunctors-5.6:=[profile?] <dev-haskell/profunctors-5.7:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/selective-0.5:=[profile?] <dev-haskell/selective-0.6:=[profile?] >=dev-haskell/semigroupoids-5.3:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] >=dev-haskell/stm-2.5:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/time-compat-1.9.6.1:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.13:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-instances-3.4:=[profile?] <dev-haskell/vector-instances-3.5:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-8.8.1:=
 SLOT=0/1.15.0.3
 SRC_URI=https://hackage.haskell.org/package/rebase-1.15.0.3/rebase-1.15.0.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1fe74b1174cbcfbc78d7dfb661f59411
+_md5_=d293d17caad92b45c4bb27ad4b2de75e
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1
index 16a6b5af45c0..2e07220d1858 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.haskell.org/Regular_expressions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.95.2.1
 SRC_URI=https://hackage.haskell.org/package/regex-compat-0.95.2.1/regex-compat-0.95.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8c1230ae8c4ea399eb8a9c67e9d648c8
+_md5_=24846268c0e71c045d3c2fe74cf1dac2
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4 b/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
index 6027230d853b..083fcd1aa775 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
+++ b/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unicode Support version of Text.Regex, using regex-tdfa
 EAPI=7
-HOMEPAGE=http://hub.darcs.net/shelarcy/regex-compat-tdfa
+HOMEPAGE=https://hub.darcs.net/shelarcy/regex-compat-tdfa
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -12,4 +12,4 @@ RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.0
 SLOT=0/0.95.1.4
 SRC_URI=https://hackage.haskell.org/package/regex-compat-tdfa-0.95.1.4/regex-compat-tdfa-0.95.1.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4cff680c7405ee23df7cce3a7df769be
+_md5_=6173bce5e871c8e5b79216627c489ed0
diff --git a/metadata/md5-cache/dev-haskell/rerebase-1.15.0.3 b/metadata/md5-cache/dev-haskell/rerebase-1.15.0.3
index ca0513d0e010..54782afb8a9d 100644
--- a/metadata/md5-cache/dev-haskell/rerebase-1.15.0.3
+++ b/metadata/md5-cache/dev-haskell/rerebase-1.15.0.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/nikita-volkov/rerebase
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=~dev-haskell/rebase-1.15.0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.15.0.3
 SRC_URI=https://hackage.haskell.org/package/rerebase-1.15.0.3/rerebase-1.15.0.3.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9f3bcad25420aa8624146cf0f343108a
+_md5_=d7e09ee04991bdf0e5757d6fc3244901
diff --git a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0-r1 b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0-r1
index 1e10c249b3c5..9a2786141f45 100644
--- a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0-r1
+++ b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/resolv
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-haskell/base16-bytestring-0.1:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=test
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/resolv-0.1.2.0/resolv-0.1.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e0f76ef497e670ee69d611888b12f681
+_md5_=32d249d1fc2437aab9341b03a6da90b6
diff --git a/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2 b/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
index 356dda59793c..401b1d328407 100644
--- a/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
+++ b/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/pool
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3.2
 SRC_URI=https://hackage.haskell.org/package/resource-pool-0.2.3.2/resource-pool-0.2.3.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=63b7d26895cc350b7c8ea6d5f5c0d976
+_md5_=e5b78d42a1f86951497d13c96d4c0554
diff --git a/metadata/md5-cache/dev-haskell/rio-0.1.21.0 b/metadata/md5-cache/dev-haskell/rio-0.1.21.0
index a42c7ea11555..f93277dff10b 100644
--- a/metadata/md5-cache/dev-haskell/rio-0.1.21.0
+++ b/metadata/md5-cache/dev-haskell/rio-0.1.21.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/commercialhaskell/rio#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/hashable:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/microlens-mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/typed-process-0.2.5.0:=[profile?] >=dev-haskell/unliftio-0.2.14:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.21.0
 SRC_URI=https://hackage.haskell.org/package/rio-0.1.21.0/rio-0.1.21.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=76dcdd6a40aee3dc4ebf76fd7993f958
+_md5_=75b78d24696e191142d7b7f1fadbcaed
diff --git a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1 b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
index 4efdabd2c789..b7f8b26e9b8c 100644
--- a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
+++ b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ChrisKuklewicz/SafeSemaphore
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.1
 SRC_URI=https://hackage.haskell.org/package/SafeSemaphore-0.10.1/SafeSemaphore-0.10.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=204788e08ba8fb1419d4b005c93ec6c0
+_md5_=e05d8a990b386c9f48aaded4949aab97
diff --git a/metadata/md5-cache/dev-haskell/sandi-0.5 b/metadata/md5-cache/dev-haskell/sandi-0.5
index fbaea522d0d6..eccd218429bf 100644
--- a/metadata/md5-cache/dev-haskell/sandi-0.5
+++ b/metadata/md5-cache/dev-haskell/sandi-0.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/sandi
 INHERIT=haskell-cabal
 IUSE=+conduit doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= conduit? ( >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.5
 SRC_URI=https://hackage.haskell.org/package/sandi-0.5/sandi-0.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=06574ea4e076e29606eaaed4f64d38a8
+_md5_=d8c8365336788668eca34c4cefeb2e88
diff --git a/metadata/md5-cache/dev-haskell/securemem-0.1.10 b/metadata/md5-cache/dev-haskell/securemem-0.1.10
index f3cc01c65109..c0bde4a25b2b 100644
--- a/metadata/md5-cache/dev-haskell/securemem-0.1.10
+++ b/metadata/md5-cache/dev-haskell/securemem-0.1.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/vincenthz/hs-securemem
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.10
 SRC_URI=https://hackage.haskell.org/package/securemem-0.1.10/securemem-0.1.10.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=252ffbd1c262af252849a42162ae6cb7
+_md5_=ee062a663ff355c244b004faff164f25
diff --git a/metadata/md5-cache/dev-haskell/selective-0.5 b/metadata/md5-cache/dev-haskell/selective-0.5
index f5b7487a5783..386a74cbcde8 100644
--- a/metadata/md5-cache/dev-haskell/selective-0.5
+++ b/metadata/md5-cache/dev-haskell/selective-0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/snowleopard/selective
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5
 SRC_URI=https://hackage.haskell.org/package/selective-0.5/selective-0.5.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bac780ecbefec461e8a83e941005da72
+_md5_=3a80c3709d8a6d7aefd03ea88f1e186e
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4 b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
deleted file mode 100644
index f6ce63d07c8b..000000000000
--- a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Semigroupoids: Category sans id
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/semigroupoids
-INHERIT=haskell-cabal
-IUSE=+contravariant +distributive +tagged +unordered-containers doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-RESTRICT=test
-SLOT=0/5.3.4
-SRC_URI=https://hackage.haskell.org/package/semigroupoids-5.3.4/semigroupoids-5.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6a1c1958caf8fda5f4b70a7109a63c07
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.18.5 b/metadata/md5-cache/dev-haskell/semigroups-0.18.5
deleted file mode 100644
index ce5a31868d35..000000000000
--- a/metadata/md5-cache/dev-haskell/semigroups-0.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Anything that associates
-EAPI=8
-HOMEPAGE=https://github.com/ekmett/semigroups/
-INHERIT=haskell-cabal
-IUSE=+binary +transformers doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-SLOT=0/0.18.5
-SRC_URI=https://hackage.haskell.org/package/semigroups-0.18.5/semigroups-0.18.5.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a4eb5f67234a85bcb917d91dedf4579d
diff --git a/metadata/md5-cache/dev-haskell/semirings-0.5.4 b/metadata/md5-cache/dev-haskell/semirings-0.5.4
deleted file mode 100644
index 2f838d23aad4..000000000000
--- a/metadata/md5-cache/dev-haskell/semirings-0.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/base-compat-batteries:=[profile?] >=dev-lang/ghc-7.10.1:=[gmp] hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) ) >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=two monoids as one, in holy haskimony
-EAPI=7
-HOMEPAGE=https://github.com/chessai/semirings
-INHERIT=haskell-cabal
-IUSE=+containers +hashable +unordered-containers doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/base-compat-batteries:=[profile?] >=dev-lang/ghc-7.10.1:=[gmp] hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-SLOT=0/0.5.4
-SRC_URI=https://hackage.haskell.org/package/semirings-0.5.4/semirings-0.5.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=500fd11d949ae935518ec9eaf70519f0
diff --git a/metadata/md5-cache/dev-haskell/semirings-0.6 b/metadata/md5-cache/dev-haskell/semirings-0.6
new file mode 100644
index 000000000000..0f78a4ffe7d0
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/semirings-0.6
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/base-compat-batteries:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=two monoids as one, in holy haskimony
+EAPI=8
+HOMEPAGE=https://github.com/chessai/semirings
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/base-compat-batteries:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/0.6
+SRC_URI=https://hackage.haskell.org/package/semirings-0.6/semirings-0.6.tar.gz https://hackage.haskell.org/package/semirings-0.6/revision/1.cabal -> semirings-0.6.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4d013d4e8d824bc29559100e64fb6d74
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.30 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.30
index 70bc6b5bec90..d4ce90aacc16 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-2.0.30
+++ b/metadata/md5-cache/dev-haskell/shakespeare-2.0.30
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=<dev-haskell/aeson-3:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] >=dev-haskell/file-embed-0.0.1:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.30
 SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.30/shakespeare-2.0.30.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9309a3104ddce237f4321abe0fa449bc
+_md5_=fc79d3ac9fc41d343c6cb6ea9fc083c2
diff --git a/metadata/md5-cache/dev-haskell/skein-1.0.9.4 b/metadata/md5-cache/dev-haskell/skein-1.0.9.4
index f21146ad711f..64833704b1b5 100644
--- a/metadata/md5-cache/dev-haskell/skein-1.0.9.4
+++ b/metadata/md5-cache/dev-haskell/skein-1.0.9.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/meteficha/skein
 INHERIT=haskell-cabal
 IUSE=big-endian force-endianness reference doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.9.4
 SRC_URI=https://hackage.haskell.org/package/skein-1.0.9.4/skein-1.0.9.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bd6bf2e0acdf57b8e4379f69b49fe956
+_md5_=a7ad315aee32f9808383094f384b0b92
diff --git a/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2 b/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
deleted file mode 100644
index b4fb62431e51..000000000000
--- a/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.2.0.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Snap: A Haskell Web Framework (core interfaces and types)
-EAPI=7
-HOMEPAGE=http://snapframework.com/
-INHERIT=haskell-cabal
-IUSE=debug portable doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.2.0.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
-RESTRICT=test
-SLOT=0/1.0.4.2
-SRC_URI=https://hackage.haskell.org/package/snap-core-1.0.4.2/snap-core-1.0.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1ab1b53a7fda967bbd301149a54b7ae5
diff --git a/metadata/md5-cache/dev-haskell/snap-core-1.0.5.0 b/metadata/md5-cache/dev-haskell/snap-core-1.0.5.0
new file mode 100644
index 000000000000..1e79f6edf7bb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/snap-core-1.0.5.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/hashable-1.2.0.6:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Snap: A Haskell Web Framework (core interfaces and types)
+EAPI=8
+HOMEPAGE=https://snapframework.com/
+INHERIT=haskell-cabal
+IUSE=debug doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/hashable-1.2.0.6:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.5.0
+SRC_URI=https://hackage.haskell.org/package/snap-core-1.0.5.0/snap-core-1.0.5.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e452bf01d6418eb481b3b8e767fa5082
diff --git a/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2 b/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
deleted file mode 100644
index 52070ff8177a..000000000000
--- a/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.6.2:= openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2 >=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9 >=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1 >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/random-1.0 <dev-haskell/random-1.2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/threads-0.5 <dev-haskell/threads-0.6 >=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A fast, iteratee-based, epoll-enabled web server for the Snap Framework
-EAPI=7
-HOMEPAGE=http://snapframework.com/
-INHERIT=haskell-cabal
-IUSE=build-pong debug openssl portable doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.6.2:= openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.1.1.2
-SRC_URI=https://hackage.haskell.org/package/snap-server-1.1.1.2/snap-server-1.1.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a77da2aa3aaa5c33accb238adf3d439b
diff --git a/metadata/md5-cache/dev-haskell/snap-server-1.1.2.0 b/metadata/md5-cache/dev-haskell/snap-server-1.1.2.0
new file mode 100644
index 000000000000..42e52c201fed
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/snap-server-1.1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A web server for the Snap Framework
+EAPI=8
+HOMEPAGE=http://snapframework.com/
+INHERIT=haskell-cabal
+IUSE=debug openssl pong-server test-server doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
+RESTRICT=test
+SLOT=0/1.1.2.0
+SRC_URI=https://hackage.haskell.org/package/snap-server-1.1.2.0/snap-server-1.1.2.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fc661338b5bca6344f5f36442a588671
diff --git a/metadata/md5-cache/dev-haskell/statistics-0.15.2.0 b/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
index 9bcee947b212..c48bf9d0bf24 100644
--- a/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
+++ b/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/statistics
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/async-2.2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/base-orphans-0.6:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/data-default-class-0.1.2:=[profile?] >=dev-haskell/dense-linear-algebra-0.1:=[profile?] <dev-haskell/dense-linear-algebra-0.2:=[profile?] >=dev-haskell/math-functions-0.3:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15.2.0
 SRC_URI=https://hackage.haskell.org/package/statistics-0.15.2.0/statistics-0.15.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fdb24bd02632a1304d51070a9b9cda1
+_md5_=538d32d781bbc0eb986ab79aeff919f8
diff --git a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4 b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
index 3fe1b536104d..194d486ac98b 100644
--- a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
+++ b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://code.haskell.org/~wren/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/3.0.0.4
 SRC_URI=https://hackage.haskell.org/package/stm-chans-3.0.0.4/stm-chans-3.0.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=520da41578af7a9c39796c7c43bf196c
+_md5_=7a8ffc0cf438cf569178dab0635f52fe
diff --git a/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4 b/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
index 99bc6d28cc38..5708f05ed68c 100644
--- a/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
+++ b/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fpco/haskell-filesystem
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.16.4
 SRC_URI=https://hackage.haskell.org/package/system-fileio-0.3.16.4/system-fileio-0.3.16.4.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dabfc72b776e6a8eb9c5046a7d17a993
+_md5_=c6e068e6a5b75d44c25fc032d24776e5
diff --git a/metadata/md5-cache/dev-haskell/system-filepath-0.4.14 b/metadata/md5-cache/dev-haskell/system-filepath-0.4.14-r1
index 333ea3098a5c..dcc428fb376a 100644
--- a/metadata/md5-cache/dev-haskell/system-filepath-0.4.14
+++ b/metadata/md5-cache/dev-haskell/system-filepath-0.4.14-r1
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-0.11.0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=High-level, byte-based file and directory path manipulations (deprecated)
 EAPI=8
 HOMEPAGE=https://github.com/fpco/haskell-filesystem
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+RDEPEND=>=dev-haskell/text-0.11.0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.4.14
 SRC_URI=https://hackage.haskell.org/package/system-filepath-0.4.14/system-filepath-0.4.14.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1ad5c9025086be3e1045cf4f3e6f7eb4
+_md5_=c10cf64c6a4ff3e17bfd8edf47fae496
diff --git a/metadata/md5-cache/dev-haskell/tar-0.5.1.1-r2 b/metadata/md5-cache/dev-haskell/tar-0.5.1.1-r2
index f536c51f9986..95f505d11d0c 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.5.1.1-r2
+++ b/metadata/md5-cache/dev-haskell/tar-0.5.1.1-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/tar
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/0.5.1.1
 SRC_URI=https://hackage.haskell.org/package/tar-0.5.1.1/tar-0.5.1.1.tar.gz https://hackage.haskell.org/package/tar-0.5.1.1/revision/4.cabal -> tar-0.5.1.1-rev4.cabal
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6e5b1a4b00e2f88a510ce544ae314601
+_md5_=4b84b7e5a1e54ee5bf31800a7527566e
diff --git a/metadata/md5-cache/dev-haskell/tasty-lua-0.2.3.1 b/metadata/md5-cache/dev-haskell/tasty-lua-0.2.3.1
deleted file mode 100644
index 5fddcfd03021..000000000000
--- a/metadata/md5-cache/dev-haskell/tasty-lua-0.2.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.4:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Write tests in Lua, integrate into tasty
-EAPI=7
-HOMEPAGE=https://github.com/hslua/tasty-lua
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.4:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.2.3.1
-SRC_URI=https://hackage.haskell.org/package/tasty-lua-0.2.3.1/tasty-lua-0.2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3c4f0fd39d2524ec21a5bfed104a9eb8
diff --git a/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17 b/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.18
index d32ba79b57f7..f5c7c379b059 100644
--- a/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
+++ b/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.18
@@ -1,15 +1,15 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Run tests by filtering the tests depending on the result of previous runs
+DEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Rerun only tests which failed in a previous test run
 EAPI=7
 HOMEPAGE=https://github.com/ocharles/tasty-rerun
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/1.1.17
-SRC_URI=https://hackage.haskell.org/package/tasty-rerun-1.1.17/tasty-rerun-1.1.17.tar.gz
+RDEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.1.18
+SRC_URI=https://hackage.haskell.org/package/tasty-rerun-1.1.18/tasty-rerun-1.1.18.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=207eb95819dad130131da880d521cfc9
+_md5_=c9a94db1e2e57ad79fe567ae3f8a9d0e
diff --git a/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4 b/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
index 9bb08ca3f8a4..e725f8501d87 100644
--- a/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
+++ b/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/nikita-volkov/template-haskell-compat-v0208
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.6.2:=
 SLOT=0/0.1.4
 SRC_URI=https://hackage.haskell.org/package/template-haskell-compat-v0208-0.1.4/template-haskell-compat-v0208-0.1.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=125795c6db0b41154dfdc6470ec34b87
+_md5_=c9c247221bec0eea277a52b0812a2d56
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4 b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
index 87ffc5fc68ce..27b9683a7256 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/finnsson/test-generator
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/test-framework-th-0.2.4/test-framework-th-0.2.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=aa515fed92f139a4e05d28cc6c2c2081
+_md5_=17525b427a5aa3455d601b5ee2f95439
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.12.2 b/metadata/md5-cache/dev-haskell/texmath-0.12.2
deleted file mode 100644
index 5ac94dac51d3..000000000000
--- a/metadata/md5-cache/dev-haskell/texmath-0.12.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] >=dev-haskell/parsec-3:=[profile?] >=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?] dev-haskell/text:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-8.4.3:= executable? ( dev-haskell/aeson:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) ) >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/temporary dev-haskell/utf8-string ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between formats used to represent mathematics
-EAPI=7
-HOMEPAGE=https://github.com/jgm/texmath
-INHERIT=haskell-cabal
-IUSE=executable +network-uri doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] >=dev-haskell/parsec-3:=[profile?] >=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?] dev-haskell/text:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-8.4.3:= executable? ( dev-haskell/aeson:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-RESTRICT=!test? ( test )
-SLOT=0/0.12.2
-SRC_URI=https://hackage.haskell.org/package/texmath-0.12.2/texmath-0.12.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=eb35d84bfd437606dd92999acc840301
diff --git a/metadata/md5-cache/dev-haskell/text-short-0.1.3 b/metadata/md5-cache/dev-haskell/text-short-0.1.3
deleted file mode 100644
index 428fe202b939..000000000000
--- a/metadata/md5-cache/dev-haskell/text-short-0.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-instances-0.3.14 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tasty-1.0.0 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.10.0 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Memory-efficient representation of Unicode text strings
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/text-short
-INHERIT=haskell-cabal
-IUSE=asserts doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1.3
-SRC_URI=https://hackage.haskell.org/package/text-short-0.1.3/text-short-0.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=872f8aa09e5b72a0c22f7c806b7fff1c
diff --git a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14 b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
deleted file mode 100644
index d991e7b7d5e0..000000000000
--- a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/text:=[profile?] >=dev-haskell/th-lift-0.8:=[profile?] >=dev-haskell/vector-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/nats-1.1.2 <dev-haskell/nats-1.2 >=dev-haskell/quickcheck-2.6 >=dev-haskell/semigroups-0.18.5 <dev-haskell/semigroups-0.19 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lift instances for template-haskell for common data types
-EAPI=7
-HOMEPAGE=https://github.com/bennofs/th-lift-instances/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/text:=[profile?] >=dev-haskell/th-lift-0.8:=[profile?] >=dev-haskell/vector-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1.14
-SRC_URI=https://hackage.haskell.org/package/th-lift-instances-0.1.14/th-lift-instances-0.1.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8485a4e5494a745f3545d7f4196fc957
diff --git a/metadata/md5-cache/dev-haskell/th-orphans-0.13.10 b/metadata/md5-cache/dev-haskell/th-orphans-0.13.10
deleted file mode 100644
index 599e669428a8..000000000000
--- a/metadata/md5-cache/dev-haskell/th-orphans-0.13.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Orphan instances for TH datatypes
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/th-orphans
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.13.10
-SRC_URI=https://hackage.haskell.org/package/th-orphans-0.13.10/th-orphans-0.13.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6209eb0d92ff1b17ea3803ff611bf147
diff --git a/metadata/md5-cache/dev-haskell/th-orphans-0.13.13 b/metadata/md5-cache/dev-haskell/th-orphans-0.13.13
new file mode 100644
index 000000000000..6a82e0c03deb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-orphans-0.13.13
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/th-compat-0.1:=[profile?] <dev-haskell/th-compat-0.2:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for TH datatypes
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/th-orphans
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/th-compat-0.1:=[profile?] <dev-haskell/th-compat-0.2:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/0.13.13
+SRC_URI=https://hackage.haskell.org/package/th-orphans-0.13.13/th-orphans-0.13.13.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=65d484593af8ff518fd5e221b86b5a49
diff --git a/metadata/md5-cache/dev-haskell/time-compat-1.9.3 b/metadata/md5-cache/dev-haskell/time-compat-1.9.3
deleted file mode 100644
index 394e390d24e1..000000000000
--- a/metadata/md5-cache/dev-haskell/time-compat-1.9.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=This packages tries to compat as much of \'time\' features as possible
-EAPI=7
-HOMEPAGE=https://github.com/phadej/time-compat
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/1.9.3
-SRC_URI=https://hackage.haskell.org/package/time-compat-1.9.3/time-compat-1.9.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=775bd61a961a037ceaf703c5acd1237c
diff --git a/metadata/md5-cache/dev-haskell/torrent-10000.1.1 b/metadata/md5-cache/dev-haskell/torrent-10000.1.1
index 69e5d7aa14aa..dd3ba8a5dbd1 100644
--- a/metadata/md5-cache/dev-haskell/torrent-10000.1.1
+++ b/metadata/md5-cache/dev-haskell/torrent-10000.1.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/torrent
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/10000.1.1
 SRC_URI=https://hackage.haskell.org/package/torrent-10000.1.1/torrent-10000.1.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ecabb7d95d7ec4bf151e3a496e445032
+_md5_=2d494a7dc394ab166d2472ed1899ccce
diff --git a/metadata/md5-cache/dev-haskell/trifecta-2.1 b/metadata/md5-cache/dev-haskell/trifecta-2.1
deleted file mode 100644
index 6751437b1980..000000000000
--- a/metadata/md5-cache/dev-haskell/trifecta-2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?] >=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?] >=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2:=[profile?] >=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?] >=dev-haskell/profunctors-4.0:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reducers-3.10:=[profile?] <dev-haskell/reducers-4:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A modern parser combinator library with convenient diagnostics
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/trifecta/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?] >=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?] >=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2:=[profile?] >=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?] >=dev-haskell/profunctors-4.0:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reducers-3.10:=[profile?] <dev-haskell/reducers-4:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/2.1
-SRC_URI=https://hackage.haskell.org/package/trifecta-2.1/trifecta-2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=10714e3cdffa7e5dfd1a1b9c9bc614ef
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
deleted file mode 100644
index 93e490c9ab45..000000000000
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-lang/ghc-7.8.2:= hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Efficient hashing-based container types
-EAPI=7
-HOMEPAGE=https://github.com/haskell-unordered-containers/unordered-containers
-INHERIT=haskell-cabal
-IUSE=debug doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/0.2.12.0
-SRC_URI=https://hackage.haskell.org/package/unordered-containers-0.2.12.0/unordered-containers-0.2.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5fdd0f41583f67d8f8f88acf550d548f
diff --git a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2 b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
index 2cd5f4100a2e..3a7f55cc22ec 100644
--- a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
+++ b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/utf8-light
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.2
 SRC_URI=https://hackage.haskell.org/package/utf8-light-0.4.2/utf8-light-0.4.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=28159c50d123dedd82cf8995212aa031
+_md5_=7bcb02bd0abda8951ef18e638cf5b4a5
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.3.15 b/metadata/md5-cache/dev-haskell/uuid-1.3.15
index 5c7e93e31cba..a6fcacc89a76 100644
--- a/metadata/md5-cache/dev-haskell/uuid-1.3.15
+++ b/metadata/md5-cache/dev-haskell/uuid-1.3.15
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-hvr/uuid
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12:=[profile?] >=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] <dev-haskell/entropy-0.5:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.0.6:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
 RESTRICT=test
 SLOT=0/1.3.15
 SRC_URI=https://hackage.haskell.org/package/uuid-1.3.15/uuid-1.3.15.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6aa1c471c35936c8c34114a69cf1830a
+_md5_=f4d77f8d0506bb9dd5be2d8ef91aef8b
diff --git a/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1 b/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
deleted file mode 100644
index b5a25c9886ca..000000000000
--- a/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Type definitions for Universally Unique Identifiers
-EAPI=7
-HOMEPAGE=https://github.com/aslatter/uuid
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-RESTRICT=!test? ( test )
-SLOT=0/1.0.3
-SRC_URI=https://hackage.haskell.org/package/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6f85542da3b5f5a78f04097de2868332
diff --git a/metadata/md5-cache/dev-haskell/validity-0.12.0.0 b/metadata/md5-cache/dev-haskell/validity-0.12.0.0
new file mode 100644
index 000000000000..5107ee7d9e53
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/validity-0.12.0.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-3.0.0.0 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Validity typeclass
+EAPI=8
+HOMEPAGE=https://github.com/NorfairKing/validity#readme
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-8.8.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.12.0.0
+SRC_URI=https://hackage.haskell.org/package/validity-0.12.0.0/validity-0.12.0.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=027b6cab79f89532346d3112b7f2f6c6
diff --git a/metadata/md5-cache/dev-haskell/validity-0.9.0.3 b/metadata/md5-cache/dev-haskell/validity-0.9.0.3
deleted file mode 100644
index 87b46c230562..000000000000
--- a/metadata/md5-cache/dev-haskell/validity-0.9.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Validity typeclass
-EAPI=7
-HOMEPAGE=https://github.com/NorfairKing/validity#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.9.0.3
-SRC_URI=https://hackage.haskell.org/package/validity-0.9.0.3/validity-0.9.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=58201b194b4eaf56be4603953323923c
diff --git a/metadata/md5-cache/dev-haskell/vault-0.3.1.4 b/metadata/md5-cache/dev-haskell/vault-0.3.1.4
deleted file mode 100644
index ec263ace805c..000000000000
--- a/metadata/md5-cache/dev-haskell/vault-0.3.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
-DESCRIPTION=a persistent store for values of arbitrary types
-EAPI=7
-HOMEPAGE=https://github.com/HeinrichApfelmus/vault
-INHERIT=haskell-cabal
-IUSE=doc profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.3.1.4
-SRC_URI=https://hackage.haskell.org/package/vault-0.3.1.4/vault-0.3.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=75becc646b0ca2924dd7836d73053389
diff --git a/metadata/md5-cache/dev-haskell/vector-0.12.1.2 b/metadata/md5-cache/dev-haskell/vector-0.12.1.2
deleted file mode 100644
index 32d7fdaae7f0..000000000000
--- a/metadata/md5-cache/dev-haskell/vector-0.12.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Efficient Arrays
-EAPI=7
-HOMEPAGE=https://github.com/haskell/vector
-INHERIT=haskell-cabal
-IUSE=+boundschecks internalchecks unsafechecks doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/0.12.1.2
-SRC_URI=https://hackage.haskell.org/package/vector-0.12.1.2/vector-0.12.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3f0e73ac73cbf229d4e23f50aa527d59
diff --git a/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3 b/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
deleted file mode 100644
index 7ad474f784cd..000000000000
--- a/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Efficient algorithms for vector arrays
-EAPI=7
-HOMEPAGE=https://github.com/erikd/vector-algorithms/
-INHERIT=haskell-cabal
-IUSE=+bench +boundschecks internalchecks +properties unsafechecks doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8.0.3
-SRC_URI=https://hackage.haskell.org/package/vector-algorithms-0.8.0.3/vector-algorithms-0.8.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=35d279425b04965bd94c21e48ff1434d
diff --git a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1 b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
index cb3207633280..742404db00d0 100644
--- a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
+++ b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/vector-binary-instances
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.5.1
 SRC_URI=https://hackage.haskell.org/package/vector-binary-instances-0.2.5.1/vector-binary-instances-0.2.5.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ff6a327168f412854abbb77845613054
+_md5_=02ee58bbcb6e9318beee62928beb9b2d
diff --git a/metadata/md5-cache/dev-haskell/vector-builder-0.3.8 b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
deleted file mode 100644
index 43ef96c688eb..000000000000
--- a/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/attoparsec-0.13 <dev-haskell/attoparsec-0.14 >=dev-haskell/quickcheck-2.8.1 <dev-haskell/quickcheck-3 >=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.4 <dev-haskell/rerebase-2 >=dev-haskell/tasty-0.12 <dev-haskell/tasty-2 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Vector builder
-EAPI=7
-HOMEPAGE=https://github.com/nikita-volkov/vector-builder
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.8
-SRC_URI=https://hackage.haskell.org/package/vector-builder-0.3.8/vector-builder-0.3.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5150f6334fab9f3e3d4a7537475dfd8d
diff --git a/metadata/md5-cache/dev-haskell/vector-builder-0.3.8.3 b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8.3
new file mode 100644
index 000000000000..18b099cc5d9b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8.3
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/attoparsec-0.13 <dev-haskell/attoparsec-0.15 >=dev-haskell/quickcheck-2.8.1 <dev-haskell/quickcheck-3 >=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.4 <dev-haskell/rerebase-2 >=dev-haskell/tasty-0.12 <dev-haskell/tasty-2 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Vector builder
+EAPI=8
+HOMEPAGE=https://github.com/nikita-volkov/vector-builder
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.8.3
+SRC_URI=https://hackage.haskell.org/package/vector-builder-0.3.8.3/vector-builder-0.3.8.3.tar.gz https://hackage.haskell.org/package/vector-builder-0.3.8.3/revision/1.cabal -> vector-builder-0.3.8.3-rev1.cabal
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4aa71dae72eada19b44f500190b1eeb6
diff --git a/metadata/md5-cache/dev-haskell/vector-instances-3.4 b/metadata/md5-cache/dev-haskell/vector-instances-3.4
index 10046de462f1..f708a0c9d05a 100644
--- a/metadata/md5-cache/dev-haskell/vector-instances-3.4
+++ b/metadata/md5-cache/dev-haskell/vector-instances-3.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/vector-instances
 INHERIT=haskell-cabal
 IUSE=+hashable doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1.1.0:=[profile?] )
 SLOT=0/3.4
 SRC_URI=https://hackage.haskell.org/package/vector-instances-3.4/vector-instances-3.4.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a72e7c4cd5ccac18a4a4d5f406aeb454
+_md5_=c1851557afffaf9c58cb274eac6fd5ab
diff --git a/metadata/md5-cache/dev-haskell/wreq-0.5.3.2 b/metadata/md5-cache/dev-haskell/wreq-0.5.3.3
index 5056767cb1bb..07a0e501c6e9 100644
--- a/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
+++ b/metadata/md5-cache/dev-haskell/wreq-0.5.3.3
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-1.0.0.0:=[profile?] >=dev-haskell/attoparsec-0.11.1.0:=[profile?] >=dev-haskell/authenticate-oauth-1.5:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/lens-4.5:=[profile?] dev-haskell/lens-aeson:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mime-types:=[profile?] >=dev-haskell/psqueues-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:= httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/snap-core-1.0.0.0:=[profile?] >=dev-haskell/snap-server-0.9.4.4:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/uuid:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 >=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1 test? ( dev-haskell/doctest dev-haskell/hunit dev-haskell/network-info >=dev-haskell/quickcheck-2.7 dev-haskell/temporary dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 dev-haskell/vector !httpbin? ( >=dev-haskell/aeson-pretty-0.8.0 dev-haskell/base64-bytestring >=dev-haskell/snap-core-1.0.0.0 >=dev-haskell/snap-server-0.9.4.4 dev-haskell/unix-compat dev-haskell/uuid ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.7.0.3:=[profile?] >=dev-haskell/attoparsec-0.11.1.0:=[profile?] >=dev-haskell/authenticate-oauth-1.5:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/lens-4.5:=[profile?] dev-haskell/lens-aeson:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mime-types:=[profile?] >=dev-haskell/psqueues-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/snap-core-1.0.0.0:=[profile?] >=dev-haskell/snap-server-0.9.4.4:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/uuid:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 >=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1 test? ( dev-haskell/doctest dev-haskell/hunit dev-haskell/network-info >=dev-haskell/quickcheck-2.7 dev-haskell/temporary dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 dev-haskell/vector !httpbin? ( >=dev-haskell/aeson-pretty-0.8.0 dev-haskell/base64-bytestring >=dev-haskell/snap-core-1.0.0.0 >=dev-haskell/snap-server-0.9.4.4 dev-haskell/unix-compat dev-haskell/uuid ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An easy-to-use HTTP client library
 EAPI=7
-HOMEPAGE=http://www.serpentine.com/wreq
+HOMEPAGE=http://www.serpentine.com/wreq/
 INHERIT=haskell-cabal
 IUSE=aws httpbin doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-1.0.0.0:=[profile?] >=dev-haskell/attoparsec-0.11.1.0:=[profile?] >=dev-haskell/authenticate-oauth-1.5:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/lens-4.5:=[profile?] dev-haskell/lens-aeson:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mime-types:=[profile?] >=dev-haskell/psqueues-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:= httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/snap-core-1.0.0.0:=[profile?] >=dev-haskell/snap-server-0.9.4.4:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/uuid:=[profile?] )
+RDEPEND=>=dev-haskell/aeson-0.7.0.3:=[profile?] >=dev-haskell/attoparsec-0.11.1.0:=[profile?] >=dev-haskell/authenticate-oauth-1.5:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/lens-4.5:=[profile?] dev-haskell/lens-aeson:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mime-types:=[profile?] >=dev-haskell/psqueues-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/snap-core-1.0.0.0:=[profile?] >=dev-haskell/snap-server-0.9.4.4:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/uuid:=[profile?] )
 RESTRICT=test
-SLOT=0/0.5.3.2
-SRC_URI=https://hackage.haskell.org/package/wreq-0.5.3.2/wreq-0.5.3.2.tar.gz
+SLOT=0/0.5.3.3
+SRC_URI=https://hackage.haskell.org/package/wreq-0.5.3.3/wreq-0.5.3.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bd247a48e2167e618b5722e5e7bd612f
+_md5_=59cf6a820941596f116cde99da1626d4
diff --git a/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1 b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
index 6a2a420b9783..dc7c42acce85 100644
--- a/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/xml-hamlet-0.5.0.1/xml-hamlet-0.5.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4627c072c3185e12ac9c36a9a576694e
+_md5_=3ecf94ac7b581f8db91094b203fcf21a
diff --git a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6 b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
index 4799c268128a..79fec493862c 100644
--- a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
+++ b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/yesodweb/haskell-xss-sanitize#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.6
 SRC_URI=https://hackage.haskell.org/package/xss-sanitize-0.3.6/xss-sanitize-0.3.6.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=70b8ef4fa4efa31c5c80a37da3c99fd1
+_md5_=96de30ae034b8cf13794904978d4fbd2
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.6.2 b/metadata/md5-cache/dev-haskell/yesod-1.6.2
index 817d603d762b..4c576efcd5ed 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.6.2
+++ b/metadata/md5-cache/dev-haskell/yesod-1.6.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/fast-logger:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.8:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.6.2
 SRC_URI=https://hackage.haskell.org/package/yesod-1.6.2/yesod-1.6.2.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c28cc123a9f58961d6ce38e0546a0ea8
+_md5_=5d0aaed6ef244751150e0e6bb1497d83
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.6.23.1 b/metadata/md5-cache/dev-haskell/yesod-core-1.6.23.1
index 03a4663fd19e..3ef58add922f 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.6.23.1
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.6.23.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/wai-3.2:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test !test? ( test )
 SLOT=0/1.6.23.1
 SRC_URI=https://hackage.haskell.org/package/yesod-core-1.6.23.1/yesod-core-1.6.23.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c17ea130dd495bc5c69db9316bb2b226
+_md5_=b48754649ed3608240b7c7bbd89a0484
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.7.0 b/metadata/md5-cache/dev-haskell/yesod-form-1.7.0
index 09b68a58118a..86234176ac66 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.7.0
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.7.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=+network-uri doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-8.4.3:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.7.0
 SRC_URI=https://hackage.haskell.org/package/yesod-form-1.7.0/yesod-form-1.7.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=79cfb67f98f88ba25f95e8c1290a07c0
+_md5_=0ac2ebb59a9b683fd5d9919c4e4b84e7
diff --git a/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.8 b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.8
index 10af3174cc0c..6352bad2114a 100644
--- a/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.8
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.0.8
 SRC_URI=https://hackage.haskell.org/package/yesod-persistent-1.6.0.8/yesod-persistent-1.6.0.8.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=671400cb9ae52dbfefdf3436c4f27636
+_md5_=f6ddb8803063495de3447eacc05cd671
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0 b/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
index 39bf27bbd9f7..093f30fd0ab1 100644
--- a/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/cryptonite-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-lang/ghc-8.2.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.1.0
 SRC_URI=https://hackage.haskell.org/package/yesod-static-1.6.1.0/yesod-static-1.6.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=85487cf0b8e3615a6f09e4fb849bad69
+_md5_=eb0a4dfdf9381cc9c252a224f6007579
diff --git a/metadata/md5-cache/dev-haskell/yesod-test-1.6.12 b/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
index 9756472f7309..9daffca30c9c 100644
--- a/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
+++ b/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mtl-2.0.0:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.6.17:=[profile?] >=dev-lang/ghc-8.2.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.12
 SRC_URI=https://hackage.haskell.org/package/yesod-test-1.6.12/yesod-test-1.6.12.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c3123d6f260928af19f4a43c5d100f8a
+_md5_=93ff73aa3bde70b38dc167e484d49a12
diff --git a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5 b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
index bce2a8fb08be..410fca5be1e3 100644
--- a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/zlib-bindings
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.5
 SRC_URI=https://hackage.haskell.org/package/zlib-bindings-0.1.1.5/zlib-bindings-0.1.1.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7d9f425aae155b9db97771d4d9a6720b
+_md5_=5c2698b5a00e6a39dc3879c9ce8a14f4
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4599804987f0..9562fa30a582 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/gson-2.9.0-r2 b/metadata/md5-cache/dev-java/gson-2.9.0-r2
index d6c6770d4080..4b1305e281d3 100644
--- a/metadata/md5-cache/dev-java/gson-2.9.0-r2
+++ b/metadata/md5-cache/dev-java/gson-2.9.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/gson
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.6
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.9.0.tar.gz -> gson-2.9.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	cc510ad15292e222d436a547adffe6a9	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=673674bc237d88627c7c91ab15b43d15
+_md5_=11d0f20a85e013ce63bace01baa780aa
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.5 b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.5
new file mode 100644
index 000000000000..121f19f627bd
--- /dev/null
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.5
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=JNI bindings for Zstd native library
+EAPI=8
+HOMEPAGE=https://github.com/luben/zstd-jni
+INHERIT=java-pkg-2 java-pkg-simple cmake
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/luben/zstd-jni/archive/v1.5.0-5.tar.gz -> zstd-jni-1.5.0.5.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	cc510ad15292e222d436a547adffe6a9	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2e68b39559ffae96f221ff7f5afc2580
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 420b0f8648ce..86c6a0d2d2a4 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2020 b/metadata/md5-cache/dev-lang/gnat-gpl-2020
index 0cff188ab787..c42dbcb3a6d1 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2020
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2020
@@ -13,5 +13,5 @@ RDEPEND=!sys-devel/gcc:9.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libin
 RESTRICT=test
 SLOT=9.3.1
 SRC_URI=https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=gnat-2020-20200429-19B04-src.tar.gz -> gnat-2020-20200429-19B04-src.tar.gz https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=gcc-9-2020-20200429-19AA7-src.tar.gz -> gcc-9-2020-20200429-19AA7-src.tar.gz https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=gcc-interface-9-2020-20200429-19B10-src.tar.gz -> gcc-interface-9-2020-20200429-19B10-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-5.tar.bz2 mirror://gentoo/gcc-9.3.0-patches-5.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9204bdac5e41aa901db39c4a1f328db2
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
index e16d1f5b7d00..7917c60ee444 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
@@ -13,5 +13,5 @@ RDEPEND=!~sys-devel/gcc-10.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/lib
 RESTRICT=test
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=fa8fd8a43d3d6b6035abb3fd96dd4496
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
index eb812b0b0cfd..57fff535da15 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
@@ -13,5 +13,5 @@ RDEPEND=!=sys-devel/gcc-10.3.1* sys-libs/zlib virtual/libiconv nls? ( virtual/li
 RESTRICT=test
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c354ac5fa7f6f003792af2ba1a9b5549
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9bbb4c7c168b..f3747c312212 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/icu-71.1-r1 b/metadata/md5-cache/dev-libs/icu-71.1-r1
index 8cada38fcb13..39171241a48f 100644
--- a/metadata/md5-cache/dev-libs/icu-71.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-71.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) verify-sig? ( sec-keys/openpgp-keys-icu ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) verify-sig? ( sec-keys/openpgp-keys-icu ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=International Components for Unicode
 EAPI=8
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/71.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=b95bd239ebb410bdbf5f59ad8f7699e1
+_md5_=d919d7708f8d051b3d87e2096fc48401
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.5 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
index 1ad32e31e555..d27601cd722d 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=C++ JSON reader and writer
 EAPI=8
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz -> jsoncpp-1.9.5.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9ded3434c67017b2e0a9ac2940cb1601
+_md5_=6faa018a42c22e152d9cccf63dc9eaa2
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.12.1 b/metadata/md5-cache/dev-libs/libevdev-1.12.1
index 30f1129844b1..47af7230a4fe 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.12.1
+++ b/metadata/md5-cache/dev-libs/libevdev-1.12.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install setup test
 DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Handler library for evdev events
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.12.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e63e4a7a6b9beea285e4b1d586ad7579
+_md5_=8daa8ee502950c82b394d4861101b66d
diff --git a/metadata/md5-cache/dev-libs/libevdev-9999 b/metadata/md5-cache/dev-libs/libevdev-9999
index 97e68c3fc191..3890382d1de0 100644
--- a/metadata/md5-cache/dev-libs/libevdev-9999
+++ b/metadata/md5-cache/dev-libs/libevdev-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install setup test unpack
 DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Handler library for evdev events
@@ -11,4 +11,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ff97f092c664c1b8586694e6b5cdbf07
+_md5_=a08752ed6d8e6f50ca80ab372b5aba36
diff --git a/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0-r1 b/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0-r1
index 82906e893961..5d70fc17b4d8 100644
--- a/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0-r1
+++ b/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.formbuilder.org/ https://metacpan.org/release/CGI-FormBuilder
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1 )
 RDEPEND=dev-perl/CGI dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4
-_md5_=635150b4e6119f5301dfa47df3a6d554
+_md5_=996b8b762126bdd9507d52dbe78f959f
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r3 b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r3
index dab575902196..2841c70dda13 100644
--- a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r3
+++ b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/CGI-Session
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~hppa ~ppc x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
 LICENSE=Artistic
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4
-_md5_=2288317b7142ccd172cdc7d340c8397f
+_md5_=2c733225ebcc8764634947b9c3c4a7c2
diff --git a/metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120-r1 b/metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120-r1
index 3ca6122d0396..a3590bbe4471 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-DH-GMP
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-XSLoader-0.20.0 >=dev-libs/gmp-4.0.0:0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/Crypt-DH-GMP-0.00012.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4
-_md5_=fad25297d010a827fb5b955a8dd45e54
+_md5_=c415592eb879290eaee942d1766e2a8e
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.340.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.340.0
index 9efb7b9506b9..6b8c6e54a52a 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.340.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.340.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-Flexible
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Format-Builder-0.740.0 dev-perl/DateTime-TimeZone dev-perl/List-MoreUtils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.34.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=2cb7782330ab21a46822f00c6914b681
+_md5_=567611f3375c5a81409e6a718a1920d8
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.120.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.120.0
index 7e0740a3a704..bf0e12df308e 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.120.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.120.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-Natural
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Clone dev-perl/Date-Calc dev-perl/DateTime dev-perl/DateTime-TimeZone virtual/perl-Exporter virtual/perl-Getopt-Long dev-perl/List-MoreUtils >=dev-perl/Params-Validate-1.150.0 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Term-ReadLine dev-perl/boolean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.12.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4
-_md5_=b7d79f09aade3ab389665847c3d15a2a
+_md5_=34bf7c02a7e0803138135dea612b5a7d
diff --git a/metadata/md5-cache/dev-perl/Feed-Find-0.120.0 b/metadata/md5-cache/dev-perl/Feed-Find-0.120.0
index d5973b590514..1b6556f272b1 100644
--- a/metadata/md5-cache/dev-perl/Feed-Find-0.120.0
+++ b/metadata/md5-cache/dev-perl/Feed-Find-0.120.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Feed-Find
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-ErrorHandler dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Feed-Find-0.12.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=42f4306ee60d80c1be7461dc62b77335
+_md5_=6cd58ed09f55d0ecaf0609ec0f846674
diff --git a/metadata/md5-cache/dev-perl/LWP-Authen-Wsse-0.50.0-r2 b/metadata/md5-cache/dev-perl/LWP-Authen-Wsse-0.50.0-r2
index 22ba7429c336..5eb271fe4161 100644
--- a/metadata/md5-cache/dev-perl/LWP-Authen-Wsse-0.50.0-r2
+++ b/metadata/md5-cache/dev-perl/LWP-Authen-Wsse-0.50.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/LWP-Authen-Wsse
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-MIME-Base64 dev-perl/Digest-SHA1 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUTRIJUS/LWP-Authen-Wsse-0.05.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=fcd6f3355a41a06a6a22f4a82789cf02
+_md5_=ce917bc517e7bde8246a3c28e2eb0a9c
diff --git a/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.120.0-r1 b/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.120.0-r1
index bc39d4fa81e9..25ccffdb9594 100644
--- a/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.120.0-r1
+++ b/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.120.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/LWPx-ParanoidAgent
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/Net-DNS virtual/perl-Time-HiRes dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-1.12.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=6c09e2b02ff0058397f9ed040ef1d37c
+_md5_=6e40b89bc2db41931b8a80c21177b5f8
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 795b0b23919f..f84d2c37d812 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Module-Util-1.90.0-r1 b/metadata/md5-cache/dev-perl/Module-Util-1.90.0-r1
index e8b68590780b..805265ad91b4 100644
--- a/metadata/md5-cache/dev-perl/Module-Util-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Util-1.90.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Module-Util
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=7636a1ba0099659992f412fbaab2e2c6
+_md5_=1b5509878ded9c4e906def05a1d3b94a
diff --git a/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0-r1 b/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0-r1
index 61c66d0fb9d5..5ed6995303b7 100644
--- a/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-OpenID-Common
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-DH-GMP-0.0.110 virtual/perl-Encode >=dev-perl/HTML-Parser-3.400.0 >=dev-perl/HTTP-Message-5.814.0 virtual/perl-MIME-Base64 virtual/perl-Math-BigInt virtual/perl-Time-Local dev-perl/XML-Simple !<dev-perl/Net-OpenID-Consumer-1.30.99 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=5b120f639474d95f328895e9f7bc542d
+_md5_=f24198f8290f89ee1ce156340c9ff584
diff --git a/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0-r1 b/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0-r1
index 90780b2687de..5a61a7737cd4 100644
--- a/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-OpenID-Consumer
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/JSON dev-perl/libwww-perl virtual/perl-MIME-Base64 >=dev-perl/Net-OpenID-Common-1.190.0 virtual/perl-Storable virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=13ddfa69a303d5fa278236f4d7a55479
+_md5_=1a83bf0f88265e6f80e8f6b6d4d0d446
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.820.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
index a82a231bd112..64d2658a789d 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/RPC-XML
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=|| ( Artistic-2 LGPL-2.1 )
 RDEPEND=virtual/perl-Carp >=dev-perl/HTTP-Daemon-6.120.0 >=dev-perl/HTTP-Message-6.260.0 >=dev-perl/libwww-perl-6.510.0 >=virtual/perl-Module-Load-0.360.0 >=virtual/perl-Scalar-List-Utils-1.550.0 >=dev-perl/XML-Parser-2.460.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.82.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4
-_md5_=915ad499e463e590de8eb736420b3502
+_md5_=44cafd2870e2f1ca7355af7c7f79bf9d
diff --git a/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r2 b/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r2
index 359a4653335c..bee2930668ab 100644
--- a/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r2
+++ b/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Text-Markdown
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-Text-Balanced dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=a2e8fb1307bf057b0b8704d0c66ee923
+_md5_=8392a523dde25be5d93ea8c9c378e3ef
diff --git a/metadata/md5-cache/dev-perl/URI-Fetch-0.150.0 b/metadata/md5-cache/dev-perl/URI-Fetch-0.150.0
index b74c84d56571..e7e9cdf7cb90 100644
--- a/metadata/md5-cache/dev-perl/URI-Fetch-0.150.0
+++ b/metadata/md5-cache/dev-perl/URI-Fetch-0.150.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/URI-Fetch
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-ErrorHandler dev-perl/libwww-perl virtual/perl-Storable dev-perl/URI dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/URI-Fetch-0.15.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=162edeec9a3ef1115df6685d573e5cd7
+_md5_=300f41768bfec1c9acf555e16848ca06
diff --git a/metadata/md5-cache/dev-perl/XML-Atom-0.430.0 b/metadata/md5-cache/dev-perl/XML-Atom-0.430.0
index 6b3bfbc5b129..fd12b72b06de 100644
--- a/metadata/md5-cache/dev-perl/XML-Atom-0.430.0
+++ b/metadata/md5-cache/dev-perl/XML-Atom-0.430.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/XML-Atom
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Data-Inheritable dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/libwww-perl virtual/perl-MIME-Base64 dev-perl/LWP-Authen-Wsse dev-perl/URI >=dev-perl/XML-LibXML-2.20.200 >=dev-perl/XML-XPath-1.200.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/XML-Atom-0.43.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=8603e79a3a275200afbd94a05a67dd9c
+_md5_=72b903cf726c08fbcafdb018d24b890b
diff --git a/metadata/md5-cache/dev-perl/XML-Feed-0.630.0 b/metadata/md5-cache/dev-perl/XML-Feed-0.630.0
index fc686ac11997..d730610bbeb0 100644
--- a/metadata/md5-cache/dev-perl/XML-Feed-0.630.0
+++ b/metadata/md5-cache/dev-perl/XML-Feed-0.630.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/XML-Feed
 INHERIT=perl-module
 IUSE=minimal test examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/XML-RSS-LibXML ) dev-perl/Class-ErrorHandler dev-perl/DateTime dev-perl/DateTime-Format-Flexible dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-Mail dev-perl/DateTime-Format-Natural dev-perl/DateTime-Format-W3CDTF dev-perl/Feed-Find dev-perl/HTML-Parser dev-perl/libwww-perl virtual/perl-Scalar-List-Utils dev-perl/Module-Pluggable dev-perl/URI-Fetch >=dev-perl/XML-Atom-0.380.0 >=dev-perl/XML-LibXML-1.660.0 >=dev-perl/XML-RSS-1.470.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/XML-Feed-0.63.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=c11da21fee1e1be263215428cc8aaf05
+_md5_=6ec823f120d891ef4da55a409b3153a0
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-LibXML-0.310.500-r1 b/metadata/md5-cache/dev-perl/XML-RSS-LibXML-0.310.500-r1
index 30e5a3dc143f..6f3d7fa1de4f 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-LibXML-0.310.500-r1
+++ b/metadata/md5-cache/dev-perl/XML-RSS-LibXML-0.310.500-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/XML-RSS-LibXML
 INHERIT=perl-module
 IUSE=minimal test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/DateTime-Format-Mail dev-perl/DateTime-Format-W3CDTF virtual/perl-Encode dev-perl/UNIVERSAL-require >=dev-perl/XML-LibXML-1.660.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/XML-RSS-LibXML-0.3105.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=dc9e76419e56338b8e4adf1d06c1c3e0
+_md5_=5571aa7db361d2390b3dd0fa902ebe66
diff --git a/metadata/md5-cache/dev-perl/boolean-0.460.0-r1 b/metadata/md5-cache/dev-perl/boolean-0.460.0-r1
index e0afed2fd94c..e08c45ebf147 100644
--- a/metadata/md5-cache/dev-perl/boolean-0.460.0-r1
+++ b/metadata/md5-cache/dev-perl/boolean-0.460.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/boolean
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=31c283b52005e04d76c8458aa0a996cc
+_md5_=9e73a76e13041a6751103754ab44a1b5
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f804ceb7c907..aa72d3e8edef 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/black-22.6.0 b/metadata/md5-cache/dev-python/black-22.6.0
index 77bdf94b4c43..38f714d692b4 100644
--- a/metadata/md5-cache/dev-python/black-22.6.0
+++ b/metadata/md5-cache/dev-python/black-22.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/22.6.0.tar.gz -> black-22.6.0.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aeda3c1b398cc7afc46e460871440273
+_md5_=cac2702785f66fd32659020c223bb984
diff --git a/metadata/md5-cache/dev-python/boolean-py-4.0 b/metadata/md5-cache/dev-python/boolean-py-4.0
index b2ba826ad2db..42498068c26a 100644
--- a/metadata/md5-cache/dev-python/boolean-py-4.0
+++ b/metadata/md5-cache/dev-python/boolean-py-4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/boolean.py/ https://github.com/bastikr/boolean.py/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bastikr/boolean.py/archive/v4.0.tar.gz -> boolean.py-4.0.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=99f53be696032329040ae701687f006f
+_md5_=9bffe4c352bb092c38af5d3c62a173f4
diff --git a/metadata/md5-cache/dev-python/license-expression-30.0.0 b/metadata/md5-cache/dev-python/license-expression-30.0.0
index 790150e500fc..4829aab48cb1 100644
--- a/metadata/md5-cache/dev-python/license-expression-30.0.0
+++ b/metadata/md5-cache/dev-python/license-expression-30.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/license-expression/ https://github.com/nexB/license-expression/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/boolean-py-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nexB/license-expression/archive/v30.0.0.tar.gz -> license-expression-30.0.0.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eed8a2871248381f061a52fea6814a85
+_md5_=036340f80837d606655fd9fa3a644f35
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.6.0 b/metadata/md5-cache/dev-python/nodeenv-1.6.0
deleted file mode 100644
index 402625cee484..000000000000
--- a/metadata/md5-cache/dev-python/nodeenv-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Node.js virtual environment builder
-EAPI=7
-HOMEPAGE=https://github.com/ekalinin/nodeenv
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.6.0.tar.gz -> nodeenv-1.6.0.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c108c5c0c075ed02dcb1b7ea9885d32e
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.7.0 b/metadata/md5-cache/dev-python/nodeenv-1.7.0
index c6e16dd9e0a9..8139a5f1fdbf 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.7.0
+++ b/metadata/md5-cache/dev-python/nodeenv-1.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ekalinin/nodeenv
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
 LICENSE=BSD
 PROPERTIES=test_network
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.7.0.tar.gz -> nodeenv-1.7.0.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a58c7650abcb28ee3d65a7cdf658b08f
+_md5_=a27d86ebaa6cb4a8b08e1636b21b4546
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-1.0.3 b/metadata/md5-cache/dev-python/pdm-pep517-1.0.3
index 3086d0f3c44f..7eb8a4441fda 100644
--- a/metadata/md5-cache/dev-python/pdm-pep517-1.0.3
+++ b/metadata/md5-cache/dev-python/pdm-pep517-1.0.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pdm-pep517/ https://github.com/pdm-project/pdm-pep517/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pdm-project/pdm-pep517/archive/1.0.3.tar.gz -> pdm-pep517-1.0.3.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2b622916e9d3550a8c50e44c0654077c
+_md5_=b46dc76ce492f02b6ea18fc4957da229
diff --git a/metadata/md5-cache/dev-python/pytoolconfig-1.2.1 b/metadata/md5-cache/dev-python/pytoolconfig-1.2.1
index 1e7eaa46c408..15462f222b26 100644
--- a/metadata/md5-cache/dev-python/pytoolconfig-1.2.1
+++ b/metadata/md5-cache/dev-python/pytoolconfig-1.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytoolconfig/ https://github.com/bageljrkhanofemus/pytoolconfig/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=LGPL-3
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytoolconfig/pytoolconfig-1.2.1.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=19da22375077fdc8f9daa7003003ad09
+_md5_=7a10adc2886be62eff5426e835ea706a
diff --git a/metadata/md5-cache/dev-python/rope-1.2.0 b/metadata/md5-cache/dev-python/rope-1.2.0
index 87e236ba2833..826492fd9d0e 100644
--- a/metadata/md5-cache/dev-python/rope-1.2.0
+++ b/metadata/md5-cache/dev-python/rope-1.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/rope/ https://github.com/python-rope/rope/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=LGPL-3+
 RDEPEND=dev-python/pytoolconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rope/rope-1.2.0.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=213d6b7b8db47fc9dd8cf22cc1686baa
+_md5_=904635ff5e49dd45a7a79cbb66d4cc6d
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.39 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.39
index e8a8a57022e2..709edec8f80e 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.39
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.39
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
 INHERIT=distutils-r1 optfeature
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.39.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9f182c66870f4d984cd2ee5e648ddddb
+_md5_=23aa7d3ff8ab7346d52a19a4f430d603
diff --git a/metadata/md5-cache/dev-python/suds-community-1.1.1 b/metadata/md5-cache/dev-python/suds-community-1.1.1
deleted file mode 100644
index 4a7f968c1a03..000000000000
--- a/metadata/md5-cache/dev-python/suds-community-1.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lightweight SOAP client
-EAPI=8
-HOMEPAGE=https://github.com/suds-community/suds/ https://pypi.org/project/suds-community/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/suds-community/suds-community-1.1.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d6514ce173e133d4c25d552709d75f45
diff --git a/metadata/md5-cache/dev-python/suds-community-1.1.2 b/metadata/md5-cache/dev-python/suds-community-1.1.2
index 53873e3c32d0..b12189ad6e53 100644
--- a/metadata/md5-cache/dev-python/suds-community-1.1.2
+++ b/metadata/md5-cache/dev-python/suds-community-1.1.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/suds-community/suds/ https://pypi.org/project/suds-community/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/suds-community/suds-community-1.1.2.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=13e890dc15a25c7d6a469f03aebdbb08
+_md5_=90436d181bcd87ffd20c9cd5d5b64ffb
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index de25b3a4359c..f68ecd04de16 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
index c36db05a7aa5..c0308cf6109a 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
@@ -7,11 +7,11 @@ HOMEPAGE=https://rubygems.org/gems/abstract
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
+LICENSE=Ruby-BSD
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3b64871188d719265a73b27d4d7fb2ed
+_md5_=1c1b8146bc9ba3702c3369fb2bf1bb4c
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
index efac12744ffe..74e408aa7a52 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
@@ -7,11 +7,11 @@ HOMEPAGE=https://rubygems.org/gems/abstract
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
+LICENSE=Ruby-BSD
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=47904ce9156ad527f99374815c32c2a6
+_md5_=b4470c9d6a61ba739202cc88e5851f66
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1 b/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
index f4127af84933..01be4438f2ce 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
@@ -7,11 +7,11 @@ HOMEPAGE=http://rubyamqp.info/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
 KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
+LICENSE=Ruby-BSD
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby26(-)] >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby27(-)] >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.4
 SRC_URI=https://rubygems.org/gems/amqp-1.8.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f60933456188702deff23865bbb4dfc7
+_md5_=0cb42deb80002f70f8f7a1df68f4176d
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
index 2943cf451c8a..782f7147db97 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
@@ -7,11 +7,11 @@ HOMEPAGE=http://0xcc.net/ruby-bsearch/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=Ruby
+LICENSE=Ruby-BSD
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bsearch-1.5.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=27743c2f0f10d77a68a5e7d16d59522e
+_md5_=2083dcfa1b87e0db541af99a8afab8ec
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1 b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
index 0c82b81fa29d..8416f650e3a1 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/rocky/columnize
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=Ruby
+LICENSE=|| ( GPL-2 Ruby )
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/columnize-0.9.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=69ee296083f774d028221dd3624a4dd2
+_md5_=25c2f0057aec64bda7bba842d479e29f
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.4.0 b/metadata/md5-cache/dev-ruby/fattr-2.4.0
deleted file mode 100644
index e3f2c843e697..000000000000
--- a/metadata/md5-cache/dev-ruby/fattr-2.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=fattr.rb is a "fatter attr" for ruby
-EAPI=6
-HOMEPAGE=https://github.com/ahoward/fattr
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/fattr-2.4.0.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f377f598b40dbe738be4baf16093dc07
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1 b/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
index a57a5dbedd30..188dbb826fc4 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/ahoward/fattr
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
 KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
+LICENSE=Ruby-BSD
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fattr-2.4.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d92fd48c0054778098a0cbbf5b471c13
+_md5_=dd8a1f5c19c77ae820cd6780d296a4c2
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
index 59496664a805..67ec9c6aaf51 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/alphallc/ruby-fcgi-ng
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
 KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=Ruby
+LICENSE=MIT Ruby-BSD
 RDEPEND=dev-libs/fcgi ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fcgi-0.9.2.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b41983c644be0e81bc86e72f1736543
+_md5_=ae7ed29b0f64dd072a197f157052bc91
diff --git a/metadata/md5-cache/dev-ruby/json-2.5.1-r1 b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
index 56fa0a8faff7..25549e6533a5 100644
--- a/metadata/md5-cache/dev-ruby/json-2.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/flori/json
 INHERIT=multilib ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
+LICENSE=|| ( BSD-2 Ruby )
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.5.1.tar.gz -> json-2.5.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b56458d8777098a8b6b836c68c7994e
+_md5_=60319df6c35e090ff92e8b985910a437
diff --git a/metadata/md5-cache/dev-ruby/json-2.6.1 b/metadata/md5-cache/dev-ruby/json-2.6.1
index 9e19e160da48..2c83595dc2d2 100644
--- a/metadata/md5-cache/dev-ruby/json-2.6.1
+++ b/metadata/md5-cache/dev-ruby/json-2.6.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/flori/json
 INHERIT=multilib ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
+LICENSE=|| ( BSD-2 Ruby )
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.6.1.tar.gz -> json-2.6.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9e2d7fb76d82258a3f6b81ac18e10e9a
+_md5_=8917f3fbeacf4ec5877cafc6c149e24a
diff --git a/metadata/md5-cache/dev-ruby/json-2.6.2 b/metadata/md5-cache/dev-ruby/json-2.6.2
index ead6f57b87bf..3ec8e9b69dad 100644
--- a/metadata/md5-cache/dev-ruby/json-2.6.2
+++ b/metadata/md5-cache/dev-ruby/json-2.6.2
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/flori/json
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
+LICENSE=|| ( BSD-2 Ruby )
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.6.2.tar.gz -> json-2.6.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3b1c1e615e5cdfb5683496cdef582c58
+_md5_=0400dceb4ae6d87dfe79df059d5cbaa6
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
index 6327adf9c4ee..44513eb6cc6f 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
@@ -7,11 +7,11 @@ HOMEPAGE=http://pablotron.org/software/wirble/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
 KEYWORDS=amd64 ppc x86
-LICENSE=Ruby
+LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wirble-0.1.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7270a9d832a4baae6e8d9190846b3364
+_md5_=d869bcf2133f969562e27c8fb3079e48
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 32f60ebe2c82..1b9eaf1ce592 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/ninja-1.11.0 b/metadata/md5-cache/dev-util/ninja-1.11.0
index 9a49c61dd37d..13fca35143bf 100644
--- a/metadata/md5-cache/dev-util/ninja-1.11.0
+++ b/metadata/md5-cache/dev-util/ninja-1.11.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest )
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest )
 DEFINED_PHASES=compile install postinst postrm setup test
 DESCRIPTION=A small build system similar to make
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.11.0.tar.gz -> ninja-1.11.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8fec16d1fd0d7aa878d4d3b3d232f316
+_md5_=c2711d3dd1b76a231d592bf02bc2e7e9
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index 75e4b3fd7ac0..f3002e43f07c 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm setup test unpack
 DESCRIPTION=A small build system similar to make
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8fec16d1fd0d7aa878d4d3b3d232f316
+_md5_=c2711d3dd1b76a231d592bf02bc2e7e9
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index fffe0b3f2353..d6ea301508ff 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-annex-10.20220624 b/metadata/md5-cache/dev-vcs/git-annex-10.20220624
new file mode 100644
index 000000000000..2f553e06a560
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-annex-10.20220624
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:= >=dev-haskell/ansi-terminal-0.9:= dev-haskell/async:= >=dev-haskell/attoparsec-0.13.2.2:= >=dev-haskell/aws-0.20:= >=dev-haskell/bloomfilter-2.0.0:= dev-haskell/byteable:= dev-haskell/case-insensitive:= >=dev-haskell/concurrent-output-1.10:= dev-haskell/conduit:= >=dev-haskell/connection-0.2.6:= dev-haskell/crypto-api:= >=dev-haskell/cryptonite-0.23:= dev-haskell/data-default:= >=dev-haskell/dav-1.0:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= >=dev-haskell/feed-1.0.0:= >=dev-haskell/filepath-bytestring-1.4.2.1.1:= dev-haskell/free:= >=dev-haskell/http-client-0.5.3:= >=dev-haskell/http-client-restricted-0.0.2:= dev-haskell/http-client-tls:= >=dev-haskell/http-conduit-2.3.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/microlens:= dev-haskell/monad-control:= >=dev-haskell/monad-logger-0.3.10:= >=dev-haskell/network-3.0.0.0:= dev-haskell/network-bsd:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.14.1:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.10.0:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/tagsoup:= >=dev-haskell/tasty-1.2:= dev-haskell/tasty-hunit:= dev-haskell/tasty-quickcheck:= dev-haskell/tasty-rerun:= >=dev-haskell/unix-compat-0.5:= dev-haskell/unliftio-core:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= dev-haskell/vector:= >=dev-lang/ghc-8.10.1:= assistant? ( >=dev-haskell/hinotify-0.3.10:= dev-haskell/mountpoints:= ) benchmark? ( dev-haskell/criterion:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) gitlfs? ( >=dev-haskell/git-lfs-1.2.0:= ) magicmime? ( dev-haskell/magic:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.2.1:= >=dev-haskell/shakespeare-2.0.11:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.2.8:= >=dev-haskell/warp-tls-3.2.2:= >=dev-haskell/yesod-1.4.3:= >=dev-haskell/yesod-core-1.6.0:= >=dev-haskell/yesod-form-1.4.8:= >=dev-haskell/yesod-static-1.5.1:= ) >=dev-haskell/cabal-3.2.0.0 >=dev-haskell/filepath-bytestring-1.4.2.1.4 dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync )
+DESCRIPTION=manage files with git, without checking their contents into git
+EAPI=8
+HOMEPAGE=https://git-annex.branchable.com/
+INHERIT=haskell-cabal bash-completion-r1 desktop
+IUSE=+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
+LICENSE=AGPL-3
+RDEPEND=dev-haskell/aeson:= >=dev-haskell/ansi-terminal-0.9:= dev-haskell/async:= >=dev-haskell/attoparsec-0.13.2.2:= >=dev-haskell/aws-0.20:= >=dev-haskell/bloomfilter-2.0.0:= dev-haskell/byteable:= dev-haskell/case-insensitive:= >=dev-haskell/concurrent-output-1.10:= dev-haskell/conduit:= >=dev-haskell/connection-0.2.6:= dev-haskell/crypto-api:= >=dev-haskell/cryptonite-0.23:= dev-haskell/data-default:= >=dev-haskell/dav-1.0:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= >=dev-haskell/feed-1.0.0:= >=dev-haskell/filepath-bytestring-1.4.2.1.1:= dev-haskell/free:= >=dev-haskell/http-client-0.5.3:= >=dev-haskell/http-client-restricted-0.0.2:= dev-haskell/http-client-tls:= >=dev-haskell/http-conduit-2.3.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/microlens:= dev-haskell/monad-control:= >=dev-haskell/monad-logger-0.3.10:= >=dev-haskell/network-3.0.0.0:= dev-haskell/network-bsd:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.14.1:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.10.0:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/tagsoup:= >=dev-haskell/tasty-1.2:= dev-haskell/tasty-hunit:= dev-haskell/tasty-quickcheck:= dev-haskell/tasty-rerun:= >=dev-haskell/unix-compat-0.5:= dev-haskell/unliftio-core:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= dev-haskell/vector:= >=dev-lang/ghc-8.10.1:= assistant? ( >=dev-haskell/hinotify-0.3.10:= dev-haskell/mountpoints:= ) benchmark? ( dev-haskell/criterion:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) gitlfs? ( >=dev-haskell/git-lfs-1.2.0:= ) magicmime? ( dev-haskell/magic:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.2.1:= >=dev-haskell/shakespeare-2.0.11:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.2.8:= >=dev-haskell/warp-tls-3.2.2:= >=dev-haskell/yesod-1.4.3:= >=dev-haskell/yesod-core-1.6.0:= >=dev-haskell/yesod-form-1.4.8:= >=dev-haskell/yesod-static-1.5.1:= ) dev-vcs/git
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/git-annex-10.20220624/git-annex-10.20220624.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ce55f12f93c807a13d7cf6dbe40a140b
diff --git a/metadata/md5-cache/dev-vcs/git-annex-8.20200810 b/metadata/md5-cache/dev-vcs/git-annex-8.20200810
deleted file mode 100644
index 73a263701c17..000000000000
--- a/metadata/md5-cache/dev-vcs/git-annex-8.20200810
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/attoparsec:= >=dev-haskell/bloomfilter-2.0.0:= dev-haskell/byteable:= dev-haskell/case-insensitive:= >=dev-haskell/concurrent-output-1.10:= dev-haskell/conduit:= >=dev-haskell/connection-0.2.6:= dev-haskell/crypto-api:= >=dev-haskell/cryptonite-0.23:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= >=dev-haskell/exceptions-0.6:= >=dev-haskell/feed-1.0.0:= >=dev-haskell/filepath-bytestring-1.4.2.1.1:= dev-haskell/free:= dev-haskell/hslogger:= >=dev-haskell/http-client-0.5.3:= dev-haskell/http-client-tls:= >=dev-haskell/http-conduit-2.3.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/microlens:= dev-haskell/monad-control:= dev-haskell/monad-logger:= >=dev-haskell/mtl-2:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.14.1:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.10.0:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/tagsoup:= >=dev-haskell/tasty-0.7:= dev-haskell/tasty-hunit:= dev-haskell/tasty-quickcheck:= dev-haskell/tasty-rerun:= dev-haskell/text:= >=dev-haskell/unix-compat-0.5:= dev-haskell/unliftio-core:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= dev-haskell/vector:= >=dev-lang/ghc-8.4.3:= assistant? ( >=dev-haskell/hinotify-0.3.10:= dev-haskell/mountpoints:= ) benchmark? ( dev-haskell/criterion:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) gitlfs? ( >=dev-haskell/git-lfs-1.1.0:= ) httpclientrestricted? ( >=dev-haskell/http-client-restricted-0.0.2:= ) magicmime? ( dev-haskell/magic:= ) networkbsd? ( >=dev-haskell/network-3.0.0.0:= dev-haskell/network-bsd:= ) !networkbsd? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) s3? ( >=dev-haskell/aws-0.20:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.2.1:= >=dev-haskell/shakespeare-2.0.11:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.2.8:= >=dev-haskell/warp-tls-3.2.2:= >=dev-haskell/yesod-1.4.3:= >=dev-haskell/yesod-core-1.6.0:= >=dev-haskell/yesod-form-1.4.8:= >=dev-haskell/yesod-static-1.5.1:= ) webdav? ( >=dev-haskell/dav-1.0:= ) dev-vcs/git >=dev-haskell/cabal-2.2.0.1 dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync )
-DESCRIPTION=manage files with git, without checking their contents into git
-EAPI=7
-HOMEPAGE=http://git-annex.branchable.com/
-INHERIT=haskell-cabal bash-completion-r1 desktop
-IUSE=+assistant benchmark +dbus debuglocks doc +gitlfs +httpclientrestricted +magicmime +networkbsd +pairing +s3 +torrentparser +webapp +webdav
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=AGPL-3
-RDEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/attoparsec:= >=dev-haskell/bloomfilter-2.0.0:= dev-haskell/byteable:= dev-haskell/case-insensitive:= >=dev-haskell/concurrent-output-1.10:= dev-haskell/conduit:= >=dev-haskell/connection-0.2.6:= dev-haskell/crypto-api:= >=dev-haskell/cryptonite-0.23:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= >=dev-haskell/exceptions-0.6:= >=dev-haskell/feed-1.0.0:= >=dev-haskell/filepath-bytestring-1.4.2.1.1:= dev-haskell/free:= dev-haskell/hslogger:= >=dev-haskell/http-client-0.5.3:= dev-haskell/http-client-tls:= >=dev-haskell/http-conduit-2.3.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/microlens:= dev-haskell/monad-control:= dev-haskell/monad-logger:= >=dev-haskell/mtl-2:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.14.1:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.10.0:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/tagsoup:= >=dev-haskell/tasty-0.7:= dev-haskell/tasty-hunit:= dev-haskell/tasty-quickcheck:= dev-haskell/tasty-rerun:= dev-haskell/text:= >=dev-haskell/unix-compat-0.5:= dev-haskell/unliftio-core:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= dev-haskell/vector:= >=dev-lang/ghc-8.4.3:= assistant? ( >=dev-haskell/hinotify-0.3.10:= dev-haskell/mountpoints:= ) benchmark? ( dev-haskell/criterion:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) gitlfs? ( >=dev-haskell/git-lfs-1.1.0:= ) httpclientrestricted? ( >=dev-haskell/http-client-restricted-0.0.2:= ) magicmime? ( dev-haskell/magic:= ) networkbsd? ( >=dev-haskell/network-3.0.0.0:= dev-haskell/network-bsd:= ) !networkbsd? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) s3? ( >=dev-haskell/aws-0.20:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.2.1:= >=dev-haskell/shakespeare-2.0.11:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.2.8:= >=dev-haskell/warp-tls-3.2.2:= >=dev-haskell/yesod-1.4.3:= >=dev-haskell/yesod-core-1.6.0:= >=dev-haskell/yesod-form-1.4.8:= >=dev-haskell/yesod-static-1.5.1:= ) webdav? ( >=dev-haskell/dav-1.0:= ) dev-vcs/git
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/git-annex-8.20200810/git-annex-8.20200810.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e6919339abd5347a4dfa2fe70f3d2ac8
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 2acc390afc7f..239e6c8e4e59 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/fbida-2.14-r3 b/metadata/md5-cache/media-gfx/fbida-2.14-r3
index af3be37b6d0e..3f1fb40f7568 100644
--- a/metadata/md5-cache/media-gfx/fbida-2.14-r3
+++ b/metadata/md5-cache/media-gfx/fbida-2.14-r3
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.kraxel.org/blog/linux/fbida/
 INHERIT=desktop toolchain-funcs
 IUSE=curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 IJG
 RDEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 app-text/poppler media-libs/libepoxy media-libs/libexif virtual/jpeg:* virtual/ttf-fonts x11-libs/cairo[opengl] curl? ( net-misc/curl ) fbcon? ( app-text/poppler[cairo] media-libs/mesa[X(+),gbm(+)] x11-libs/libdrm x11-libs/pixman ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:* ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:* ) webp? ( media-libs/libwebp ) X? ( >=x11-libs/motif-2.3:0[xft] x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) ghostscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=ghostscript? ( tiff )
 SLOT=0
 SRC_URI=https://www.kraxel.org/releases/fbida/fbida-2.14.tar.gz mirror://gentoo/ida.png.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=287162b492c6935fde795535b4a100b1
+_md5_=034b79933075d72fd61ebd6ec988a361
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f0e0177dceae..de8d837e8208 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/harfbuzz-4.4.1 b/metadata/md5-cache/media-libs/harfbuzz-4.4.1
index 4bd67aaca5d8..9cc00dfe3805 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-4.4.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-4.4.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.0.0
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/4.4.1.tar.gz -> harfbuzz-4.4.1.tar.gz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7691f36b8cb5b189306b8dea6b23c7e1
+_md5_=1f7f36b7fdc7c30477986275953089d7
diff --git a/metadata/md5-cache/media-libs/libaom-3.4.0 b/metadata/md5-cache/media-libs/libaom-3.4.0
index f4402d673c25..12df507bdb71 100644
--- a/metadata/md5-cache/media-libs/libaom-3.4.0
+++ b/metadata/md5-cache/media-libs/libaom-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Alliance for Open Media AV1 Codec SDK
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0/3
 SRC_URI=https://storage.googleapis.com/aom-releases/libaom-3.4.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b5fc0785432dff90276d1d477a77feda
+_md5_=78d8e4ae870afcc1d180645c0586e502
diff --git a/metadata/md5-cache/media-libs/libaom-9999 b/metadata/md5-cache/media-libs/libaom-9999
index e268677d44df..9654b31f2c7a 100644
--- a/metadata/md5-cache/media-libs/libaom-9999
+++ b/metadata/md5-cache/media-libs/libaom-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=Alliance for Open Media AV1 Codec SDK
 EAPI=8
@@ -10,4 +10,4 @@ PROPERTIES=live
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/3
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2f3c76b2ac54e7101952f5f22b236552
+_md5_=64140f5b6ca9f568f24ec6d445e57f8a
diff --git a/metadata/md5-cache/media-libs/libmediainfo-22.03 b/metadata/md5-cache/media-libs/libmediainfo-22.03
index 4abf178c7771..129f25a404a2 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-22.03
+++ b/metadata/md5-cache/media-libs/libmediainfo-22.03
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
 INHERIT=autotools edos2unix flag-o-matic
 IUSE=curl doc mms
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37 sys-libs/zlib curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/libmediainfo/22.03/libmediainfo_22.03.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6cddadf93a257c5f2699f34b93f7a751
+_md5_=6281fc011dedd363a4d52a1e8c4a42dc
diff --git a/metadata/md5-cache/media-libs/libzen-0.4.39 b/metadata/md5-cache/media-libs/libzen-0.4.39
index cf10495b4286..f133f2cfde5c 100644
--- a/metadata/md5-cache/media-libs/libzen-0.4.39
+++ b/metadata/md5-cache/media-libs/libzen-0.4.39
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/MediaArea/ZenLib
 INHERIT=autotools
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/libzen/0.4.39/libzen_0.4.39.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f765045ccdd39d1f4195362a6740d3bc
+_md5_=6f3bbc6c0f6d4abcb79fb32b9d830e5f
diff --git a/metadata/md5-cache/media-libs/openal-1.22.0 b/metadata/md5-cache/media-libs/openal-1.22.0
deleted file mode 100644
index 2ce20b2b580a..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.22.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oss? ( virtual/os-headers )
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=8
-HOMEPAGE=https://www.openal-soft.org/
-INHERIT=cmake-multilib
-IUSE=alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+ BSD
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://www.openal-soft.org/openal-releases/openal-soft-1.22.0.tar.bz2
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fc2ee4408be71808b6c631cc77e81a14
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9742cbc4dc9f..cd078e2fad5a 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/mpg123-1.29.3 b/metadata/md5-cache/media-sound/mpg123-1.29.3
deleted file mode 100644
index 72b8024d11a9..000000000000
--- a/metadata/md5-cache/media-sound/mpg123-1.29.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
-DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
-EAPI=8
-HOMEPAGE=https://www.mpg123.org/
-IDEPEND=app-eselect/eselect-mpg123
-INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
-SLOT=0
-SRC_URI=https://www.mpg123.org/download/mpg123-1.29.3.tar.bz2
-_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ce2569fc441806f352daa1acc707c784
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index f45ef612c944..b61afd9ba56d 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/celluloid-0.21 b/metadata/md5-cache/media-video/celluloid-0.21
index 6deba8fcf84a..b05d9ce3f0cc 100644
--- a/metadata/md5-cache/media-video/celluloid-0.21
+++ b/metadata/md5-cache/media-video/celluloid-0.21
@@ -5,10 +5,10 @@ DESCRIPTION=A simple GTK+ frontend for mpv
 EAPI=7
 HOMEPAGE=https://celluloid-player.github.io/
 INHERIT=gnome2-utils meson xdg
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44 >=x11-libs/gtk+-3.22.23:3 >=media-video/mpv-0.32[libmpv] media-libs/libepoxy
 SLOT=0
 SRC_URI=https://github.com/celluloid-player/celluloid/releases/download/v0.21/celluloid-0.21.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4f8829268966571833a7758d17ee2b42
+_md5_=405b8726d47af2c63be4b27a10c3095e
diff --git a/metadata/md5-cache/media-video/mediainfo-22.03 b/metadata/md5-cache/media-video/mediainfo-22.03
index 6d15e04a3461..02840e3ad505 100644
--- a/metadata/md5-cache/media-video/mediainfo-22.03
+++ b/metadata/md5-cache/media-video/mediainfo-22.03
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
 INHERIT=xdg-utils autotools wxwidgets
 IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=~media-libs/libmediainfo-22.03[curl=,mms=] >=media-libs/libzen-0.4.37 sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/22.03/mediainfo_22.03.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f3b3d47cd0d0c9d2f11b9aa24276a7b3
+_md5_=302d5d1ea791e92adab47d5f6999f4e4
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c58206d2bf92..f6cb5e7e0352 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/wget-1.21.3-r1 b/metadata/md5-cache/net-misc/wget-1.21.3-r1
index 078b5335bbfe..af79488eb4e8 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.3-r1
+++ b/metadata/md5-cache/net-misc/wget-1.21.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-perl/HTTP-Daemon-6.60.0 dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) verify-sig? ( sec-keys/openpgp-keys-wget ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-perl/HTTP-Daemon-6.60.0 dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) verify-sig? ( sec-keys/openpgp-keys-wget ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=configure prepare setup unpack
 DEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:=[static-libs(+)] ) !gnutls? ( dev-libs/openssl:=[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) )
 DESCRIPTION=Network utility to retrieve files from the WWW
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.3.tar.gz verify-sig? ( mirror://gnu/wget/wget-1.21.3.tar.gz.sig )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3b6d35a851cae16f6fe1a0e01446295c
+_md5_=87ff13e381aec67536dfdbb4575c9a75
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1620 b/metadata/md5-cache/net-misc/you-get-0.4.1620
new file mode 100644
index 000000000000..4b2f0e92b449
--- /dev/null
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1620
@@ -0,0 +1,17 @@
+BDEPEND=test? ( media-video/ffmpeg dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility to download media contents from the web
+EAPI=8
+HOMEPAGE=https://you-get.org
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=media-video/ffmpeg python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/soimort/you-get/archive/refs/tags/v0.4.1620.tar.gz -> you-get-0.4.1620.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=69324192162da6c45dee754258f9db3b
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 7466133d74ff..a583a0561c18 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/hplip-3.22.4 b/metadata/md5-cache/net-print/hplip-3.22.4
index aaf4752a357f..0aabfb9bf338 100644
--- a/metadata/md5-cache/net-print/hplip-3.22.4
+++ b/metadata/md5-cache/net-print/hplip-3.22.4
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
+DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) )
 DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
 EAPI=8
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.22.4.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.22.2-patches-1.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=c2e56aa807bb349ea2411875e6a4aa6c
+_md5_=334cccd2fea3e50501dc02fee55b09f0
diff --git a/metadata/md5-cache/net-print/hplip-3.22.6 b/metadata/md5-cache/net-print/hplip-3.22.6
new file mode 100644
index 000000000000..04a9820f4dea
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.22.6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=8
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+INHERIT=autotools linux-info python-single-r1 readme.gentoo-r1 udev
+IUSE=doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_9? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] fax? ( dev-python/reportlab[python_targets_python3_9(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_9(-)] libnotify? ( dev-python/notify2[python_targets_python3_9(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_9(-)] >=dev-python/pillow-3.1.1[python_targets_python3_9(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_10? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] fax? ( dev-python/reportlab[python_targets_python3_10(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_10(-)] libnotify? ( dev-python/notify2[python_targets_python3_10(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_10(-)] >=dev-python/pillow-3.1.1[python_targets_python3_10(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.22.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.22.2-patches-1.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=334cccd2fea3e50501dc02fee55b09f0
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index c830def3be6f..bef8030afed2 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.10.2 b/metadata/md5-cache/sci-mathematics/z3-4.10.2
new file mode 100644
index 000000000000..19a982b1c010
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/z3-4.10.2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An efficient theorem prover
+EAPI=8
+HOMEPAGE=https://github.com/Z3Prover/z3/
+INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
+IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0/4.10
+SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.10.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=93d663cd7b213dece4583cdcf2028171
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index efa1eb2c9866..18b089cea75c 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-aacid-20220603 b/metadata/md5-cache/sec-keys/openpgp-keys-aacid-20220603
index 6a81090bdf1a..592560d73b30 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-aacid-20220603
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-aacid-20220603
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by Albert Astals Cid
 EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603-0xCA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7.asc
-_md5_=75c67706ac3291da0ed32a5c846d2c75
+_md5_=21fb81a3fb516aa5fcb8ac9e52b14318
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index f66cf5a8020b..275310386540 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.17 b/metadata/md5-cache/sys-apps/gentoo-functions-0.17
new file mode 100644
index 000000000000..dfdd6313c192
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gentoo-functions-0.17
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Base functions required by all Gentoo systems
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-functions.git
+INHERIT=toolchain-funcs flag-o-matic
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/gentoo-functions-0.17.tar.bz2
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=dbc7b0988e8df080d372e952650c2309
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d1843045b69e..874f09d3af18 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autogen-5.18.16-r1 b/metadata/md5-cache/sys-devel/autogen-5.18.16-r1
index 62e41d5d962f..974ab2255f68 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.16-r1
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.16-r1
@@ -1,3 +1,4 @@
+BDEPEND=sys-apps/which
 DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-scheme/guile-2.0:= dev-libs/libxml2
 DESCRIPTION=Program and text file generation
@@ -11,4 +12,4 @@ RDEPEND=>=dev-scheme/guile-2.0:= dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.18.16/autogen-5.18.16.tar.xz https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/verify.h;h=3b57ddee0acffd23cc51bc8910a15cf879f90619;hb=537a5511ab0b1326e69b32f87593a50aedb8a589 -> autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b73a0d1af4ca183272e3e3b0f7dc2b70
+_md5_=6ea6d6c7aad4a681e4370124710f5794
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.5 b/metadata/md5-cache/sys-devel/automake-1.16.5
index ef5a79c6d5d2..9541198c7ee4 100644
--- a/metadata/md5-cache/sys-devel/automake-1.16.5
+++ b/metadata/md5-cache/sys-devel/automake-1.16.5
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
+BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1.16
 SRC_URI=mirror://gnu/automake/automake-1.16.5.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.5.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=637adb18a77c05c874f6d8886b1f8bd0
+_md5_=9b3b49163fd3349c0928a1b2618da8ed
diff --git a/metadata/md5-cache/sys-devel/automake-9999 b/metadata/md5-cache/sys-devel/automake-9999
index 5e0f28780d55..9f4bfd31d847 100644
--- a/metadata/md5-cache/sys-devel/automake-9999
+++ b/metadata/md5-cache/sys-devel/automake-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -12,4 +12,4 @@ RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b65ae4eb0c9de8d9e0736a6bb0b74eda
+_md5_=587a23eb5022a8c6daf402f8e3a98fbc
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
index aea06fe154d8..52149e5e13f8 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-musl-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f5fec943185c47200531e618c15b58b2
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126 b/metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126
index b9a312cde338..0a8f3306864d 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20211126/gcc-10-20211126.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-musl-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cfdf1387a6f57baf572a05ffa1156bae
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.0 b/metadata/md5-cache/sys-devel/gcc-10.4.0
index 35280f8e4dd7..8dd6b84cc3a5 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.4.0/gcc-10.4.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=c0356f3f9104f2168def26d1c56fed21
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220721 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220721
index 1ea6a73450a7..48742cba52a8 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220721
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220721
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220721/gcc-10-20220721.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=f9494e9ea2250da4afa1087c0a916a9f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220728 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220728
new file mode 100644
index 000000000000..8645099de1e7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220728
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220728/gcc-10-20220728.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f9494e9ea2250da4afa1087c0a916a9f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.5.9999 b/metadata/md5-cache/sys-devel/gcc-10.5.9999
index f4728fb2c4f8..53e059b84c1d 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.5.9999
+++ b/metadata/md5-cache/sys-devel/gcc-10.5.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=10
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=54a0fafef10d105b9af6cbaa6dba27de
diff --git a/metadata/md5-cache/sys-devel/gcc-11.2.0 b/metadata/md5-cache/sys-devel/gcc-11.2.0
index 49a123420266..b6d21a672692 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-11.2.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=210e908d61b09f67d5bc308fcaec9a87
diff --git a/metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115 b/metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
index 1643ac7feba2..e221a31d4d3a 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
+++ b/metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220115/gcc-11-20220115.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-musl-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=82041c40694b01f0d5031826d5841a78
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.0 b/metadata/md5-cache/sys-devel/gcc-11.3.0
index e57e666603bc..f5f03e00953e 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.0
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-musl-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f8b099c70e03ed961c5412b82b92e2ea
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220722 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220722
index 3b46282f23cf..e2fdc1c8cd60 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220722
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220722
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220722/gcc-11-20220722.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=06647a8d13e5a26b05ccceb62d37a26d
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220729 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220729
new file mode 100644
index 000000000000..3e4172e7afc2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220729
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220729/gcc-11-20220729.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=06647a8d13e5a26b05ccceb62d37a26d
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.9999 b/metadata/md5-cache/sys-devel/gcc-11.4.9999
index f512792759f1..9e7afb8e4f73 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.4.9999
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=11
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f2a953bbdbb5eabdcfffd0b629bc9fe1
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.0 b/metadata/md5-cache/sys-devel/gcc-12.1.0
index 3f11fc3aa8a6..c3ef242b2a8e 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.1.0
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.0
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/gcc/gcc-12.1.0/gcc-12.1.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-musl-patches-4.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=b2ac91c3477e5f3fd9024554b81c9a3f
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220625 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220625
index 77fd7b8b2058..d2658a35c608 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220625
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220625
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220625/gcc-12-20220625.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-8.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-5.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5d7f176acd90f37f6930381cafc13a7f
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220723 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220723
index 9ecd63572d03..e11d3d8aaa23 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220723
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220723
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220723/gcc-12-20220723.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-6.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=0d7a92302649bc2c9b79b7eef60af7b2
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.9999 b/metadata/md5-cache/sys-devel/gcc-12.2.9999
index 2c041cfde591..6d3f3786441f 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=12
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=ab5f14afca3a4b0335f166d80d8f305f
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220710 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220710
index 4a5c2ef4b852..a5cb428298c9 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220710
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220710
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20220710/gcc-13-20220710.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=dec02a828d26074fc5bbab4076f1f284
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220724 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220724
index 8d5950695d17..88d917b1ffed 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220724
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220724
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20220724/gcc-13-20220724.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=dec02a828d26074fc5bbab4076f1f284
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.9999 b/metadata/md5-cache/sys-devel/gcc-13.0.9999
index e61120b0d10a..edf77c1345b8 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.9999
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=13
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=e811fe45a490259d5c0fe03831572f29
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
index 2df80ccc6b6c..0ce793298ab7 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=8.5.0
 SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-8.5.0-patches-2.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=83a1f563ce1cd12d8f5d43feaf7b93fd
diff --git a/metadata/md5-cache/sys-devel/gcc-9.5.0 b/metadata/md5-cache/sys-devel/gcc-9.5.0
index f405c8390ee7..53c09f564a1a 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.5.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.5.0
 SRC_URI=mirror://gnu/gcc/gcc-9.5.0/gcc-9.5.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=32dca5127908c9839d737cf60319d04c
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
index 1200df7ffcfc..a2396ad7a451 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
@@ -13,5 +13,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=!test? ( test )
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a985071b860d5fe91f55bc2183ff0c0e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.3.0 b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
index c694332a55df..251b89bbd828 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d34be4589512e82f9f943747de52ad78
diff --git a/metadata/md5-cache/sys-devel/kgcc64-11.3.0 b/metadata/md5-cache/sys-devel/kgcc64-11.3.0
index b481f5f482bc..f7510f30970a 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.3.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-4.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=17f07a9e9509bb6251bcc010a9d0d3b0
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2 b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
index 664702cae89d..2977c91fbc62 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-9.3.0-patches-3.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=91ae91fc00b53f95e69de6db33257da6
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.4.0 b/metadata/md5-cache/sys-devel/kgcc64-9.4.0
index 9044568dcae3..70d83dfc632b 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.4.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.4.0
 SRC_URI=mirror://gnu/gcc/gcc-9.4.0/gcc-9.4.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=bb2d6be225209ef9bb02722f6412172f
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index e9a6df3e3bea..9821e6f4b2a6 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.134 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.134
new file mode 100644
index 000000000000..ddc8fa2f73a5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.134
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.134
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.134 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.134
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-143.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-143.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=13b50ca26023fa518d62c7790f08a18c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.58 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.58
new file mode 100644
index 000000000000..b9467934e949
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.58
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.58
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.58 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.58
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-62.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-62.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a8db24d7d192cf605e1a351f56068d34
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.15
new file mode 100644
index 000000000000..f63940bb116c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.15
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.15
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.18.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.15
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-19.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g2.tar.gz -> gentoo-kernel-config-g2.tar.gz amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.18.9-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.18.9-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.18.9-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.18.9-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f496074a9a907afdb968d190a1fce75d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.208 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.208
new file mode 100644
index 000000000000..ae19ffecd605
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.208
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.208
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.208 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.208
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-213.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-213.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ff5f43a673768b1f4a8057b014ba9cb9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.134 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.134
new file mode 100644
index 000000000000..44be8077bcc0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.134
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.134
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.134 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.134
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-143.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-143.extras.tar.xz amd64? ( https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134-1.xpak -> gentoo-kernel-5.10.134-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134-1.xpak -> gentoo-kernel-5.10.134-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134-1.xpak -> gentoo-kernel-5.10.134-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134-1.xpak -> gentoo-kernel-5.10.134-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a3cc5d9a7a1d5e63f0c93062f8e2bac4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.58 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.58
new file mode 100644
index 000000000000..97aeb7a5b849
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.58
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.58
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.58 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.58
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-62.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-62.extras.tar.xz amd64? ( https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.58-1.xpak -> gentoo-kernel-5.15.58-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.58-1.xpak -> gentoo-kernel-5.15.58-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.58-1.xpak -> gentoo-kernel-5.15.58-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.58-1.xpak -> gentoo-kernel-5.15.58-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=db95108c1f06a3264ac81856238d5f6a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.15
new file mode 100644
index 000000000000..23e3271b1437
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.15
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.15
+RDEPEND=!sys-kernel/gentoo-kernel:5.18.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.15
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-19.extras.tar.xz amd64? ( https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.15-1.xpak -> gentoo-kernel-5.18.15-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.15-1.xpak -> gentoo-kernel-5.18.15-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.15-1.xpak -> gentoo-kernel-5.18.15-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.15-1.xpak -> gentoo-kernel-5.18.15-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=db95108c1f06a3264ac81856238d5f6a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.208 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.208
new file mode 100644
index 000000000000..3cfb0bb80100
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.208
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.208
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.208 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.208
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-213.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-213.extras.tar.xz amd64? ( https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208-1.xpak -> gentoo-kernel-5.4.208-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208-1.xpak -> gentoo-kernel-5.4.208-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208-1.xpak -> gentoo-kernel-5.4.208-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208-1.xpak -> gentoo-kernel-5.4.208-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e70a6924cec36dcf8c3795427473207d
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-5.15.32_p20220331 b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.15.32_p20220331
new file mode 100644
index 000000000000..dbca76d5a1bc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.15.32_p20220331
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend
+DESCRIPTION=Raspberry Pi (all versions) kernel and modules
+EAPI=8
+HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot
+KEYWORDS=-* ~arm ~arm64
+LICENSE=GPL-2 raspberrypi-videocore-bin
+RDEPEND=>sys-boot/raspberrypi-firmware-1.20190709
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20220331.tar.gz -> raspberrypi-firmware-1.20220331.tar.gz
+_eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2
+_md5_=b35b4f01deec5dae44ad5730bdbfad51
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-9999 b/metadata/md5-cache/sys-kernel/raspberrypi-image-9999
index 3c31ec42d628..89922460b14d 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-9999
@@ -1,12 +1,13 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst postrm preinst prerm pretend unpack
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
 DESCRIPTION=Raspberry Pi (all versions) kernel and modules
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot git-r3
 LICENSE=GPL-2 raspberrypi-videocore-bin
 PROPERTIES=live
 RDEPEND=>sys-boot/raspberrypi-firmware-1.20190709
 RESTRICT=binchecks strip
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	mount-boot	02a45c5e022c08dbc05178522b2772f2
-_md5_=aaef5312583ce74dc9e0e4051b063ffb
+_md5_=b35b4f01deec5dae44ad5730bdbfad51
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.134 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.134
new file mode 100644
index 000000000000..c05a2c35e73b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.134
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.134
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.134
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.134.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.134.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=e05a2285b971a7f7bcbc7b9a4c1f9a4d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.58 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.58
new file mode 100644
index 000000000000..14ccaee7f82d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.58
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.58
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.58
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.58.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.58.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=362af3de009d4e02a5d5d05608d2a485
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.15 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.15
new file mode 100644
index 000000000000..19a6fb887f75
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.15
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.15
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.15
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.15.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.15.tar.sign ) amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.18.9-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.18.9-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.18.9-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.18.9-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=de013274f72045e42cad875fe2bd507b
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.208 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.208
new file mode 100644
index 000000000000..d581c6ecaa8a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.208
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build verify-sig
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.208
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.208
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.208.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.208.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=ed42814b85f0ac71eaf96d6f4e673ec3
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index cb65590ccd93..860a2a739c06 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.134 b/metadata/md5-cache/virtual/dist-kernel-5.10.134
new file mode 100644
index 000000000000..bf44c4e7dd99
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.134
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.134 ~sys-kernel/gentoo-kernel-bin-5.10.134 ~sys-kernel/vanilla-kernel-5.10.134 )
+SLOT=0/5.10.134
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.58 b/metadata/md5-cache/virtual/dist-kernel-5.15.58
new file mode 100644
index 000000000000..c127765ac173
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.58
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.58 ~sys-kernel/gentoo-kernel-bin-5.15.58 ~sys-kernel/vanilla-kernel-5.15.58 )
+SLOT=0/5.15.58
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.18.15 b/metadata/md5-cache/virtual/dist-kernel-5.18.15
new file mode 100644
index 000000000000..ff1b9762c9f6
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.18.15
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.18.15 ~sys-kernel/gentoo-kernel-bin-5.18.15 ~sys-kernel/vanilla-kernel-5.18.15 )
+SLOT=0/5.18.15
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.208 b/metadata/md5-cache/virtual/dist-kernel-5.4.208
new file mode 100644
index 000000000000..e05c0ccc18a3
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.208
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.208 ~sys-kernel/gentoo-kernel-bin-5.4.208 ~sys-kernel/vanilla-kernel-5.4.208 )
+SLOT=0/5.4.208
+_md5_=a81ef674c1ec3ce8090dc986ced1eaf3
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 5499e4d1f563..27c0163b13f4 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/gitea-1.16.9 b/metadata/md5-cache/www-apps/gitea-1.16.9
index 2781dd1b2581..6046bce94d92 100644
--- a/metadata/md5-cache/www-apps/gitea-1.16.9
+++ b/metadata/md5-cache/www-apps/gitea-1.16.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitea.io https://github.com/go-gitea/gitea
 INHERIT=fcaps go-module tmpfiles systemd flag-o-matic
 IUSE=+acct pam sqlite pie +filecaps
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git virtual/tmpfiles
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.16.9/gitea-src-1.16.9.tar.gz -> gitea-1.16.9.tar.gz
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3f55c506dc3e60c277ebf9c361ee4ba2
+_md5_=61a4f8f989f4c359c55691e66fe933a2
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3 b/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3
index 4f3b46d679e9..134d60be5d14 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://ikiwiki.info/
 INHERIT=perl-module
 IUSE=extras minimal test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple media-gfx/imagemagick[perl] extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20200202.3.orig.tar.xz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=271463c80f65fcec0a5c113a5d40e405
+_md5_=5781c0ba7047088522585686c03fce0a
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index c22f9c8304f2..6ff2f19de39b 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-6.04 b/metadata/md5-cache/x11-misc/xscreensaver-6.04
index 3e5a44529cae..1d5ebf8e38e6 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-6.04
+++ b/metadata/md5-cache/x11-misc/xscreensaver-6.04
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 INHERIT=autotools flag-o-matic font optfeature pam strip-linguas
 IUSE=elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD fonts? ( MIT Apache-2.0 )
 RDEPEND=dev-libs/libxml2 x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm elogind? ( sys-auth/elogind ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) locking? ( virtual/libcrypt:= ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:= ) systemd? ( >=sys-apps/systemd-221 ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) media-gfx/fbida perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 REQUIRED_USE=gdk-pixbuf? ( gtk ) gles? ( !glx opengl ) glx? ( opengl ) gtk? ( png ) opengl? ( png ) ?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-6.04.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	font	d31f12a0f6e13d56dc3062e76ae58a61	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a82cc287d1227bd16300fce428c2700
+_md5_=60fa199a1bcae9255ad790f4a1c766c4
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 985a29bc4334..9d0e0887609d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14055 BLAKE2B cc8989d376b82bcdb8980643cfd55acab354a49641b1b95506a263a9406db16da70c2af5a10755e35d180167a8123cedb0da0411496add38143d06cd2295da30 SHA512 4c08ccde16f1dafbb970968ef0ea2bc4a0d1775c0b6a687dc12042e322b948a5c4a0b48efd1d01d039c0971c8836c30c44f1f4fad1679d7fa254072281c88eff
-TIMESTAMP 2022-07-30T00:39:35Z
+TIMESTAMP 2022-07-30T06:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkfcdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLk0jFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB6aQ//aqdfHV+ChBx6roLy5zn6cXmKAKjWeA/MT7QPb887pKBLsVIv3nvH8o0n
-y1n0/mqePEu71PFUVWiic7yUz755Z6gw61HBjhFcpsLTpUfwPXLBw3T5RYH6iUV2
-RU50/4HZxOwK+v6/bSXeZbjlZ9saGiT9qkn8GFBMSUtM3vxHmZVsgTuaVURPDxYN
-vukP0l0n8T4YoHs8J7xedeM7IgKxiubhIkL+YRQUtW+hJfHZzbUPbZyw/04V/BA8
-onTcyL93+RbSuhfH1WUXfz1ZJjdnKIGvz7gQRo+eAIwSN1lIchcmp2f0L5WvxWzO
-iybMNIgzkXcNLk0yOY4NQZDlvZRlhuckzsSle89qWZhpcWrUe2S3WNS+s3FKOzZi
-VgG6gWEJjdGWWWZJg4CD8Rp42dLP8KWTc1iNd8ib6DYiuUjA7qsKLuvEGK+wLbAR
-nvY1LGaWAnMRbLDnro/UBvxBOWSkVyZmfp47tYRiyhuAMkEUy8/Cd+/lCVl4xD6E
-Jmw0j8jRvqhb8YLCIZvIldlARMnxzSf+M//ZriMuEcSgB/rxKHAUO6E2HYUz3iT0
-MIfrPYOb4TryKTTN0gwQWKg6DKLmZS5NTzhikM9WlR74ew0pInOtJnHVOtmuyCol
-GjWWQIIpB1ObDswnVsKqE2gLBwBbJpH9Xz0jusmS2pyv236SxJ8=
-=QAw6
+klCYZA//bXXnG4yeEbr/vpNuTGSUXir5zREKyYqInTZENWZjVHbMVoCuLeKkNtKn
+qnxfU6JQLxaGZi2JllzUESGwvABZv81gGRvdjn6MUAlHPVgi2942HPfgBIx+cIJn
+f/B7Emxj4SOCQanuNiHKwV4c8bztX9qa62xq8WaScoQJywt/W2c7ZxMjXNZpSaeL
+8HZASAokc0TO9ovdtYK5lR25H7hUp+MJttqTsQhQc45Zo92ZH79ezkz83PIJfWWu
+v2IcWblzw2JDYNEtxrZhK3XVXCVWkUZff7CyRsEFMJFe7X7rdSwzOfKRRFvGmHvM
+5BWRZDGBD8+hCjyu7CXg1gik0ywM1QZcnUD7uk/BOaz9ICwqMyoXBL9h6+331cww
+uTngHANJoTQLixWl+IfyQaY+U66OyD4k5h2rldYDSLEgBG+ghz+9DxzLGy4sIl/L
+clZ+EfYBSDbWnkj1NOK9frUwuFyyeS25pGxi9EsaycDDSMrxr3LZFTmq3FBN+55q
+192jJQHv39ywPcDbMEoWcb16ef3zoWyYd7lBuqe7ZAkoxaHbsA5iP5G+H+v+K8vB
+QvMySmqjE1FxRtFTH+8D1EXTEf4sFLSeJh94vZwvUym1MP5gavo2TTBwN32ytoJP
+gXNmhjern7dBgg0a2PMEGTh/AHgIFFlwMaOmJWEkha4Wy5hYgPI=
+=7xuL
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index eb8604da6a6f..f5ee81bc6a1d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Jul 2022 00:39:31 +0000
+Sat, 30 Jul 2022 06:39:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index cfd51aecee48..297c0b584f5d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jul 30 12:39:31 AM UTC 2022
+Sat Jul 30 06:39:42 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3e69bd66857f..ef2c430545fc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Jul 2022 00:45:01 +0000
+Sat, 30 Jul 2022 06:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 962ffaf6f769..c81b97b20788 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-786acf3688b2ca883ba0c4a9c2056c13c6c1ff96 1659139699 2022-07-30T00:08:19+00:00
+8c818181797750e74fddb00fd33d2306aa0e8a9c 1659162765 2022-07-30T06:32:45+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 821e1d967af1..f3996e02f2e0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659141601 Sat 30 Jul 2022 12:40:01 AM UTC
+1659163201 Sat 30 Jul 2022 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index eb8604da6a6f..f5ee81bc6a1d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Jul 2022 00:39:31 +0000
+Sat, 30 Jul 2022 06:39:42 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 515e2d30005c..63a3e5c89f1c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 246fdfb77240..0383eb45f2e5 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -3,6 +3,6 @@ DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a
 DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718
 DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f
 EBUILD wget-1.21.2.ebuild 2882 BLAKE2B a7e3fad7bbdbee0eb9d1f55a429dd3aaa3f8119df71a477db28224ca9032e79b9d5f9aff6deac981fa648917720394b6c4479d538641b3f0b23654e0957f1e1b SHA512 8fd8804496ed7ed6f63d86e2da5e72827e3ca9d57436d05e880ae692854ad2052cecaf8ccb51534e3484a06e81b3fc8f07e481eddb12655610156d466fb30509
-EBUILD wget-1.21.3-r1.ebuild 3262 BLAKE2B 34706e3fa400632f2c70aadd568aa55ca2970f8022ac6458e01f3ebe955b5b072e8bc19af73af5d805223a009c01e7ad1fe45363dd52d8272f6d4a736c18efc0 SHA512 4db3d50c00ac3cedf242093ee872fdaba98197403b48461781aa68a1a31d2b5b713bec55637143016dc623f92e7f67aafaf1c9062ba2423c4bd499eac9c38ee1
+EBUILD wget-1.21.3-r1.ebuild 3262 BLAKE2B 057ca7f63fd4962f48d4de6d05f99a481a058c1fe33ca7d59fcfb1374de0906dc18ccd0cf5757a8b89e47b0908455476ad346c20edfbc6c4883f563c7402339c SHA512 eb61d67ae8293f473464c74d62b0840dfc3816fba44400d8587acbc8d27adaf4c6305956c22db0830a08f9d8dd83450145037841bd4e9b50877e5943c7187ac8
 EBUILD wget-1.21.3.ebuild 3212 BLAKE2B bf2c263e84dc4bacbb031ca0edb395116b09b8e1fd3126caca92e67b5b47996934cb520c3f20eda631631b3b56de2dbc9f454060d63687b4eec39631ba8d3b5f SHA512 ba333505e9a095e47dd7430907e05f1ee4cf77c078fb46bcdce3b1b0a865d181259b1ef4ba0afef12110aa826e0ca5d6b046a6453a3bf578ffa8794fbff210b9
 MISC metadata.xml 803 BLAKE2B 9bdb761fa36afd7a03f4631ed314230776de4af2c3e153a3631ee8f9e801233e44abe68ba5ec874bcfaef53d2cb1100a671768169d58d6e2c96387be5210abc9 SHA512 4ddbdc883a155f4eddeb5cd6e031b4824f1f50586ceaedd1b72a8d2ce9d3dffe440a0554e4a9a07f1295f79a5958bcb533ae324919c64daf77caff577318dfc1
diff --git a/net-misc/wget/wget-1.21.3-r1.ebuild b/net-misc/wget/wget-1.21.3-r1.ebuild
index f9868742047a..a9c2b2abbd91 100644
--- a/net-misc/wget/wget-1.21.3-r1.ebuild
+++ b/net-misc/wget/wget-1.21.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/wget.asc
 inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
 
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 3eb84cdd4663..dc12674dc5a6 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,5 +1,7 @@
 DIST you-get-0.4.1555.tar.gz 165932 BLAKE2B 3342441f653703899396cd7a5255bd4498125b332566a149f4528cdab9981caefbf79f12171f031efea93e4b6859ab0cb7c72a0e28b6fd89308fd7747f0f8668 SHA512 8c5a485334c813ec31bf3e72f7df322503cca900272d9c13f6f10f19576bf0b77fcf595d4a5d97a56c8f69b91ccd5a54c2a44a0ac46cc24ec59bf9af196bf8f0
 DIST you-get-0.4.1602.tar.gz 151182 BLAKE2B 343465ac823f92a862ac16e85e9a01918d41d1a68a4a0469e44cc202f82352dac31a42b97699627f29cb656475e75abe3b59a53f6a3cc3d1e304fe33dac302db SHA512 8ca41e0d5499d8150bf782e7fd93ab7baf86ba40599ca120e9afa51b8f2696526cdab9f5b29b7c173fd9830c9cfbf8463d8840ad13cbaa4b34729e1809415760
+DIST you-get-0.4.1620.tar.gz 151401 BLAKE2B d986deb09f353d108bcdc54aa7a53a511c4767491abc55dad8cdf34aaed598859a66bf4efbdbbadddc112ba95df847101354c8c7d670e14fbcca8cef0a3b45a3 SHA512 235e0f0106b00de0382853837be62489ff1d564fad73ebef2b2a5466612f7aae604243e305b9b2c21d4933d3709be14d054c67c7d4bb271efd934e107447a772
 EBUILD you-get-0.4.1555.ebuild 496 BLAKE2B 1641f39759fcdfe9703a6cf20d245d7f93d0fd8503277eaa3a5572b6876e352a35f451b5212ab1e08accbd4ce8e4a0c12a151389c3f56899f77f3fc0c982060b SHA512 4b2891207ae7b7a335524bc9b0f018fd2d22f620e8e87a41bdd46ccb4cc61476f2edcb126ee82b2f29ded31436c15da467443c22802aa739cda78f24b7dd5aa2
 EBUILD you-get-0.4.1602.ebuild 508 BLAKE2B bb93ae7b89bee351bf12bbcd4fd370ca18cf5bbd2e876e395c723eb1c2fad69938ead39ee587226215a8d7d6ebfed32b07541877fc7db04e7d1857889baa7477 SHA512 b6ae6982a4f200cc1bd7b02790f38c20301e9cdef70d147f7b1deec1ffbf8814f88a421225f78797631e3b5ea5360ddcf3895c43d4b98bf6714632701378649d
+EBUILD you-get-0.4.1620.ebuild 508 BLAKE2B bb93ae7b89bee351bf12bbcd4fd370ca18cf5bbd2e876e395c723eb1c2fad69938ead39ee587226215a8d7d6ebfed32b07541877fc7db04e7d1857889baa7477 SHA512 b6ae6982a4f200cc1bd7b02790f38c20301e9cdef70d147f7b1deec1ffbf8814f88a421225f78797631e3b5ea5360ddcf3895c43d4b98bf6714632701378649d
 MISC metadata.xml 356 BLAKE2B 318d22fcafcc9dc37f3487eaf71e6090352e7cabc9e8e46631777c63e6767a95eac7dd3d40958501e474b55fa50b61d4203ed1136911b73a7fc67a8ace78aae5 SHA512 da3bc209c98f0165f249f083ddb172d47d5bff2e15b836f9bccbb2083c7b7ad90fde4c355fa981d66f75676b4f7efc37ca7120df9e91b33a6c13a9d5a018d89b
diff --git a/net-misc/you-get/you-get-0.4.1620.ebuild b/net-misc/you-get/you-get-0.4.1620.ebuild
new file mode 100644
index 000000000000..224c8b53367e
--- /dev/null
+++ b/net-misc/you-get/you-get-0.4.1620.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Utility to download media contents from the web"
+HOMEPAGE="https://you-get.org"
+SRC_URI="https://github.com/soimort/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	media-video/ffmpeg
+"
+
+distutils_enable_tests unittest
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 9060d46f1ef1..c3a4d8a4ddf4 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 0e437dfe83a9..9ac5ebe58bef 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,6 +1,8 @@
 DIST hplip-3.22.2-patches-1.tar.xz 17564 BLAKE2B df4d3c71679000febe68730fd88c81a82283874200d86934318b602fc1fb51f6d90a42effb5fbfef38a98ef6a150f9dc139ca3edeb519d9ac11f98ba7ef7ec63 SHA512 df3716b59bbdd87696900f111d3a0c7d27a474826d343503af43bb625f0796696ffdd24383564f5ff3e600f7ae8f5092700ffc9d130b6d5f812750c8856f6ef8
 DIST hplip-3.22.2.tar.gz 27341972 BLAKE2B d262307430b5a4ca05f2a58cdadc212e93b73141906c0852a2b9b2ced33b942dbec6d9f2fc1f79773d3d37a9d71f37b5fe457ba574d7bf826cd3afeb80d4f05d SHA512 9cde954a11bae2e2ad6120d8fe103ab52409c906dde4c1e82fa7a9e5e265e0a71e0578e3117a8b4508e2c7c87f05052d32b14b39b89e3e59baf7a4055ac5579f
 DIST hplip-3.22.4.tar.gz 27479009 BLAKE2B 6446cecad6a9dea4685874da4879b604ad5c68842783741e8ee87b5cf957a8cc69269ced0a4fa40077abcc35fd0cd8f0103f90e02f1a1244a28617dfd0cd4036 SHA512 8c71a7c87b8e6203dbd9c7d86fc3b926474046c69f00fae1e0f87e057f17ff17184b3c4f8b8d4c14495208b21990cbc1acb08c36d96c96749ab1707922c31923
+DIST hplip-3.22.6.tar.gz 29331408 BLAKE2B 7f2bc09ab2d7950d8e84b4c23d35fd5370ddc51d1d61c674fad0ce1667f8ecf9c25e0b57c155b688d932db583d3c6af528da86348ebe64ce8da9c8d051b2be34 SHA512 cb25c07c767d3d8921468429ef154401a4df9d2fdf87ead3ab18f0d06e1bd3de610843b8131641a1af8d920c7e15e290a0923405bf609cdc0a3fba9df93ddb5e
 EBUILD hplip-3.22.2.ebuild 8193 BLAKE2B 72513998f3040c34f57befd449d793b1a5cd5eed25e1f0cc2f5ef15053bd466f6230492b178d2c31f72198592d522f8334ecc32ed20a0370acff2d3aa63fee22 SHA512 e666a9fb7b0753e82115895db6e8e8879ad02cb80aca5a75ec33c53c0ccdb125d6ac55132a1877a28253791dfcd89cfad81f92caf50407ebe733d402fa25a12f
-EBUILD hplip-3.22.4.ebuild 8212 BLAKE2B cbfc9cadc5ad1eeef29b32d352c42857e33c88354fe0444b130e772bad92baee9c7d429d3e6af972b43ebfc6096b37a02eb742f4d9f56a183384145b5169f7ff SHA512 445f1b9a70a9530adf6590bec0224e8f961f8d6152ff1583f96c42ffed3773e5efcbf9a746fb54159427664a17834280d6fbd65872eefb5fa1f672dcef49ad1b
+EBUILD hplip-3.22.4.ebuild 8243 BLAKE2B b299798f5c0f98e424369ed95e5f881c32605d02dbca80ec61cd5e537f525b40d0c33eed8edb79c4242c5d2cd4a1c71bcac5bf525f378406e8f7e48272f3cef0 SHA512 10ed86939db20e3b442045df463753d4cb1b55e4652979494fa0675dbdf8cd6fd6b4311133b2ca81d8b932bd2f16f868ec949143e0a0b15e972c9b7ac262bce6
+EBUILD hplip-3.22.6.ebuild 8243 BLAKE2B b299798f5c0f98e424369ed95e5f881c32605d02dbca80ec61cd5e537f525b40d0c33eed8edb79c4242c5d2cd4a1c71bcac5bf525f378406e8f7e48272f3cef0 SHA512 10ed86939db20e3b442045df463753d4cb1b55e4652979494fa0675dbdf8cd6fd6b4311133b2ca81d8b932bd2f16f868ec949143e0a0b15e972c9b7ac262bce6
 MISC metadata.xml 1849 BLAKE2B 381cc0d0fe08d072487850a5f5ac6e264cb4ee5db8722b6f83ad9d4e6e78948a7768e80ea2a8a2313bdca1029b59a02d8c3ca309d9438d5e4d63585f7a6b2a83 SHA512 0f5f42b561099e943d99dc5e50cfd42577582b31590c0cd98f276e5acc364fb31f4a48cf91b33e923d24daa77b7b3a6bc54a0c24d9ebff9e3ec82c957a5671e3
diff --git a/net-print/hplip/hplip-3.22.4.ebuild b/net-print/hplip/hplip-3.22.4.ebuild
index 4d98b5009959..adf5ee96e5af 100644
--- a/net-print/hplip/hplip-3.22.4.ebuild
+++ b/net-print/hplip/hplip-3.22.4.ebuild
@@ -284,3 +284,7 @@ pkg_postinst() {
 	udev_reload
 	readme.gentoo_print_elog
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-print/hplip/hplip-3.22.6.ebuild b/net-print/hplip/hplip-3.22.6.ebuild
new file mode 100644
index 000000000000..adf5ee96e5af
--- /dev/null
+++ b/net-print/hplip/hplip-3.22.6.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.22.2-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	sys-apps/dbus
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!libusb0? ( virtual/libusb:1 )
+	libusb0? ( virtual/libusb:0 )
+	${PYTHON_DEPS}
+	!minimal? (
+		scanner? (
+			media-gfx/sane-backends
+		)
+		snmp? (
+			dev-libs/openssl:0=
+			net-analyzer/net-snmp:=
+			net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+			dev-python/distro[${PYTHON_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+				X? (
+					|| (
+						kde? ( kde-misc/skanlite )
+						media-gfx/xsane
+						media-gfx/sane-frontends
+					)
+				)
+			)
+		')
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	use parport && linux-info_pkg_setup
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+		ewarn "This also disables fax, network, scanner and gui support!"
+	fi
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+}
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local drv_build minimal_build
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+		minimal_build="${minimal_build} --disable-fax-build"
+		minimal_build="${minimal_build} --disable-network-build"
+		minimal_build="${minimal_build} --disable-scan-build"
+		minimal_build="${minimal_build} --disable-gui-build"
+	else
+		if use fax ; then
+			minimal_build="${minimal_build} --enable-fax-build"
+		else
+			minimal_build="${minimal_build} --disable-fax-build"
+		fi
+		if use snmp ; then
+			minimal_build="${minimal_build} --enable-network-build"
+		else
+			minimal_build="${minimal_build} --disable-network-build"
+		fi
+		if use scanner ; then
+			minimal_build="${minimal_build} --enable-scan-build"
+		else
+			minimal_build="${minimal_build} --disable-scan-build"
+		fi
+		if use qt5 ; then
+			minimal_build="${minimal_build} --enable-qt5"
+			minimal_build="${minimal_build} --enable-gui-build"
+		else
+			minimal_build="${minimal_build} --disable-gui-build"
+			minimal_build="${minimal_build} --disable-qt5"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-class-driver \
+		--disable-cups11-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-imageProcessor-build \
+		--disable-lite-build \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		--enable-hpps-install \
+		--enable-dbus-build \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable libusb0 libusb01_build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	python_optimize "${ED}"/usr/share/hplip
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	udev_reload
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 96992adc48ec..8f48a9b92c26 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 12f21275c8ad..a97bda8db165 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Marc Schiffbauer <mschiff@gentoo.org> (2022-07-30)
+# No update since 2016, compilation and build system
+# errors
+# Bugs #637150, #686078, #733066, #733068, #828986, #854744
+# removal in 30 days (2022-08-29)
+app-misc/zygrib
+
 # David Seifert <soap@gentoo.org> (2022-07-28)
 # Unmaintained, EOL upstream, QA and build issues, EAPI 6.
 # Bug #682346, #844592, removal on 2022-08-27.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a73268336d7b..ab141cbf72dc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1455,8 +1455,6 @@ dev-haskell/aeson:ordered-keymap - Use ordered @Data.Map.Strict@ for KeyMap impl
 dev-haskell/aeson-pretty:lib-only - don't build 'aeson-pretty' executable.
 dev-haskell/ansi-terminal:example - Build the example application.
 dev-haskell/atomic-primops:debug - Enable extra internal checks.
-dev-haskell/attoparsec-iso8601:developer - operate in developer mode
-dev-haskell/attoparsec-iso8601:fast - compile without optimizations
 dev-haskell/authenticate:network-uri - Get Network.URI from the network-uri package
 dev-haskell/bifunctors:semigroups - You can disable the use of the `semigroups` package using `-f-semigroups`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/bifunctors:tagged - You can disable the use of the `tagged` package using `-f-tagged`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
@@ -1484,6 +1482,7 @@ dev-haskell/criterion:embed-data-files - Embed the data files in the binary for
 dev-haskell/crypto-api:all-cpolys - Build all the CMAC polynomes up to 10000 bits instead of just the usual ones
 dev-haskell/cryptonite:integer-gmp - Whether or not to use GMP for some functions
 dev-haskell/cryptonite:target-attributes - use GCC / clang function attributes instead of global target options.
+dev-haskell/dlist:werror - Enable -Werror
 dev-haskell/entropy:halvm - Build for the HaLVM.
 dev-haskell/filestore:maxcount - Make use of a recent (>= 2.3.0) Darcs feature which vastly improves the performance of 'latest'. You should disable this flag if you plan to use gitit with an older version of Darcs, or 'latest' will raise an error.
 dev-haskell/foundation:experimental - enable building experimental features, known as highly unstable or without good support cross-platform
@@ -1503,8 +1502,6 @@ dev-haskell/hakyll:watchserver - wait for filesystem changes and rebuild pages
 dev-haskell/happstack-server:network-uri - Get Network.URI from the network-uri package
 dev-haskell/hashtables:bounds-checking - if on, use bounds-checking array accesses
 dev-haskell/hashtables:detailed-profiling - add detailed profiling information to profiled build-depends
-dev-haskell/hashtables:portable - if on, use only pure Haskell code and no GHC extensions.
-dev-haskell/hashtables:unsafe-tricks - turn on unsafe GHC tricks
 dev-haskell/haskeline:terminfo - Use the terminfo package for POSIX consoles.
 dev-haskell/hdbc-sqlite3:splitbase - Choose the new smaller, split-up package.
 dev-haskell/highlighting-kate:executable - Build the Highlight executable.
@@ -1514,28 +1511,16 @@ dev-haskell/hlint:hsyaml - Use HsYAML instead of yaml
 dev-haskell/hlint:threaded - Build with support for multithreaded execution
 dev-haskell/hps:build-exec - Build the `hps-fractals' executable
 dev-haskell/hs3:network-uri - Get Network.URI from the network-uri package
-dev-haskell/hslogger:network-3 - Use network-3
-dev-haskell/hslua:hardcode-reg-keys - Don't use CAPI to determine the names of certain registry key names but Use hard coded values for instead. This flag is required when compiling against Lua 5.3.3 or earlier, as those do not expose the necessary information in the @lauxlib.h@ header file.
 dev-haskell/hsopenssl:fast-bignum - Enable fast moving of bignums between OpenSSL and GMP (GHC Only)
 dev-haskell/hsyaml-aeson:exe - Enable @exe:yaml-test@ component
 dev-haskell/http-api-data:text-show - Use text-show library for efficient ToHttpApiData implementation.
-dev-haskell/http-client:network-uri - Get Network.URI from the network-uri package.
-dev-haskell/http-streams:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/httpd-shed:buildexamples - Build example executables.
-dev-haskell/httpd-shed:network-bsd - Get Network.BSD from the network-bsd package.
-dev-haskell/httpd-shed:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/io-streams:network - Include network support
 dev-haskell/io-streams:zlib - Include zlib support
 dev-haskell/json:mapdict - Encode Haskell maps as JSON dicts
 dev-haskell/json:parsec - Add support for parsing with Parsec
 dev-haskell/json:pretty - Add support for using pretty printing combinators
 dev-haskell/language-dot:executable - Build the `ppdot' executable
-dev-haskell/lens:benchmark-uniplate - Enable benchmarking against Neil Mitchell's uniplate library for comparative performance analysis. Defaults to being turned off to avoid the extra dependency.
-dev-haskell/lens:dump-splices - Build and run the doctests test-suite.
-dev-haskell/lens:inlining - Generate inline pragmas when using template-haskell. This defaults to enabled, but you can to shut it off to benchmark the relative performance impact, or as last ditch effort to address compile errors resulting from the myriad versions of template-haskell that all purport to be 2.8.
-dev-haskell/lens:j - Attempt a parallel build with GHC 7.8.
-dev-haskell/lens:safe - Disallow unsafeCoerce
-dev-haskell/lens:trustworthy - Assert that we are trustworthy when we can
 dev-haskell/libyaml:no-unicode - Don't enable unicode output. Instead, unicode characters will be escaped.
 dev-haskell/libyaml:system-libyaml - Use the system-wide libyaml instead of the bundled copy
 dev-haskell/linear:template-haskell - You can disable the use of the `template-haskell` package using `-f-template-haskell`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
@@ -1546,13 +1531,14 @@ dev-haskell/lua:export-dynamic - Add all symbols to dynamic symbol table; disabl
 dev-haskell/lua:hardcode-reg-keys - Don't use CAPI to determine the names of certain registry key names but use hard coded values instead. This flag is required when compiling against Lua 5.3.3 or earlier, as those versions do not expose the necessary information in the @lauxlib.h@ header file. Setting this flag should usually be unproblematic, except if the used Lua version has been patched heavily.
 dev-haskell/lua:lua-32bits - Compile Lua with -DLUA_32BITS
 dev-haskell/lua:system-lua - Use @pkg-config@ to discover library and include paths. Setting this flag implies `pkg-config`.
-dev-haskell/missingh:network-3 - Use network-3
 dev-haskell/mod:semirings - Derive semiring instances
 dev-haskell/monad-logger:template-haskell - Enable Template Haskell support.
+dev-haskell/monad-par:chaselev - Use Chase-Lev Deques for higher-perf work-stealing.
 dev-haskell/nats:binary - enable binary instances
 dev-haskell/nats:hashable - enable hashable instances
 dev-haskell/nats:template-haskell - enable template_haskell
 dev-haskell/netlink:generators - build the generator scripts for constants
+dev-haskell/network:devel - using tests for developers
 dev-haskell/network-data:small-base - Build the split-up base package.
 dev-haskell/optparse-simple:build-example - Build the example executable
 dev-haskell/pandoc-citeproc:bibutils - Use Chris Putnam's Bibutils.
@@ -1564,16 +1550,16 @@ dev-haskell/parsec-numbers:parsec1 - use dev-haskell/parsec1 instead of dev-hask
 dev-haskell/parsers:attoparsec - Enable the use of the `attoparsec` package
 dev-haskell/parsers:binary - You can disable the use of the `binary` package using `-f-binary`.
 dev-haskell/parsers:parsec - Enable the use of the `parsec` package
+dev-haskell/path:dev - Turn on development settings.
 dev-haskell/persistent-sqlite:build-sanity-exe - Build a sanity check test executable.
-dev-haskell/pointed:comonad - optional instances
-dev-haskell/pointed:containers - optional instances
-dev-haskell/pointed:kan-extensions - optional instances
-dev-haskell/pointed:semigroupoids - optional instances
-dev-haskell/pointed:semigroups - optional instances
-dev-haskell/pointed:stm - optional instances
-dev-haskell/pointed:tagged - optional instances
-dev-haskell/pointed:transformers - optional instances
-dev-haskell/pointed:unordered-containers - optional instances
+dev-haskell/pointed:comonad - You can disable the use of the `comonad` package using `-f-transformers`.
+dev-haskell/pointed:kan-extensions - You can disable the use of the `kan-extensions` package using `-f-kan-extensions`.
+dev-haskell/pointed:semigroupoids - You can disable the use of the `semigroupoids` package using `-f-semigroupoids`.
+dev-haskell/pointed:semigroups - You can disable the use of the `semigroups` package using `-f-semigroups`.
+dev-haskell/pointed:stm - You can disable the use of the `stm` package using `-f-stm`.
+dev-haskell/pointed:tagged - You can disable the use of the `tagged` package using `-f-tagged`.
+dev-haskell/pointed:transformers - You can disable the use of the `transformers` package using `-f-transformers`.
+dev-haskell/pointed:unordered-containers - You can disable the use of the `unordered-containers` package using `-f-unordered-containers`.
 dev-haskell/publicsuffixlist:create - export Network.PublicSuffixList.Create module
 dev-haskell/publicsuffixlist:runtimelist - read suffix list from dist at startup instead of embedding list into library
 dev-haskell/quickcheck:template-haskell - Enable additional test modules requiring Template Haskell support.
@@ -1595,11 +1581,6 @@ dev-haskell/semigroupoids:contravariant - You can disable the use of the `contra
 dev-haskell/semigroupoids:distributive - You can disable the use of the `distributive` package using `-f-distributive`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Distributive`
 dev-haskell/semigroupoids:tagged - You can disable the use of the `tagged` package using `-f-tagged`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/semigroupoids:unordered-containers - Enable the use of the `unordered-containers` package (and also its dependency `hashable`). Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-dev-haskell/semigroups:binary - provide instances for binary package
-dev-haskell/semigroups:transformers - provide instances for transformers package.
-dev-haskell/semirings:containers - Enable the use of the `containers` package. Disabling this may be useful for accelerating builds in sandboxes for expert users.
-dev-haskell/semirings:hashable - Enisable the use of the `hashable` package. Disabling this may be useful for accelerating builds in sandboxes for expert users. Note: `-hashable` implies `-unordered-containers`, as we are necessarily not able to supply those instances as well.
-dev-haskell/semirings:unordered-containers - Enable the use of the `unordered-containers` package. Disabling this may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/sendfile:portable - Explicitly enable portable sendfile support (implemented in Haskell)
 dev-haskell/sha:exe - Build a sha1 and a sha384 executable similar to 'md5sum'.
 dev-haskell/shelly:lifted - run the tests against Shelly.Lifted
@@ -1609,15 +1590,14 @@ dev-haskell/skein:force-endianness - Use a manually selected endian when compili
 dev-haskell/skein:reference - Use the reference implementation instead of the optimized one.
 dev-haskell/skylighting:executable - Build the skylighting executable.
 dev-haskell/skylighting-core:executable - Build the skylighting executable.
-dev-haskell/snap-core:portable - No non-haskell unportable code.
-dev-haskell/snap-server:build-pong - Build a server that just returns "PONG"
-dev-haskell/snap-server:openssl - enable https support using dev-haskell/hsopenssl
-dev-haskell/snap-server:portable - no non-haskell unportable code.
+dev-haskell/snap-server:debug - Enable support for debugging.
+dev-haskell/snap-server:openssl - Enable https support using the HsOpenSSL library.
+dev-haskell/snap-server:pong-server - Build a server that just returns "PONG". Normally useful only for benchmarks.
+dev-haskell/snap-server:test-server - Build the blackbox testserver
 dev-haskell/splitmix:optimised-mixer - Use JavaScript for mix32
 dev-haskell/splitmix:random - Providen RandomGen SMGen instance
 dev-haskell/store-core:force-alignment - No description
 dev-haskell/texmath:executable - Compile test executable.
-dev-haskell/texmath:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/texmath:server - Compile webserver.
 dev-haskell/text-short:asserts - Enable runtime-checks via 'assert'
 dev-haskell/thyme:bug-for-bug - bug-for-bug compatibility with time
@@ -2937,16 +2917,11 @@ dev-vcs/git:webdav - Adds support for push'ing to HTTP/HTTPS repositories via DA
 dev-vcs/git-annex:assistant - Enable git-annex assistant and watch command
 dev-vcs/git-annex:benchmark - Enable benchmarking
 dev-vcs/git-annex:dbus - Enable dbus support
-dev-vcs/git-annex:debuglocks - Debug location of MVar/STM deadlocks
 dev-vcs/git-annex:gitlfs - Build with git-lfs library (rather than vendored copy)
-dev-vcs/git-annex:httpclientrestricted - Build with http-client-restricted library (rather than vendored copy)
 dev-vcs/git-annex:magicmime - Use libmagic to determine file MIME types
-dev-vcs/git-annex:networkbsd - Build with network-3.0 which split out network-bsd
 dev-vcs/git-annex:pairing - Enable pairing
-dev-vcs/git-annex:s3 - Enable S3 support
 dev-vcs/git-annex:torrentparser - Use haskell torrent library to parse torrent files
 dev-vcs/git-annex:webapp - Enable git-annex webapp
-dev-vcs/git-annex:webdav - Enable WebDAV support
 dev-vcs/gitg:glade - Install a glade catalog file
 dev-vcs/gitg:python - Install Python bindings for those plugins requiring it.
 dev-vcs/gitolite:contrib - Install user-contributed files
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index e50c91af923c..55cd4e2b1cb0 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index ce19e91422c4..1a601a4c3224 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,7 +1,9 @@
 DIST z3-4.10.1.tar.gz 5366092 BLAKE2B 2b857b7a1b3b71e0b7d2c55b8971fb27115f65b6995e0330786d24badfae563e4a63140790c197255ec566b78ff699c5f0aac99ffeb5eb45c05b2175f3395c20 SHA512 6c8e9f074d4b87f9388384d10dcde51fbdf0e1ee58cf2a5d321e3779ac5054a0ec7bfed3df4f8d3563c457ca7f5189ca310909656e500b6a8803f0df2c693baf
+DIST z3-4.10.2.tar.gz 5367336 BLAKE2B e710dd3ee34e6ef69a1858281f59e96acdea052fe8ee4f1f2e112189d9aac9323fb1d907b9eff22bd9c179846ce1fd98847bab63fe36a67b13c682108eae2019 SHA512 d0e54036d403d124a7bbf4cf8de9fd9159bab5151f875b546474563811dfb259bc46650df950802031a180375745fb589acbc79d0065944f0631df378dd6d0c3
 DIST z3-4.8.17.tar.gz 5232392 BLAKE2B 80dbb5d48811eb6022c0d0117d1e954bae7b27ff984f24cdfbc9158eb548349f817f30ea231d1119aadeedaec63765834bff6f6d21276d0bf61c30212444f224 SHA512 95517014ec1798c2552253dd5cde6f955896ab297a4f56294f4bc6f2c5428069015f513c6eb9a090a809cfcf4cb1cc38cc83818f19b5b1051e4e6c06f973747d
 DIST z3-4.9.1.tar.gz 5358020 BLAKE2B b707084424b615a43dcefbc395d6cf0519f3d6ea3ab1cc8b34b1810d5eb241afa22eae694e4dfc756fff42179a5dabe10052f88aab02953154ada8334f7e0b64 SHA512 0c44e10d039c3bf16591a7b94e3a3209bc334635106ac7ae4afda95541d13d4fc39214646662683c26b4874846e0d83813215e189ce5422d13f8ce7c2ac4db51
 EBUILD z3-4.10.1.ebuild 2616 BLAKE2B 675a78252eccdedc81057c7c5964cc3f8ff8701bcacdfd081246b1333b9c6b2fcdfea463e754a0a464560dcebf26a3ca0044b88f5de63e1a19b77d529a1e9554 SHA512 5e4b1ecbfe6b713d7a30d8dfef2b24f39246b66a0f535c94f3be04072c1928fae18b6f185a323db8bc0b5a301c4347233011874b038cf491d3bbf3137e717055
+EBUILD z3-4.10.2.ebuild 2616 BLAKE2B 675a78252eccdedc81057c7c5964cc3f8ff8701bcacdfd081246b1333b9c6b2fcdfea463e754a0a464560dcebf26a3ca0044b88f5de63e1a19b77d529a1e9554 SHA512 5e4b1ecbfe6b713d7a30d8dfef2b24f39246b66a0f535c94f3be04072c1928fae18b6f185a323db8bc0b5a301c4347233011874b038cf491d3bbf3137e717055
 EBUILD z3-4.8.17.ebuild 2614 BLAKE2B e69e8ede7cebd497598e854224bb1f3c9e93765df016aaf33efbfa56bd2508a773459c829a0343de6aa9cffcfb3e3da4eb62fbd7e438fae7aaf3af26288d4391 SHA512 6c9f47d73b9c016fc404c28656d4102a0f179c2e8b73f548aadbaf2847f211da41ec099b76f9f79602f19fd59eab4ee99ae66315bd47a35509158ad235e4fbac
 EBUILD z3-4.9.1-r1.ebuild 2616 BLAKE2B 675a78252eccdedc81057c7c5964cc3f8ff8701bcacdfd081246b1333b9c6b2fcdfea463e754a0a464560dcebf26a3ca0044b88f5de63e1a19b77d529a1e9554 SHA512 5e4b1ecbfe6b713d7a30d8dfef2b24f39246b66a0f535c94f3be04072c1928fae18b6f185a323db8bc0b5a301c4347233011874b038cf491d3bbf3137e717055
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/z3-4.10.2.ebuild b/sci-mathematics/z3/z3-4.10.2.ebuild
new file mode 100644
index 000000000000..57224c747cf3
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.10.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake-multilib java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+S=${WORKDIR}/z3-${P}
+
+SLOT="0/$(ver_cut 1-2)"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DZ3_USE_LIB_GMP=$(usex gmp)
+		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
+		-DZ3_INCLUDE_GIT_HASH=OFF
+	)
+
+	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 2b389aecfacc..602f316db164 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-aacid/Manifest b/sec-keys/openpgp-keys-aacid/Manifest
index 31515557d50f..edbc268a40b0 100644
--- a/sec-keys/openpgp-keys-aacid/Manifest
+++ b/sec-keys/openpgp-keys-aacid/Manifest
@@ -1,3 +1,3 @@
 DIST openpgp-keys-aacid-20220603-0xCA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7.asc 26510 BLAKE2B a4f3f7863c66397ca9163df0437d8840f8b02f6e43811a31038ee7ad640ea57f01a5ee0c1c54e7efbda68ffdb4c1ffc1db42e82f6439e50f932bd8074392991a SHA512 d0d162c9dd31043cff393c3ec2ec65d37a904ad6f97e3a8509076c6fa2788feaf640dd6d928fa96ccae56a092b9608586a8f90d59af15e677ba5fe9418965d63
-EBUILD openpgp-keys-aacid-20220603.ebuild 718 BLAKE2B 7b6b33f8757f9808f116ba45b163456e16e00bb2d707c106f84be991cf35c992e04c6c742b76671ff595a4c1d4cfc3e8376e2e72b87d090e9b51caf3beedcbb5 SHA512 6c48a8a832345479650d89616da3c9c949e4a3536ed07bfc193445c607c96b3af9a026e9c24bab3002fa0c96366e21a3890326f30267b699ef9133c972de1d04
+EBUILD openpgp-keys-aacid-20220603.ebuild 717 BLAKE2B bfd104e6a4d4b0b404b5ec8436addc85f402086f84aaf205a3115f442d1118cd98ab2a090f51e9c72c400946bb683b80a34c04f5f4369ed1861a28e24a0b6078 SHA512 57b8fa7c70e39c23cda9d7f13353014c230f5bb3e41711a40e61885f4e96ed4d5e6b8ee10cd30a89354e708023c39a259cda072ba6652deefd22c3ba250290ec
 MISC metadata.xml 629 BLAKE2B b7cc93b83ed533024c82d0de48597ad3298575e6aaeee896302327d9f9dba420f9136df63907eddbb147e4bbf878d559dc52d291729836a7e4e6d326b97522c6 SHA512 30c1568e0d3d82386695dcfb7d859e20161350b9fb17436b9a6fe7f30e511b0eab20a1b9f9375a75c703d0a70f16edbe2f352081fb100acc50bc6bd2f1355e95
diff --git a/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603.ebuild b/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603.ebuild
index 50d3ba843b92..5fc6d8c25b5b 100644
--- a/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603.ebuild
+++ b/sec-keys/openpgp-keys-aacid/openpgp-keys-aacid-20220603.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e1b9bf7bf6d0..e076b62b4d3d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 5fa07dec813c..747fbfaf21ff 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,8 +1,10 @@
 DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8 SHA512 e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc
 DIST gentoo-functions-0.15.tar.gz 11236 BLAKE2B da3df4ee809c33a7aa275757380584abcc70dc5f54d32b2e9d3336a9453cfc935e932df065a65a7458b885a449774713fead5aea99ea5e7ee522e5493d35482b SHA512 b2a42e5b43c487d62e036eade88b5cc8e0f4eb249c783837a0293cdbba4ed8a1eea8742d531885bcc56eefa337853c41d257b6a9880fc0e7420b490bb6f98fd4
 DIST gentoo-functions-0.16.tar.bz2 10769 BLAKE2B aa85c97bf07e86631f9d11fc93252099925fb798a12483bead1e270799f44d3107c28e370925c948484a3f490247caf4c17b0068a160af7f72bec0f941699c95 SHA512 aa1f1bfbdd1e7ea51b2cceaae36b15a457b726ecc4fbed5bb3e5475d88b8142642df97b729303085716b1e3c7c92da58fa3b6842af5a04152e9f4c563d3d4b12
+DIST gentoo-functions-0.17.tar.bz2 10798 BLAKE2B 1b725945421ab36b1412f9addc22e9fe299c0e6460790ee2832b9f63d4c06b86bb0d054b01505640a5dc1e62f3cd257628717fec852116a4c8b2c9f9d2d149ee SHA512 6a3de93b5e4d761a53a622f41e6079606cc4ad8a964771d49dafdefbb632afdf722fd055d261e494aa0be956c4160c49a775ab40c927c5340b8e4da275ef51fb
 EBUILD gentoo-functions-0.14.ebuild 848 BLAKE2B 35d8b5af3c2fffab39a9c24b50db326496ee221e26cbfe5dd5566a01cda60c0e053604ee4a40939f8e387f6e3e4bd56e0293f632015bed2aef0a49db952a083f SHA512 3628571e62d5fbae03e9fe46ecd6df143db475ac6d6ce93f9263522187fb747056b0ec3dc27c37c24cb9026afdf2c9d09c2af8bed4bdba770d182c2f698e923b
 EBUILD gentoo-functions-0.15.ebuild 855 BLAKE2B 99f6bb943fe842554c78532329d2a6d8b2ad5a090ff0461cd1502d33c7c90c0dda0a1bcfba50f5ba2da29bd871cfeb76854d68401bc75f142f80cfbb08149be0 SHA512 243429b42af0471862da9e56dc0418908e6857bcbf9f1b526b82fd43b4eb06c022af82e2aab8e3a806d1981438443841e54aca54b2840dfd08c14d3021bef1e3
 EBUILD gentoo-functions-0.16.ebuild 864 BLAKE2B 8198b175c1f6c5fd752e73800822de676f65c536d1d4076ea2192251bd998e067af9eaa33e791afa58f6ce9b1376e3a429bd48aef71decfbb780a339df9f8bc6 SHA512 deab8524211f355bf937258af93b555c4d919d45258f5181fa30a33fe70d34fcb20ed1dedc019c71fc65177419b9c2d1b3f72eca4fe69e86ad04817d3e39b589
+EBUILD gentoo-functions-0.17.ebuild 864 BLAKE2B 8198b175c1f6c5fd752e73800822de676f65c536d1d4076ea2192251bd998e067af9eaa33e791afa58f6ce9b1376e3a429bd48aef71decfbb780a339df9f8bc6 SHA512 deab8524211f355bf937258af93b555c4d919d45258f5181fa30a33fe70d34fcb20ed1dedc019c71fc65177419b9c2d1b3f72eca4fe69e86ad04817d3e39b589
 EBUILD gentoo-functions-9999.ebuild 864 BLAKE2B 8198b175c1f6c5fd752e73800822de676f65c536d1d4076ea2192251bd998e067af9eaa33e791afa58f6ce9b1376e3a429bd48aef71decfbb780a339df9f8bc6 SHA512 deab8524211f355bf937258af93b555c4d919d45258f5181fa30a33fe70d34fcb20ed1dedc019c71fc65177419b9c2d1b3f72eca4fe69e86ad04817d3e39b589
 MISC metadata.xml 493 BLAKE2B c38d800838c6a17834b7783dd5e59ccd58ebaeefa7071f86a798105876bf2c4166157416c31f009d2edc2694b16f922e23f49a51c5d7e29739c536024f54a42f SHA512 4434fc898c5c895a1081535e5f6640001d81d4e2e1772df14541ab31ad3daed9cc34796348d8fc425af06a8d5a0779fa9f5fb6a4b02600dd73d314597ff7b59b
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild
new file mode 100644
index 000000000000..cf5513d3fcf8
--- /dev/null
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2014-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Base functions required by all Gentoo systems"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_configure() {
+	tc-export CC
+	append-lfs-flags
+	export ROOTPREFIX="${EPREFIX}"
+	export PREFIX="${EPREFIX}/usr"
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 6c8b2c0bab45..c6c1deb62db2 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index b16bed6afc75..ed3ea4942d15 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -5,5 +5,5 @@ AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
-EBUILD autogen-5.18.16-r1.ebuild 2121 BLAKE2B 61d0f53dee0f0a6f59d9f193a9b75bd4c469162e9fe52166541725039b035ccbf9a5ca5fb7ecf7104fd0347b3971bc97ad2ca83dcaa02418db016bdefdbeca44 SHA512 dd14c279edfa07e6acc012f93db4316d34f65169589acb4e872865e2314dfbe27d3ec2db8a4631c21aaedc1b71a582c2e0fbaa197ed70a6fc41cb9e6546f5752
+EBUILD autogen-5.18.16-r1.ebuild 2179 BLAKE2B ff3c00f51e6987aadf1913a70161457438ddc7990bc88f01d13ad3a79ecb3f7b1af905a490b0e25016fa981670aa57522afecc975af000a7093e301c6ede5c6a SHA512 e02e57585d3b46675c01018aa00652a4632a7b80cbe24d2b1f94664f4a7bafcb53adaacd0a60cc38e36033139edcb9392d9974a7749bb3865f18a108b21d9f8f
 MISC metadata.xml 370 BLAKE2B 942f7f6c3c4a466667398a42eca7f4dd53f3333ec577c4b64cb35529b3dc35029f57cb395dde2e5ee4c54f97db6e1bba56d0e3bbf3971258d8d39ce7d57995d7 SHA512 4dc996362fde89d1692027f1a6e9d3fc1f4b38b57c9a3938c931d2173205be7065c442d7a6ec27a49306a39183f0927d2e8714c2a8fd01b4f655918466c8fff9
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index e6ca874bac9c..147472e14b0a 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -18,6 +18,8 @@ IUSE="libopts static-libs"
 RDEPEND=">=dev-scheme/guile-2.0:=
 	dev-libs/libxml2"
 DEPEND="${RDEPEND}"
+# TODO: investigate & drop this!
+BDEPEND="sys-apps/which"
 
 # We don't pass the flag explicitly, bug #796776.
 # Let's fix it upstream after next autogen release if it happens.
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index e3444c54ca30..22e76f3808e7 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -15,6 +15,6 @@ DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d15
 EBUILD automake-1.11.6-r3.ebuild 2566 BLAKE2B c1e28e5349f89560b320f0fb61d63a18e13c3aac2a1962e6e8d31f2adf5f22136b9e949ff397c05c0781724aa40580f3217e7991fdbe8ac3c3d533f8e1262e7e SHA512 c4290cffa2dd4ce49949ba7e4db2a9ca7e07e22e6c26d814b1876583732ebd31954bbfed95e516125f12083a080209357872af2c7ccdafd4712fb30f922f9da7
 EBUILD automake-1.13.4-r2.ebuild 2643 BLAKE2B cfb0517a6dbee72711d8f25f4a86c8cfd73ba821f3ed58ca86035d380d5b03102f1a56037257515a21247f1e42d74637df2cd71496a74e5bc47c798c72d9699b SHA512 41dd36863935300680001619afe6fa931521bde40e07c1b226899a09a5ed7ed67603074bfeb2dbd1f51dc0d3a3c968e83e4e64c9ab732406a0983e87c95ad79d
 EBUILD automake-1.15.1-r2.ebuild 3192 BLAKE2B edd43338af2e12fdc25c419bcf452e014a64f23aac91d57d727d61a4125dcc047406a954b8d3b5d02a6232b528b25dc2b4d210e9caf76814453f9793d1a7ca7c SHA512 6de009d30ad3126f93f1c3b705ef44181a385e042488aa206cdc5a9aa7e518da79e80d5853e8f4f73fb3b3c682882afc48bec625ea7a881c63ca7d675a605c2d
-EBUILD automake-1.16.5.ebuild 3525 BLAKE2B 3a44b5c1bef29af0fb91a116e87fad69e124b1dcfebbd6c9046c2754bf54ee401995884fb703248f749b30bb9b2f35388b3559d0a62e33fc81368b5b1e25d322 SHA512 e5cd64e9de5e8ccd9652aeb6420e8596b0e06aace2fc9ce157afd1da2a0a5c14cd49b93115dd1ebc7d3d2ab6a14cc9c52b9a418874e1b7b3009a1e7731d12a50
-EBUILD automake-9999.ebuild 3332 BLAKE2B 6abbaa1f0a3c9b461fa37b51e8e57134d07325eaba082ef4ba057d8e5636af9c0d5b4cf31a269765409bb868a93b5c4aa47843019e0b700a62af605becfe74b2 SHA512 4b96583e29f9598197a9aebbe6a385befe3a0eabb55bfbbb9924a6eb80ea0afbeb6763a52356b0e4175baf0e33d365594896593b09ed5eb1c3ff2ee5b1b6c659
+EBUILD automake-1.16.5.ebuild 3535 BLAKE2B a722a4c6628636d7e13f7b70ffd050d58c9485e5aef6b005e3eabae151dc1f223b2ac53bf74a6e57d50937b94e3c2600803ea6423b33b5ff7f4f26d88f997f54 SHA512 72fb8fe84da386aa75e5e1b905629f0fe87fd8233db336e4803feb159524aab6692b70aef5279c27a460efe7e191b2433bdd2f985112c87df62739f484231375
+EBUILD automake-9999.ebuild 3341 BLAKE2B 042f3a63a8f6121e15bcf6dceef94078b44288b510081fe6f9030dfa9d6511e4e52038d04e9d678a160a890cd094b4f5c897095bcc2421fe336ab865c98c0762 SHA512 f46119a3089930c38680fd0bf556b8508657905a5a6b7c285940188456c1456cdf5faad32a47f2d23b69e43e4ea533bef381eee72b0d31728da08762f44772ac
 MISC metadata.xml 332 BLAKE2B d33ce6b379d5d8d44ae9104f3e5c5a0b5b25682072f7222bdd6dd92b97123b3cc011ed078178a8d2cb9e3e3d1da03dde67b3a844374819fdb67b879341a8a5fa SHA512 ad4477b610e680468526c77df5550b44f8d0558237aac887312a463d4da29216a63db372710398d0eb478550550507e81421d1deee272038b3658c38b84e5b06
diff --git a/sys-devel/automake/automake-1.16.5.ebuild b/sys-devel/automake/automake-1.16.5.ebuild
index df393e3b1078..6e1d35f712b0 100644
--- a/sys-devel/automake/automake-1.16.5.ebuild
+++ b/sys-devel/automake/automake-1.16.5.ebuild
@@ -2,20 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8,9,10} )
+
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
-
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	else
 		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
 		MY_P="${PN}-${MY_PV}"
@@ -23,6 +23,7 @@ else
 		# Alpha/beta releases are not distributed on the usual mirrors.
 		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	fi
+
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -59,14 +60,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	export WANT_AUTOCONF=2.5
-	# Don't try wrapping the autotools this thing runs as it tends
+	# Don't try wrapping the autotools - this thing runs as it tends
 	# to be a bit esoteric, and the script does `set -e` itself.
 	./bootstrap || die
 	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
 
-	# Bug 628912
-	if ! has_version sys-apps/texinfo ; then
+	# bug #628912
+	if ! has_version -b sys-apps/texinfo ; then
 		touch doc/{stamp-vti,version.texi,automake.info} || die
 	fi
 }
@@ -76,8 +78,8 @@ src_configure() {
 	default
 }
 
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
+# Slot the info pages. Do this w/out munging the source so we don't have
+# to depend on texinfo to regen things. bug #464146 (among others)
 slot_info_pages() {
 	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 0467aa671d75..a36fa3529b35 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-any-r1
 
@@ -23,6 +23,7 @@ else
 		# Alpha/beta releases are not distributed on the usual mirrors.
 		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	fi
+
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -53,14 +54,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	export WANT_AUTOCONF=2.5
-	# Don't try wrapping the autotools this thing runs as it tends
+	# Don't try wrapping the autotools - this thing runs as it tends
 	# to be a bit esoteric, and the script does `set -e` itself.
 	./bootstrap || die
 	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
 
-	# Bug 628912
-	if ! has_version sys-apps/texinfo ; then
+	# bug #628912
+	if ! has_version -b sys-apps/texinfo ; then
 		touch doc/{stamp-vti,version.texi,automake.info} || die
 	fi
 }
@@ -70,8 +72,8 @@ src_configure() {
 	default
 }
 
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
+# Slot the info pages. Do this w/out munging the source so we don't have
+# to depend on texinfo to regen things. bug #464146 (among others)
 slot_info_pages() {
 	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2d9345486273..3ca5148eeedf 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -3,6 +3,7 @@ AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20211126.tar.xz 71674848 BLAKE2B 81f4a572e973db7a3701601e66ea58c8e535a55d4d4ac164de00bdb06f7f265585f45d46171cf40d42ebcd3fb02ac81b643398c560912698eb6c008ac6e09518 SHA512 db887184c649ebeede5a1b9f13c00fe425012434cb93ec960c3ca50c0bcdeab04a1cc13b20de21b940e5d6a09c3b1c7fc415110a0e990ec1d938627bf97b9342
 DIST gcc-10-20220721.tar.xz 71754392 BLAKE2B 389d1510a2d4b95a93da0a1ce0ee8e90d0fcec31f49cc13423a4091467eee07939a45e5e23afc1025fdcd02e2f19c509fd610e5d80b91fa124ef54a3fd8baf8c SHA512 9edc37823b556b1fb4d8e205e118a661cf0fcd06d08b78590b5fd694daac9bf5678ed1279d013e544085682c5426b8e1353d95627389df7f00d7008e3075774b
+DIST gcc-10-20220728.tar.xz 71758948 BLAKE2B 520d5234bf896749e66f36e6aa7a953d179ce8b407503f22f7dbe12f260df2a447a005f33d9277a800cc731c0b3261e77efdc1322aa42d451613ff7be237282a SHA512 95951e9a2738568578e8c80a4d806652f8cc90570d2b394fed1b748186af9ac3b79a1911007734f16d879861eccc12a47d852b7ae7b10e6c5cf483eb86792004
 DIST gcc-10.3.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
@@ -12,6 +13,7 @@ DIST gcc-10.4.0-patches-2.tar.xz 15000 BLAKE2B 59a61f7de4b6d2338a8b4fbc88a8e5583
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
 DIST gcc-11-20220115.tar.xz 75676672 BLAKE2B 12171fd97731dbca67f13cc2a3a3a3989c22d628b289cbd3d46080f77a8d951f15c1e54e83a2e62ab41b69221f9784e970799a11a9ed5b224a77ba4b1b081f07 SHA512 7455b3b29d3c64df9123afef82faf922d97e08a3ea30fbc2d9286d4f6ed2fafbfc0f9d94ae1b9eee45329e95a27bd642b3aa679d83a0c27a3e30967d49e0728c
 DIST gcc-11-20220722.tar.xz 75784756 BLAKE2B 1bb107418b7479626e659ff462f31fa1f16fba784d586a672370cddc8912563ca62c0ccdae357f13e2225419b3d6cf1d998b83094619fe7a5e31964bda7b8a62 SHA512 a131deee631de6cab70285263450f35bd32452a4bea0952d96dfd92df65a5c1c7654a06c10ef181fa97dc1ab28c528cb0827ba8948b6eaef41daeb4a7cd5eacb
+DIST gcc-11-20220729.tar.xz 75779788 BLAKE2B f907d56813d651a05d0e24ecfe91eb5c68c90e588765488a3add20d06cc2988619f2259a1503224fa8385dfd54dfd0a5cf665cc6205671eaafe17be615d647de SHA512 c2d72b56bf8e9329260f7500b78fb089f039476c60434e3962b2a0605284943bb105651bc8cbc3588a3c400f857be85d6baef9e86b6334eba72230360082fe55
 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
@@ -40,11 +42,13 @@ EBUILD gcc-10.3.0-r2.ebuild 502 BLAKE2B 2fefeb929c4dd64837a4d27549624bc5c11a10f8
 EBUILD gcc-10.3.1_p20211126.ebuild 542 BLAKE2B 43170f8b81699ab102c389f42313ab6d448ee8097cbaa940cfd10eec884c3223b1569635169e6285b5810f07bde4d9d40d78003ebf6dbe07e32e60a80469cc97 SHA512 dfc4cd1ab39af930d37ff7d14bee89a92a575624e159223be56d2c695ee384afdc6ea84797d468c3b736992db8befe379c5cee04833772fe259d16d6965d58a1
 EBUILD gcc-10.4.0.ebuild 1453 BLAKE2B ea3baac2dc8a51dfb959ad222a708268b860149fe932ef9774f828a678cf329d0c32f8059957645d453f32569ea099488df631bbcf063b298f7f40966129f049 SHA512 7f05c517cee21a55187d8f19a4ab5886201a2999d830011a97e7443bed4619e96c12bf877bc6bc30b783e2eefb0e94706c387030d676a61ecc2d5e49fc0c5471
 EBUILD gcc-10.4.1_p20220721.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
+EBUILD gcc-10.4.1_p20220728.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B af5f165e046455efaaaca747c1deb018b0f43dad720129f72821879fe61790b9d2c233ae9ac0e8d11911b92d390c7a8b082b5dba5a771716f7d9b0aeeb1c6a3b SHA512 905b1f6108ac0608c077e940570829bf9c1e5bde5d852cdbae2b5fddaa304df76dd5bd4499dfb5d26667ced09b3a772567dd850169cec8799731d1cc0abb125c
 EBUILD gcc-11.2.0.ebuild 495 BLAKE2B 122998d820667dbf776aaa7f48a79b3c127f1558f8ec811543e83d3f8534be368749e388254ff14139076baabdcc7ead4be8c5d8f23b3c764ad721cf0478265d SHA512 65a1c11c97d4bde439abad6cd68ee97dd04e8750f4728c3588e923f32eb56b61afa0243570b8c66599e6fe9f6d122113c00c5c1cdf9b7869f01c1564a6c21707
 EBUILD gcc-11.2.1_p20220115.ebuild 688 BLAKE2B c85314316bd63ceae85eaf1ae501932be00c2f5b80092ec4a894aa221e015daceb6687dbf962089b39195ae6470665e7faf09fe9600ae0c74e4d94fcd903e789 SHA512 59d147c88bf9e2a3779320ee89145f01f2acd1110efffc9f967a0c7fee3d910218424b48bf2166c06662a0b1b545b996869f5060ee23da54e8a10f1a0afc3477
 EBUILD gcc-11.3.0.ebuild 687 BLAKE2B 0fb753c50afc9734b65abcb5fff76b029fcf4b2e2a969540a849b4700fe80a95f889fec4e327600e49bb77d1c0297dd02423e41c89f5c8669023463922244cab SHA512 4cf43f6f5ac8b0c386faaad247596bc7b551490c2402b20fc2aadf20ad355fb6a847212d11089c737fac3e230cd4785dc8b03737a2b0e3cd92e91ebef5707ae8
 EBUILD gcc-11.3.1_p20220722.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
+EBUILD gcc-11.3.1_p20220729.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.1.0.ebuild 819 BLAKE2B edb479f30802d9ac62555dc535d388f7630572f44d462d249758f4de5ce62f43c7664cdfe304e48e2009442ff5e8f687ae729947d5e16f8b8dc78d459b74b1b4 SHA512 fa31a6780c63b1ca4f63fb547059528da4f0180c4be307281e54ea06bc0fd8d23599000c166fbdbfc5f618d0ffaf007ac37152efb857f5cb0d2b794a2dd4e9c1
 EBUILD gcc-12.1.1_p20220625.ebuild 799 BLAKE2B 82f30877d60dd0c8b9313c46e1b790748e920ea1e05ce6b9e76d33b6d9539f09ed37687265aa752fc496e61890ce5acba7765b16c793708a7564bea6df144d23 SHA512 818bea94f67785be1f2a390afcaf1550167c508cc4546047c4823189ce1b58111314c78cb13c91cdcd18463cfaec2aa882d738bd32367e43840d3c1bffdcbd8f
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220728.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220728.ebuild
new file mode 100644
index 000000000000..b2fac30d2ffc
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20220728.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.4.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="10.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220729.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220729.ebuild
new file mode 100644
index 000000000000..fec8a9f96524
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20220729.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="1"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="0"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 566b976299c5..ebe80bcac066 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 79942371840f..054fdc1af1bf 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.10-141.base.tar.xz 3795548 BLAKE2B 42dcff42a0c56c0a16028e289c1
 DIST genpatches-5.10-141.extras.tar.xz 3868 BLAKE2B 2f2dc5299a10634e3c011457d1c40c70a8e6ffd64b38e4567193b5be25f66a8687b2fd850192adca24b938b003fe0569c8519eb6e36b557f58b775bf542d311b SHA512 a93b152ecf75984ecf0d0b56e73c19aa11df09a4b27042255c6ce771dabecffc2e3504e394478be6738cd70912f626120bde430af65acd77f17464d2e0b8fb6a
 DIST genpatches-5.10-142.base.tar.xz 3863448 BLAKE2B de45611ba9c92f59829a61b84ad0461535ca68fc5efa2418417bd1fe7e1ac643e2b65e0b467414eea90fd034445219c13782b1c99136367247420502289f7523 SHA512 63b835f0006f0e2ec97432cab93f21f47a7a36098f5699305d6ca2d01d2419fe6ac6588e68210d1332b4e1dad8a6fc74ad95034c8be1524601e4c30b447a3634
 DIST genpatches-5.10-142.extras.tar.xz 3868 BLAKE2B fdff4c1e3ac6b09322168d92469bc5220dded731e05250100df2b5a94d90b2c5bd7612e6c32574ae1c67cd59e6f73d348b3f56bb9027ed1ba11427975796f1e4 SHA512 227bba85de2bf1eba0b0c3d4f314ca0f2f5c3c475ba78e5a82fbb3a682fd37bcef80ef1a91f1ee3747bd2a8c639d2f791110ac72c5406243dd2f54c87d846dd4
+DIST genpatches-5.10-143.base.tar.xz 3888492 BLAKE2B 981a8e21ffff29acfb070164fef85e6beaf41e36a6e9b139a7bbc2027750321286d7e1a6cc51604841352bd65fcc363a80edbb6455c9d8ae83be560603350f95 SHA512 6556642c9d99f0e8160c4e50f99dff42982346ba132abe77bdb83c1fcaf9435fd2573fa56380ce140efff7773ee5ef1cf9475360e6d5703caf4c38b14c135ec0
+DIST genpatches-5.10-143.extras.tar.xz 3868 BLAKE2B 8bcfec127807585e1145930a119e5f8b6f4f481370c4243dfa0b3f5aac36f5b19ce566b458718128224ae63ed3ac8d232a60a917e80890a13a9b48325bd7253f SHA512 ad4f8a858caf876456536ddb7f6998f7d11c81047efa23cf3289fa93b6b9067fbdaa9329cf7b3e3089c0c07b9adabeca49ffa7a1a7eea7d9f5c0a306996d1fb1
 DIST genpatches-5.15-56.base.tar.xz 2245780 BLAKE2B 0f5e5d7c8a29f590598f4721307e3b1a316342cc31b8e5ab5496ed58b65470d19bed59ff40cf7b26bd4970eee04581ee8ac544eebe63c54063c161a55c828cea SHA512 0a1c4edd8f863f2c77a14cf48d79c35868ba8b2f02fb2436e1913e97c8285046ecbedc33e6faddf02a0c813e677492be0fc972e3731c733e488006602eb6119f
 DIST genpatches-5.15-56.extras.tar.xz 3932 BLAKE2B 2b167a35d9dfe16a18b22318ac4597147fb25bef53a66108c2f2e4d6e6d3df1c9d4b1fd6d63ba4a8078f94f8cd69d14b359123355ba266ef72b44f7d9addca9b SHA512 ce91556981720f3718921993eb15f5af623cad8dc40a36bec6cbb0d52153fd1288bf97927daab1b1e3ccd1451d4295b109ead0160c657a00c62c2d6f25fbc09f
 DIST genpatches-5.15-57.base.tar.xz 2275504 BLAKE2B 23dad9d2e9dfc1f77f6e39f8d9e68a6e3168d581136d50d53b3503278bb5e4abfc25e2f9fdab63eeed674e370bee8ae7cc5c54058f6942abaa4eeac49258d765 SHA512 b675437c320b28f4b4ee979fff5c32ea607fd795b090206b49d66fdb95fc2ca1b959fffd33b9e5241a160c2f19902efc8218f2c39eaaa312a5b4149282e08b99
@@ -22,6 +24,8 @@ DIST genpatches-5.15-60.base.tar.xz 2403720 BLAKE2B cc8a8e72894d9139fc2c51412e09
 DIST genpatches-5.15-60.extras.tar.xz 3932 BLAKE2B 2c9b704aa65d9ba6fab93252cd581efe31324fed7d1886bb118a25efe26daba4dd40d75cb263edf6df89323e9967b6f2277692fdcdbb6a50146e669f45c364c5 SHA512 e63206136bf81d5a9012d71396474f6214cbb7980ff4427fa60e69a7d96dde918174a964a6269e6278b4bad6f5faabfb79c1d0c5e3dfb4efc4f13fbc17979273
 DIST genpatches-5.15-61.base.tar.xz 2438712 BLAKE2B 44a8bff3e2df4203943aab61398ce4f136f5101e10a8764885202e799e8d5a6a1270800c5c8cbec98aac4ede007a49616120356aae66008ef2578698aa25dd3e SHA512 88cc84df8f11c8f714a629cba8b22dc730b1cc90d5285c2c5475ef808715418e4080f421ad268c7e8a34c18dc70962b89fbbb23c73ab5f3c76f30435d98ad0ee
 DIST genpatches-5.15-61.extras.tar.xz 3932 BLAKE2B f2579301f9ee4e2dd46dd65472bf208d62642df674863cc905dceb0e91d62cc3e64f1d0d4ed99f0ca9c010108b7df58a12a34b6291eab34f565d9d4ec69c2751 SHA512 17463a7d9e3a2e017654e78dcffba58114ec5cae5e67858f7f3c50bf14a92c1b488f85f4fd5fb61eb53fc74f6a90f0ab152ba9396d0d928050851b4c5ab643d7
+DIST genpatches-5.15-62.base.tar.xz 2506840 BLAKE2B 29d99833ceb0835a02f5acdcb9fac48d7e12107303caf9eb218f9ca4914b3a82fdda0e47399cab1c76d3fe4e0f17378aa466453a5409e01f69ef37ab1753b648 SHA512 5e0725ec3a7f07ff8506c8db54fe5842e0e71f5b5e62e70af43a14e7c2002a71e9b59b73ff943fa64feee453750c63b92033340405098f072a547251d2623dc0
+DIST genpatches-5.15-62.extras.tar.xz 3932 BLAKE2B e4478eeb5bdf3b6db3e9e9de9c02641477aeca08ed07e0b0ab66419301f273b8a79f4b28fc7a22095fde8521479878bc71d70fc585d934efeefe4a408af3493a SHA512 6c241a54f503205408b8b07c1389636fd4ac0e8785d12aec2a363842f8b172e06b9568a8fa9f7607b6ab2f09b5d7892294f3618d1a7549a9c41a78f0c4e02d2c
 DIST genpatches-5.18-12.base.tar.xz 549680 BLAKE2B d6973dfb0d7749fadfc511b1092dedc67b3f8a57e2a117674113f43177bde8608b6106c4c84fbf5f5a161b9710cfad28a3c2fd419fb3c4088d98f9a504ae0cb8 SHA512 c7ad63058bb77c92d3ecf618a41164476a56f2b7b879c667c7fc9666fa1d7f81b599d6ffc5f0fbaa3223e7d399dbb6348ddd511598581083f7b78d505dd81e7c
 DIST genpatches-5.18-12.extras.tar.xz 3920 BLAKE2B 89642c29bae1b15664749c11e581ebf1d0b42801cbd3e436805faaacc419fa7d946a05e7d37bc8d056e36768d181b2e71dfdd6b28943ea112dad9f17a9c2bde1 SHA512 301cd52af9db5a8ec91891a0258a262261d87cf22cb01c27a531d0274ee23d0e928977abe8f5928d3dcba430d032a3cb418193bd1f3e09a923ca6e8718ec7420
 DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 03215db005e5a3668898b1ac4c25aeee5f20d6802d00b11d24d41f506ca9f730f031f5cde187f81406a3c75937d65f854acd3c0e2d2cf9f9cb3ba99454304180 SHA512 bdf29085cf76022aa21faaee63033e3231b9757282633eb5897717128bc340cbf38b12a2918b169b452e85aafc9fadac2645df414f877f43950a3147e00dea68
@@ -34,6 +38,8 @@ DIST genpatches-5.18-17.base.tar.xz 670556 BLAKE2B 9f992048a0a964e6a96b077682d6a
 DIST genpatches-5.18-17.extras.tar.xz 3924 BLAKE2B 4d8bb90dc2446493cee33f5db27f46f4a5d6cb60dac8137f5677a133d71bf2feb5db6b9ebbf32fb148c39be3024f5f378ce096fb0c21ea584d3dca01862e160f SHA512 b1ccb518b25c7bea5cccbdec03d0d8d42ab0b048f6f10f2f036871699d5e75e3694ec10922a0e8f01f640cb3710d8e38124e878450842cce060f6202359ca090
 DIST genpatches-5.18-18.base.tar.xz 701140 BLAKE2B ee91222d6f6ce56d30cfe02b5546fcf7ee3ba04852c4875e9c98ed4177a7b73311e515e543a20107ddd1542077c9b4e2d13fd9cd0e05d507ade84f8fbb942300 SHA512 57aa8878d165ce05c2981c25e9a381df8ac8004336de88b330f779841683a1998dce79cb0e0c1263c77c81a84f01768630ff5e2385693a79b420b5ba05136a1b
 DIST genpatches-5.18-18.extras.tar.xz 3924 BLAKE2B f01ece5d1568a0a760b58108571cfcad343a37be3d344ea728ff89d3fa5c972d7d1c6808ec41ec699ece98a2049ea2c5cc036bae5f44e93cf23528a71e3aa922 SHA512 e810217c00867d3836c4606586e35cc26e8c934382d5927ca188249610b613605437013ca0015217d650e89bede32d67f4daa443bd445dec382832a4e43937ab
+DIST genpatches-5.18-19.base.tar.xz 754304 BLAKE2B 4827ddbf25d32b89c8635f7cbb16bf2ebe3533450d86e358f0f47084a240bcc5faece567f3d8ca943ad980463b324eac184e04c2fee80229f38db8cddf7d25ad SHA512 157d3093573091224d151c930d309fef2160b2d8130ac4d28155d56cde993b6d17ede10fd33d436fa820da5c029bd45021ff393045250e260f7469660305338f
+DIST genpatches-5.18-19.extras.tar.xz 3920 BLAKE2B ba251facf88903832ba28ea4a7619b2ebfdac8b3d507201cad624763523283936c2d8251a715a7e0bd8c72569b55468e2d5c43dc48e6b504cf5d3c024dc840b7 SHA512 40113011145749e3aab4d0ad23ecf2bdaec2eacbe8def70201f13c0208cb0aa142a4e7be8d484e3db3b31142defdea125fbd8f54f4e3220e15a10b4b4f67bbe0
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-209.base.tar.xz 4887256 BLAKE2B 56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00 SHA512 5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
@@ -44,6 +50,8 @@ DIST genpatches-5.4-211.base.tar.xz 4898356 BLAKE2B be058cf67ca37dd3eecc242039e1
 DIST genpatches-5.4-211.extras.tar.xz 1812 BLAKE2B 3edd098fdbae33053dad710c08bafba66b3fff66e2e87935e904c6c5c4ecc2749d8f3135d10ffa6afae15711cdc92c725a08178eae6091355b81e93375d1cbc3 SHA512 264c25cde7a7371726350b0eeab9cc087fb0e0194e92905e1ef2ebe1467ef7ca3a0cd654b65e3fe35f49113882ab9f4041bbbd02095c935baae93b5a37f986cf
 DIST genpatches-5.4-212.base.tar.xz 4910124 BLAKE2B b09dfb8e041beb3ba5813e3f93ee02ef2fe3a6bb62bc4a9124bb19b74612ddca745e7066d9d11e520b6ab60e4a123428dae8e97ad28323e0d279173654a35f41 SHA512 f13c5f6d38e8b71544ee07dfbd049b611b8228d2eadb26225f0a3cb532c8aab2b321a52c17e11a732c6bbfc71586649850bb4c43b932206d7b5ce4691a0b9e2a
 DIST genpatches-5.4-212.extras.tar.xz 1812 BLAKE2B 8016640dadf0add8c91a6631fba836b97173243f900abac4c12e5ae19d1c63e19d21f25df2f22b2880d18cfcc83d002fce7014a26d9f4f3a4bd788fc084db403 SHA512 0f5e5f8b6ad6538bf6850c506019fefe4e95a36f7f568b0c5188ad2c0c06fcb904287452e5692bf63480c321b24a6bdb2db9adeecd3a181c7260ca74f34fb5fb
+DIST genpatches-5.4-213.base.tar.xz 4933392 BLAKE2B ce7ea84b52c60d4ae9cef1ddc3abd3f37de0ad5d7344645b3e4376db29d45b2acfe7b7b89e557c6265b4abbda9827fc68d4ef7c63eb418d3707166d7ed50586e SHA512 6107308eb5f3a0b1b079297fa7815a335620a2a0023250f1c4a92c84dfcf2ab7afea9388906e93fcc21d9ef85f350d638a8d245c29cca5b38968b71ce1a4d06e
+DIST genpatches-5.4-213.extras.tar.xz 1812 BLAKE2B b6812b7e126a55b2079832ddce8c9ba09aee71b8cfcc137c5d0e553a7878e9fdc6e57e64b3670123cb90661d52b3aa0818fbfb7d3d48bd0521c0a0f46ee420e9 SHA512 1deba84aabde4c35213ab38e0f40fe1aa696470bcd5a6f103635d0078726622574ebdbb5caeed7d1516ef45a326052b2ac9d4f6ef2dfb0e0f84f837f9a350927
 DIST gentoo-kernel-5.10.128-1.amd64.xpak 65795239 BLAKE2B ccd03c20e469543532c3df43176ab3c1dd84919930586f3e90f2fcddd6fa6b8b19531ac9b94c7f67f55acaf052ae0b11814d93c4eeec7aedb2a13765165d6fa7 SHA512 cb38dacbbe923640bd0ac679a2430d890cf3609c066196c801b562ec55e59491c1549ddab48f00d2c1e4304310fd7d45108eeccea7bf3c2667712ca8545354d5
 DIST gentoo-kernel-5.10.128-1.arm64.xpak 60993645 BLAKE2B ab40edf44057745e141504d4043d1702fbdf51d0278dfc3803800632e80e7278c347cdd3d325608e0e948b2de3e4ac0bafa824800ce486f360163e29bc0a3d4c SHA512 da31c3a1c5095f28c4824588aad43d6ccf219b1c249ce0665566f732e8920f052fe916609bfa4dd5cdf1271c601c0ab67f299068da38ca695a4b14757a6d401f
 DIST gentoo-kernel-5.10.128-1.ppc64le.xpak 56022338 BLAKE2B ac21918bdfdbd968899393e0a323808d0dd7705a7cac07057f76737c794160ea274f78acca2abe5244228f97343f08253c365bdefde74f2e7ca7ba6086e747d5 SHA512 05f3e3a6f20d1dff3fc8c1f12634e417261a55de47df189b3b9cc28ed7ce5f1673b19726d68dd00c1af4980c46769d029d83094efd98cd8865970f00b41d69c6
@@ -68,6 +76,10 @@ DIST gentoo-kernel-5.10.133-1.amd64.xpak 67472562 BLAKE2B 517890cf35c985ca51c3fb
 DIST gentoo-kernel-5.10.133-1.arm64.xpak 60986275 BLAKE2B 41ba30bcef9eb7666bb6413dabbf1f82976073200a29709d0aeb5852e061ca7bd8b5fc352bd9fdf3dd7f773473481d24356b3f07a6e20b02d96de31f19e5d858 SHA512 6e3331dd667a9b0c405275a8fa35c92aadede045ea7894267e1c8f0233b58643698a71bd32dedbc2871f810058854b4686279defe54c1381a86fd38ad31fa9d5
 DIST gentoo-kernel-5.10.133-1.ppc64le.xpak 55990983 BLAKE2B 4c2f91a461b354a6eb3d6a47493d69c2bf60ce983f35448916093674fd1a3b62901a144928d4e3506a257ef8053c0df568d7d461c71c370cde28a7733995648d SHA512 1d4f37eaa6a228774208c95e02c55209038a8793bb38a2ae5f8dd2e414900925c7385a62b507b318ea64eef6a0019dc1d5c304281b7b7e2244424ac1f3df1476
 DIST gentoo-kernel-5.10.133-1.x86.xpak 58252930 BLAKE2B 769ce7d93a31071b5d1fa6e7f801412224db34afb31d68e8b5de6759bed29887bffd8e97c917d3c2edee2ecb94a8bdee4af23dea980f6a61347e68f10c20f8d4 SHA512 58fcb6355d026d361fb52afc4687aeab31cdf78b91bec315e48d0778e4ed0a1fe9347dd111cf85ab5847ee6d68a20bde5cf4b70e5340741b25ecf68cb3288deb
+DIST gentoo-kernel-5.10.134-1.amd64.xpak 67660154 BLAKE2B 1596fb2a8383b66a2783a2cb1a4b51accab60e3262d420accf21d3e2be7954b34daba134ce6dc096b742c62c67d4cfdd13a6abd0e4e554879aad0499eab1f57d SHA512 8de377b3f463b5b12d06a77aec0d0e92698bcbe7d9726b61b06e8a325b2c251f324bc42e8dcc7e86bbfba5fb73be03cb389312d58bc4da8ba08d4cfc0dcd8e9c
+DIST gentoo-kernel-5.10.134-1.arm64.xpak 60988483 BLAKE2B 775c8358720c4eb6c023faada831e8ec67d643b4450a8b17ac15a45007e8668ca3e0d2a5799278017226805f2fcdc9c79b5020d403afca7e8818a240d33105d2 SHA512 739a3afdd56963d50fa604f2f371996b2c7e8b9d08dcd0693d4b652f358c15a78fee844bb0dd182e3df2cae9f5bf71f07952ca13c71b444343e5a804eb8d6c2b
+DIST gentoo-kernel-5.10.134-1.ppc64le.xpak 56038258 BLAKE2B 4e2fa82a9d8ef9e98fa00e45b144d5017a154bd531338d0be35e532d81fe0943f36dbd9213ddf22325cf1275a82ec7825949945847acc1644b73f35f9b9da7c9 SHA512 280e7e7d4d58bb9ef73bc2e8bf691e2851f62cf2f961d59a6996fc3295c273ebf661b41b9592622b47e48dfe4fc8b4221ffb5b50975dc49eca6e02df8282069a
+DIST gentoo-kernel-5.10.134-1.x86.xpak 58319985 BLAKE2B 8f080d5dcb6b475f3c2abafd535f516ad3795f06c2a540613008bcd5a5ab4b4c4063c12a6a4e77ef4611a553a99e30e1a45b84e2a28750c534b432a288d3c7f5 SHA512 839b0443212686f61738c675fb8451f896b10a604bb05500e4aecbe55f2b6a1c9817d65c894b206eee29fda026baa6bbfa85cf155b3785166bf1f150ef1494a6
 DIST gentoo-kernel-5.15.52-1.amd64.xpak 69378739 BLAKE2B 410ce229e5392547374c5554ae09447869e7101aa4b71d95fe2fee95e4637e529c43c784d35d6e1297d1d8b0a6747f14e977480f907154b1d23ee3f571e4a9d5 SHA512 cf8c27e0ba2d7feeeb20c90f3247ea6334775bff8560c385924b7949d8f34da33d53b35d75b5978515882caea0151a30bbc43c6130320221332103ddddf4e4e7
 DIST gentoo-kernel-5.15.52-1.arm64.xpak 64180081 BLAKE2B f0c4f0991e106bd70b81962b3ef2b2e4fb2bce26f80f5cfe3563c2277bb87236e7d4a2eb7685f0cfe4f7400f0e541cc8b86b7d722d5d72e8ee9afad031b36a9c SHA512 a2bc5409f92f7665350f44307c310b03beb0a2928e390d01408708b12802a9833ad7a732874d71114cb50640b31c633ba8a0de030e6ebe205f2f0bd707ad4c90
 DIST gentoo-kernel-5.15.52-1.ppc64le.xpak 58183126 BLAKE2B 8fbc979f03617ee0146fd891662d244f109976c2fa142364e6ee48095072c442be2c4f46e859209fe688c6def9f7829884c1ba0db654befc4bc4f78c06771f9d SHA512 7038984aa9d4f556cdf322476b29b61ce497017291789eaf99d8b2f03d95d9c3e0899608dcc93053524f2a9415297ea89c4c6738b6add722eba8e25c375e3893
@@ -92,6 +104,10 @@ DIST gentoo-kernel-5.15.57-1.amd64.xpak 70814653 BLAKE2B 99e6bb35f304227ed7fa30d
 DIST gentoo-kernel-5.15.57-1.arm64.xpak 64192337 BLAKE2B d719fe17b8c206229d28a03886b030ad3a2230dc33d1ad9158b6dc23f6cc9ebc006c503e8dab1bae2719536410eb7b6b4f60db3412f10d8e8ffc368171b45830 SHA512 321faf33d9b33b48ec89bdcd13b628acd46686b02c54c02d36f4530cecbd82d4297dae46469d12065965b9b62cf5530c5a1fd6ded68afc83e39b338893931cc0
 DIST gentoo-kernel-5.15.57-1.ppc64le.xpak 58147474 BLAKE2B 40236b5a0b51e19a60125edb2138f924f6f9c2a3e4169138bd42c387b6a788bb617cc313c85fd2c5a940f06a46125dfab5ae2d0525f78448935c06793966109b SHA512 0e4bb5eff0aff0cab72591ed85a6be1ac33532062c9127f6b02ac8683ab51603d2684a1a5a22d5a9c3d2508aaa5ddf583d64115861215d262339f16dd16f9459
 DIST gentoo-kernel-5.15.57-1.x86.xpak 61007112 BLAKE2B 1ecdf4d19673839a649b67d28208b4ad792a3dbf1485ffdf8b503f50c4f1b6c90bf9beb846644c212667cd749423d5a13c5b92c1bc754fcbd14f0a470643c80d SHA512 fb936a9cf568cf8e975763fe417aca93b94a0b52654e1cfaff72e5dc4b703a6f77638fe7ae3d5e14f8da1bf92e4fa33d7899f32f0a6d5e6771b0b75cc220a690
+DIST gentoo-kernel-5.15.58-1.amd64.xpak 70871436 BLAKE2B b79a481d3cbe5c45510792a0646f8eae84f12939de34297baa740183c0a38d85065b350218a28511a5f621a5b48b71db3f47ac005df0287a0f3e88466ffcae7c SHA512 aa58c9af896323a046789702b38c71b288c3fdd809c0307c75c41f6261b72a2c6fc07ad4daf8edb4fa7b51dd94e6ac2a30e486b3634ad35adf7634f4f9aeb700
+DIST gentoo-kernel-5.15.58-1.arm64.xpak 64207429 BLAKE2B c2b13856bddf48270f8c24eb817ce989d91fb9886388ffa4b61474413ac4591bf924035b1b2d376325d3955a16ec4d7d6fd3b77ae395af117e90a8928fec0129 SHA512 e50371cce4e199b4dbe22da1d1bff9b93f54dfd4daa8aa1348ca2c648a8729ed7522a4e473f2d1d8c36cb98fb1827cadc7cac0275857c81e410db0d8eb14b070
+DIST gentoo-kernel-5.15.58-1.ppc64le.xpak 58156088 BLAKE2B 7c130e85990529440845990c8487b3df6fc7f23074a00ba16940f0c8eff84b63c4e429fb20c8b22fe6605dc04a31455ff6712164a6b9f6436fbc98cf84518823 SHA512 7543f10e2b8f5a6abd0a351cffbb073af766047716b14731844e624041ca66944e26b4dda00abfa4b03fd4e76351863727f70663cc912d50d4372c81a5f3cfe2
+DIST gentoo-kernel-5.15.58-1.x86.xpak 61067136 BLAKE2B ad13d29c9f4bb52948e657fe847d6f7364d85304fcd2dc13afaae0920b73abba1adfa8d687f4e356832c8a1a1b3eb68b111516a32a2302b53c8672e2d4f0fff0 SHA512 1de82c0e483b42cc5bcb11ead64e5dd5f6b1488d188103f2750f2ca34e22366ef6b22949040c3b03515c6fb93cd67024e39f7bc6b13f4037d37a836148bd3d13
 DIST gentoo-kernel-5.18.10-1.amd64.xpak 71603500 BLAKE2B 8a0d80fb825ae370cd28f587cd31b4bfb8bf4a679848abfb5c201738c75f0030deacbe77acb1ab367260bba8dd0aa69c5be691857e48e1424b98493ecb5ecd81 SHA512 10460c0153afaa9dfcc5df28e39e6a3b224cd0b614df977c5f84bcaf147178dddff5b4b7524b5a15b36aac873f7b0ed356dfd0771920cba1da7f0fee48144750
 DIST gentoo-kernel-5.18.10-1.arm64.xpak 65243483 BLAKE2B ff8b7846d93f4c57c54666e866f27f8a5fc11f21d546f8c028124e3f2508ee4351f4a3cd75cff254e0cb49b0888ef9ffe6e3affc9f7146b3cc565cbb08edf59b SHA512 aec1358fff66b30c484be9b914f3ce2bf3ef88f41de71d717a5279a4df09aced85275255d9af112e54d4d71b827fc7cfb7b6a4383fc3c2024a72471ffff1a4be
 DIST gentoo-kernel-5.18.10-1.ppc64le.xpak 59437353 BLAKE2B 2ea2d838fbfa1e72d9bf056c627ae983ef75ca1c04a3656282a4e6d701fc0ec65d46181fd4cb513e8ca692ed92bd01e3fbad4a3d7e3e2a3dbf9b441596289882 SHA512 999791b651b107f50b0a7262738b61c39f540b17e83edecc3616e6f8f73454ec8a10fdffe14358aa791cb0c98fd5365e50118edf9db8b31290d81f338bca9f80
@@ -112,6 +128,10 @@ DIST gentoo-kernel-5.18.14-1.amd64.xpak 72835031 BLAKE2B e1ed21149093f6e0b3101f6
 DIST gentoo-kernel-5.18.14-1.arm64.xpak 65244116 BLAKE2B d42100f6dca8b923a32d2c54b8f99422ff9ca3b73744a3b26f9b0201b315784c55fdc9bc05e203287a4cac2f94a9c83b6c1019c95cf4ff2c2059b041de6304a0 SHA512 6ce40b9038a10491bb280654554c77ad71974bfa64aa84748772a403947d7a67a6dbfc8cb594d599a0e5a928ebb6f69f8c756ed7c1ce1a28fb4993a4d5ef7705
 DIST gentoo-kernel-5.18.14-1.ppc64le.xpak 59478148 BLAKE2B 35a53913c103962fc5fc6bcd646f088909f052bf39525aeb2c73b7a8d05c815f55861ab39fd5a8d9c493a052aaea855ab20d6fd8922344fadd64465cf8e3b48e SHA512 9d687885a13721b55267868fe467676c157532343e1ca4d6707441e34180843cbf3c55101e32e2f9400f9a9cdd59756f287dd4b5ec52ba8656c0de01bc9d0940
 DIST gentoo-kernel-5.18.14-1.x86.xpak 62736300 BLAKE2B 874fd5a934861c6b077c3c29e4cce0a73c040edcec4010477bed38cb81d2a5939afcbe1c0a40fb30781e148cf4dc3c6db8fa18fee3d5cf1dbf880c5bba1df0a0 SHA512 3949a160aa439240282d3763ff6e98040e1b2e44fd89475c66e7d6681f813be5bbffdaf5d2d4188944027a1e04ec13f77ff07c8a20e8d6200a6f1548eaa779cd
+DIST gentoo-kernel-5.18.15-1.amd64.xpak 72935393 BLAKE2B 05eef3933a4d3d6c061b79eaf4da654616fc5012612475f078e33edbc6f448b07f1b3feb294ca9c85bf08003d0d1fb0f6b02f0f3d2e1ff25d517a858285b280f SHA512 608112697e4f6f593022297896c8e22792fb92b08601abb57cd2d977f4c97e26d19bd4c2e7f98fedee9bd6fa5c3d5938704085b737081b345bff587c8b2471e5
+DIST gentoo-kernel-5.18.15-1.arm64.xpak 65247697 BLAKE2B 545902d4d44e4e2ec7fd7040ae155c6bc4123fa099f447703102ffba00f4c39a94c41215e207c58a211a497b00b4b03eee495d53679d1e17aa363cfe2665e706 SHA512 1b8576829432a400cc418dd45041229b377713caccb96012fd2fbad9c898bb95d1fa70bb3a9994821612286cb39c2fe8d405cb16a95737fb81ace80e59976887
+DIST gentoo-kernel-5.18.15-1.ppc64le.xpak 59363169 BLAKE2B ea5af950dfe764441a740337d651cc2551590ceef754162b8985073d0eb813b7f4fb37b104da9b5e43b791493466bd9c2f1c69f46292b31420a1d43ff3e5cc94 SHA512 c8ee366fd027e4577cc9793e4c23da0834ff129faef2e8fc031dde66cac1864ac5ff202076c592823faa9187ba9e7671d80373ade457657fbac500c4014b9ec6
+DIST gentoo-kernel-5.18.15-1.x86.xpak 62832725 BLAKE2B fc315f531e839c90b1ac691e418ef0dd0fda73f217d512fba39e962a7843782a74c07de9425d11d395b18b347496559b58c3b7d61f67db002dba311a05ec8583 SHA512 1fca66ae3322b598dcd58fcac6926769dbefcdd6b412091a4ba9e02cfce058f09502cd5ceddda93711406b123e93d7b2e9568c19077735a4e7dd63224049a666
 DIST gentoo-kernel-5.18.9-1.amd64.xpak 71596284 BLAKE2B e9eb499b587770b85cd230bfd5219c246f184addc2e4ff72be07ff8d8899a5532f35d67fd6d6c73289161b5ef5e83d62de8d7e6360a74f7989b16b74ab6122bf SHA512 1ac6bc3f97a9ee754fd9aa6c7360a725d2fc298cecdc28583db3ae8bb80c72d0d593a5c8a85dc868587285541437e1c62deac7baffdbf81aa9dd7f796df71c3c
 DIST gentoo-kernel-5.18.9-1.arm64.xpak 65216795 BLAKE2B 1947791701b9ad904633d8e65d97f098be88029a2d716e0e60d91cc02aff9c03eef429a90c8e85a8f1c0f82eaf49a2a03ea342a2b4537da044544523bc6ac2c7 SHA512 6557d0ec1b3072b51bac84dd99adf16cae9eee745a824ab5d39b227298a14ae5f2050aa1079b529593b583bdde0613dfa1fb099dd718d05aa2b3bb4828fc4a8b
 DIST gentoo-kernel-5.18.9-1.ppc64le.xpak 59391467 BLAKE2B 3d7aaf36df9ac13388101e16e90304ce4b0756a39f84dca004e0bccf054f34dfec4133e216ce68c640272047ba21a39f7d44761f2ea9e6985c92a6300c0bea61 SHA512 e6ccb620c255c5ba9e28919152fd0174f527a30906e3b0f30925ebfd37b189013a6d41343103eee57dec5f4afa29f9560bfb0e501d183496d2412214e11c919f
@@ -136,6 +156,10 @@ DIST gentoo-kernel-5.4.207-1.amd64.xpak 61529662 BLAKE2B 6b7a3c50563eeb61bac94aa
 DIST gentoo-kernel-5.4.207-1.arm64.xpak 57686064 BLAKE2B 50124d68c7aec46dd61b03070b4f4d327363ec2582446e7b664d9d30a4dcb0155401d588b9465e571bfd1db3a2079e9c1c5d97616006eea07db5f9b69cfc95c2 SHA512 581c0dbdccbcfbde68e1ea02feab1140189711e5f5062fb74173950f26d1b8e13265530b52d26b48a05ca9f06aaf0736cc7f4687570c03b0bb625a6b688f6a3c
 DIST gentoo-kernel-5.4.207-1.ppc64le.xpak 55240398 BLAKE2B 5ad22d9a5c957620b6cf41fb650dfc7a8962ecb57399de8c7182beae6f0f10d44ddafafbd7c8f4e791078203b46d5c98e12d360e19f57745a4991d4e7ecafac6 SHA512 5fc4c34a44f815f8f980513b685c594e98e053a36aa0c3e899913ef9b98edaf2236d2aa7af856044b86f7919dc447599ca919f034322dbcc2de7d64cf1d046fc
 DIST gentoo-kernel-5.4.207-1.x86.xpak 53335460 BLAKE2B 2f627cf6844a40a2f3c8f7f0e3e73e7fd1a303a9edc4657b78ebf1e24f51777050141014f5f56c3d144a2528cf27022c1a396899ae0ffbcd58c171ed67a6c359 SHA512 7bb04a8b3af9195f96e7b2d84b065e75d65e113d12a81c0560942f4421fd4a7864c1c44d4a41fdcf764ff06ea3545f195fb72008eccc0a5660a617b40a88173d
+DIST gentoo-kernel-5.4.208-1.amd64.xpak 61740219 BLAKE2B dd7a28cbb98f3ad74b15abf14d8cb92f2195dd4a03c3d108c308d37a393429d55d9814bfb8d6527a556b7a86c0478abc13a8d193d3ad4d54ffb3dd14cd3ac942 SHA512 36c9e0cd8097ed051004d9efb3d0609819bb83267b653815330a2b0551421b48da50b9681e3c7c3fc8c712797d1e5548330305a61285e2cea21d15644183322c
+DIST gentoo-kernel-5.4.208-1.arm64.xpak 57941209 BLAKE2B c83d98ce2ad183b9346af2263fa357bba4bb5abf8096030624ea94316b9899ac290b4e220f0bd6ec10aaf63a589503c730fef1a0ce0e701f0c59e600cfe04adf SHA512 5880a45f0da6376ac2f02595dd21ffc932febf641d5f66d14adf64d9bf76ff1d510f107a86a80d81bc85806538eaa607afa2d8df42719924afc93d7adce9f6c3
+DIST gentoo-kernel-5.4.208-1.ppc64le.xpak 55204548 BLAKE2B 770b0e1728e0379a1e1281e6757528a8ba83a8161706d90b49052c59757e2c0162793d21cc42ac2b1dc639fa16b16d5a4b21895af9ed2862752ad761098098d9 SHA512 b19fdcf7a00047c911242349f04a345d29a78f11fec914f86ae3f7765643529a314f3e1e1b3cfbc4648fbed338f07e5e4999c98bde866878256aa2f6ebe843af
+DIST gentoo-kernel-5.4.208-1.x86.xpak 53382429 BLAKE2B aa1bcf2df9ba30f734e263d443e1de72c7e32bbf8f417f699273d55a05ca77359d01fdb9fa3b1cfb0e2946252591d75e05942e5898246d0953e784412a33292f SHA512 d9907f0fa39b12134515b303df9114dc01f275371abb5c5aa77079ac583a0160e7d1431b46767604ac68bbf8f3fed0b9bc0cc8231264996d20357e287f1cd4b6
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
@@ -146,21 +170,25 @@ EBUILD gentoo-kernel-bin-5.10.130.ebuild 3181 BLAKE2B df517998c1165deede98f869bf
 EBUILD gentoo-kernel-bin-5.10.131.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.10.132.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.10.133.ebuild 3179 BLAKE2B 03f4c965c15962717a13f58647d537076a1df4703a967f475ac2500a5adb6c61d73005c22f29a0841b306a5518016827b4ca267f117f9e042de2f746d3d72972 SHA512 2435df8fc7065563494ec87157917391a5854ecb44e78b8cfcce586c90fd67460da61ff14b187c53767f885a465b56a40e36ec691603d890432179aaa6991987
+EBUILD gentoo-kernel-bin-5.10.134.ebuild 3169 BLAKE2B 320ea5fd9e17ff3a5cfffc305bcba4e2b1451a9a3353adb661633d16f0aa05b7129fc1f5c5b6af6b9308fe4c691c16fe8ad7de289ae761967ba6d2ad3cef82b1 SHA512 adcbfb93f82be3c8ade24d9f681eba253353d1b7ff8351c19a3539457602d831882241b8b8a9adc22a2b621a1acd2e38907310f48bc832a3f74af150a0bdd815
 EBUILD gentoo-kernel-bin-5.15.52.ebuild 3177 BLAKE2B 201c1a0c3a7495f64a85ffe689bb561b5c1005b1b90fb3cb89081f578e669c54c89c0175f14cb8be1b079b16936c8f47a8f080d7c48f558327235d2a053b2483 SHA512 0b94554822df70fbf22eb2cd314d77d989f063ea7954f350fab0af068cbe0f1954bc254616c6be2ed8bbfc1e2bbc72a1b995871f069cd4d6e5b5fa1c4edb306a
 EBUILD gentoo-kernel-bin-5.15.53.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.15.54.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.15.55.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.15.56.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.15.57.ebuild 3179 BLAKE2B 01eb5f420ac3cd98a4dcce1bff2e2fa20e7459c686aef304fc2750242c2db114817e2b981d7ebf426437c953df1e67f1a64af2affa693a5b8c55d81747688d9c SHA512 7e8559b147d4f3215a738b5ab501c5df18da96cef237b4996e554aa8ad1603fbbfb409f4c4cc21b8e9e769d3ab0d7cd3bbc0649a866da6223aa065b20bf385dd
+EBUILD gentoo-kernel-bin-5.15.58.ebuild 3169 BLAKE2B beea92a4d71574afbe65e94b0c65f2b66bfb7962cbb44b2867eaa97963281d99606240fe5aaa8393312df5ec5223404dcf631bc13f1404389b050de78f766016 SHA512 3874f69f775a6b88aa04e75b1157ce49e343af9df9a487ccfdeed01fcaf7fc9c9c84f29274470c362fa6fde6c2a13ebb2d87a3cb5bb1f4906f006c13dbfd89e5
 EBUILD gentoo-kernel-bin-5.18.10.ebuild 3181 BLAKE2B 3d96b3ef0bb3f97f101823690955371ffb3f27246651b9faee643ea972b930e53706bf164d4560d3f5e485e060a40c2bdad46f59c0192076c5737f7851c93ec6 SHA512 2e245d442bb5baf2c731bb328aa1c089d4d4480066b38b198b8ac15dd11f73fc99ad85e9745f4fafcbf3d1c304e76f6209bb931c57fdb02c15a54cb7cc53624e
 EBUILD gentoo-kernel-bin-5.18.11.ebuild 3181 BLAKE2B 3d96b3ef0bb3f97f101823690955371ffb3f27246651b9faee643ea972b930e53706bf164d4560d3f5e485e060a40c2bdad46f59c0192076c5737f7851c93ec6 SHA512 2e245d442bb5baf2c731bb328aa1c089d4d4480066b38b198b8ac15dd11f73fc99ad85e9745f4fafcbf3d1c304e76f6209bb931c57fdb02c15a54cb7cc53624e
 EBUILD gentoo-kernel-bin-5.18.12.ebuild 3179 BLAKE2B d787a408e8c9582f64476f84236a8e8147e2b839207662431c61018a708630ae1515d7811b1136b98c5d1fcee1b395089087c9067af8d94ee7287b87b825eb12 SHA512 d00b78275c6cefe31d3c95520f456fc6fde1c8a43e7e3bffa1b52148727db514838103b00c357a340a1a194218f48cb793b33d5f920a99300fa82705c2c0706d
 EBUILD gentoo-kernel-bin-5.18.13.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.18.14.ebuild 3179 BLAKE2B 01eb5f420ac3cd98a4dcce1bff2e2fa20e7459c686aef304fc2750242c2db114817e2b981d7ebf426437c953df1e67f1a64af2affa693a5b8c55d81747688d9c SHA512 7e8559b147d4f3215a738b5ab501c5df18da96cef237b4996e554aa8ad1603fbbfb409f4c4cc21b8e9e769d3ab0d7cd3bbc0649a866da6223aa065b20bf385dd
+EBUILD gentoo-kernel-bin-5.18.15.ebuild 3169 BLAKE2B beea92a4d71574afbe65e94b0c65f2b66bfb7962cbb44b2867eaa97963281d99606240fe5aaa8393312df5ec5223404dcf631bc13f1404389b050de78f766016 SHA512 3874f69f775a6b88aa04e75b1157ce49e343af9df9a487ccfdeed01fcaf7fc9c9c84f29274470c362fa6fde6c2a13ebb2d87a3cb5bb1f4906f006c13dbfd89e5
 EBUILD gentoo-kernel-bin-5.18.9.ebuild 3181 BLAKE2B 3d96b3ef0bb3f97f101823690955371ffb3f27246651b9faee643ea972b930e53706bf164d4560d3f5e485e060a40c2bdad46f59c0192076c5737f7851c93ec6 SHA512 2e245d442bb5baf2c731bb328aa1c089d4d4480066b38b198b8ac15dd11f73fc99ad85e9745f4fafcbf3d1c304e76f6209bb931c57fdb02c15a54cb7cc53624e
 EBUILD gentoo-kernel-bin-5.4.203.ebuild 3177 BLAKE2B b9df1ff36a996b688640bca679f8342d7cfd016e9305d8b967f5b5895b417ad0aff4e5b07023bef65c3aa7c2f895d3a21c019ddcb48a0dea5844bf16a35a9602 SHA512 46ec6d4b5f3b818ae84d60e7dc1a8abd69f5221d609c5d176a8160cd1bfbcbaf41da3b374369747c98143d5db532bb8e4969d84fa3164d7a2b1e9819b8131ddd
 EBUILD gentoo-kernel-bin-5.4.204.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
 EBUILD gentoo-kernel-bin-5.4.205.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
 EBUILD gentoo-kernel-bin-5.4.206.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
 EBUILD gentoo-kernel-bin-5.4.207.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
+EBUILD gentoo-kernel-bin-5.4.208.ebuild 3169 BLAKE2B 62b9b87d799c751575563e8cf071b67fabcbd29e0d34267aad944a4dcdb6119e4dfc9f47b9e7949362488fd49f97c42609b8084f13b23a90fc4c3c7f9e5e08e3 SHA512 bd8fff79834dfe080a873a0e24ccc6fec8245977f33057851fef4b5c6603c1d6a22bb3faf49a844aad475487c55fffc70d9c62588f0ada46f3f1e5e949250962
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.134.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.134.ebuild
new file mode 100644
index 000000000000..db485661e986
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.134.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.58.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.58.ebuild
new file mode 100644
index 000000000000..cc187009eb97
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.58.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.15.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.15.ebuild
new file mode 100644
index 000000000000..cc187009eb97
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.15.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.208.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.208.ebuild
new file mode 100644
index 000000000000..79b50240fa60
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.208.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 93a23265a069..ef22892034c0 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.10-141.base.tar.xz 3795548 BLAKE2B 42dcff42a0c56c0a16028e289c1
 DIST genpatches-5.10-141.extras.tar.xz 3868 BLAKE2B 2f2dc5299a10634e3c011457d1c40c70a8e6ffd64b38e4567193b5be25f66a8687b2fd850192adca24b938b003fe0569c8519eb6e36b557f58b775bf542d311b SHA512 a93b152ecf75984ecf0d0b56e73c19aa11df09a4b27042255c6ce771dabecffc2e3504e394478be6738cd70912f626120bde430af65acd77f17464d2e0b8fb6a
 DIST genpatches-5.10-142.base.tar.xz 3863448 BLAKE2B de45611ba9c92f59829a61b84ad0461535ca68fc5efa2418417bd1fe7e1ac643e2b65e0b467414eea90fd034445219c13782b1c99136367247420502289f7523 SHA512 63b835f0006f0e2ec97432cab93f21f47a7a36098f5699305d6ca2d01d2419fe6ac6588e68210d1332b4e1dad8a6fc74ad95034c8be1524601e4c30b447a3634
 DIST genpatches-5.10-142.extras.tar.xz 3868 BLAKE2B fdff4c1e3ac6b09322168d92469bc5220dded731e05250100df2b5a94d90b2c5bd7612e6c32574ae1c67cd59e6f73d348b3f56bb9027ed1ba11427975796f1e4 SHA512 227bba85de2bf1eba0b0c3d4f314ca0f2f5c3c475ba78e5a82fbb3a682fd37bcef80ef1a91f1ee3747bd2a8c639d2f791110ac72c5406243dd2f54c87d846dd4
+DIST genpatches-5.10-143.base.tar.xz 3888492 BLAKE2B 981a8e21ffff29acfb070164fef85e6beaf41e36a6e9b139a7bbc2027750321286d7e1a6cc51604841352bd65fcc363a80edbb6455c9d8ae83be560603350f95 SHA512 6556642c9d99f0e8160c4e50f99dff42982346ba132abe77bdb83c1fcaf9435fd2573fa56380ce140efff7773ee5ef1cf9475360e6d5703caf4c38b14c135ec0
+DIST genpatches-5.10-143.extras.tar.xz 3868 BLAKE2B 8bcfec127807585e1145930a119e5f8b6f4f481370c4243dfa0b3f5aac36f5b19ce566b458718128224ae63ed3ac8d232a60a917e80890a13a9b48325bd7253f SHA512 ad4f8a858caf876456536ddb7f6998f7d11c81047efa23cf3289fa93b6b9067fbdaa9329cf7b3e3089c0c07b9adabeca49ffa7a1a7eea7d9f5c0a306996d1fb1
 DIST genpatches-5.15-56.base.tar.xz 2245780 BLAKE2B 0f5e5d7c8a29f590598f4721307e3b1a316342cc31b8e5ab5496ed58b65470d19bed59ff40cf7b26bd4970eee04581ee8ac544eebe63c54063c161a55c828cea SHA512 0a1c4edd8f863f2c77a14cf48d79c35868ba8b2f02fb2436e1913e97c8285046ecbedc33e6faddf02a0c813e677492be0fc972e3731c733e488006602eb6119f
 DIST genpatches-5.15-56.extras.tar.xz 3932 BLAKE2B 2b167a35d9dfe16a18b22318ac4597147fb25bef53a66108c2f2e4d6e6d3df1c9d4b1fd6d63ba4a8078f94f8cd69d14b359123355ba266ef72b44f7d9addca9b SHA512 ce91556981720f3718921993eb15f5af623cad8dc40a36bec6cbb0d52153fd1288bf97927daab1b1e3ccd1451d4295b109ead0160c657a00c62c2d6f25fbc09f
 DIST genpatches-5.15-57.base.tar.xz 2275504 BLAKE2B 23dad9d2e9dfc1f77f6e39f8d9e68a6e3168d581136d50d53b3503278bb5e4abfc25e2f9fdab63eeed674e370bee8ae7cc5c54058f6942abaa4eeac49258d765 SHA512 b675437c320b28f4b4ee979fff5c32ea607fd795b090206b49d66fdb95fc2ca1b959fffd33b9e5241a160c2f19902efc8218f2c39eaaa312a5b4149282e08b99
@@ -22,6 +24,8 @@ DIST genpatches-5.15-60.base.tar.xz 2403720 BLAKE2B cc8a8e72894d9139fc2c51412e09
 DIST genpatches-5.15-60.extras.tar.xz 3932 BLAKE2B 2c9b704aa65d9ba6fab93252cd581efe31324fed7d1886bb118a25efe26daba4dd40d75cb263edf6df89323e9967b6f2277692fdcdbb6a50146e669f45c364c5 SHA512 e63206136bf81d5a9012d71396474f6214cbb7980ff4427fa60e69a7d96dde918174a964a6269e6278b4bad6f5faabfb79c1d0c5e3dfb4efc4f13fbc17979273
 DIST genpatches-5.15-61.base.tar.xz 2438712 BLAKE2B 44a8bff3e2df4203943aab61398ce4f136f5101e10a8764885202e799e8d5a6a1270800c5c8cbec98aac4ede007a49616120356aae66008ef2578698aa25dd3e SHA512 88cc84df8f11c8f714a629cba8b22dc730b1cc90d5285c2c5475ef808715418e4080f421ad268c7e8a34c18dc70962b89fbbb23c73ab5f3c76f30435d98ad0ee
 DIST genpatches-5.15-61.extras.tar.xz 3932 BLAKE2B f2579301f9ee4e2dd46dd65472bf208d62642df674863cc905dceb0e91d62cc3e64f1d0d4ed99f0ca9c010108b7df58a12a34b6291eab34f565d9d4ec69c2751 SHA512 17463a7d9e3a2e017654e78dcffba58114ec5cae5e67858f7f3c50bf14a92c1b488f85f4fd5fb61eb53fc74f6a90f0ab152ba9396d0d928050851b4c5ab643d7
+DIST genpatches-5.15-62.base.tar.xz 2506840 BLAKE2B 29d99833ceb0835a02f5acdcb9fac48d7e12107303caf9eb218f9ca4914b3a82fdda0e47399cab1c76d3fe4e0f17378aa466453a5409e01f69ef37ab1753b648 SHA512 5e0725ec3a7f07ff8506c8db54fe5842e0e71f5b5e62e70af43a14e7c2002a71e9b59b73ff943fa64feee453750c63b92033340405098f072a547251d2623dc0
+DIST genpatches-5.15-62.extras.tar.xz 3932 BLAKE2B e4478eeb5bdf3b6db3e9e9de9c02641477aeca08ed07e0b0ab66419301f273b8a79f4b28fc7a22095fde8521479878bc71d70fc585d934efeefe4a408af3493a SHA512 6c241a54f503205408b8b07c1389636fd4ac0e8785d12aec2a363842f8b172e06b9568a8fa9f7607b6ab2f09b5d7892294f3618d1a7549a9c41a78f0c4e02d2c
 DIST genpatches-5.18-12.base.tar.xz 549680 BLAKE2B d6973dfb0d7749fadfc511b1092dedc67b3f8a57e2a117674113f43177bde8608b6106c4c84fbf5f5a161b9710cfad28a3c2fd419fb3c4088d98f9a504ae0cb8 SHA512 c7ad63058bb77c92d3ecf618a41164476a56f2b7b879c667c7fc9666fa1d7f81b599d6ffc5f0fbaa3223e7d399dbb6348ddd511598581083f7b78d505dd81e7c
 DIST genpatches-5.18-12.extras.tar.xz 3920 BLAKE2B 89642c29bae1b15664749c11e581ebf1d0b42801cbd3e436805faaacc419fa7d946a05e7d37bc8d056e36768d181b2e71dfdd6b28943ea112dad9f17a9c2bde1 SHA512 301cd52af9db5a8ec91891a0258a262261d87cf22cb01c27a531d0274ee23d0e928977abe8f5928d3dcba430d032a3cb418193bd1f3e09a923ca6e8718ec7420
 DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 03215db005e5a3668898b1ac4c25aeee5f20d6802d00b11d24d41f506ca9f730f031f5cde187f81406a3c75937d65f854acd3c0e2d2cf9f9cb3ba99454304180 SHA512 bdf29085cf76022aa21faaee63033e3231b9757282633eb5897717128bc340cbf38b12a2918b169b452e85aafc9fadac2645df414f877f43950a3147e00dea68
@@ -34,6 +38,8 @@ DIST genpatches-5.18-17.base.tar.xz 670556 BLAKE2B 9f992048a0a964e6a96b077682d6a
 DIST genpatches-5.18-17.extras.tar.xz 3924 BLAKE2B 4d8bb90dc2446493cee33f5db27f46f4a5d6cb60dac8137f5677a133d71bf2feb5db6b9ebbf32fb148c39be3024f5f378ce096fb0c21ea584d3dca01862e160f SHA512 b1ccb518b25c7bea5cccbdec03d0d8d42ab0b048f6f10f2f036871699d5e75e3694ec10922a0e8f01f640cb3710d8e38124e878450842cce060f6202359ca090
 DIST genpatches-5.18-18.base.tar.xz 701140 BLAKE2B ee91222d6f6ce56d30cfe02b5546fcf7ee3ba04852c4875e9c98ed4177a7b73311e515e543a20107ddd1542077c9b4e2d13fd9cd0e05d507ade84f8fbb942300 SHA512 57aa8878d165ce05c2981c25e9a381df8ac8004336de88b330f779841683a1998dce79cb0e0c1263c77c81a84f01768630ff5e2385693a79b420b5ba05136a1b
 DIST genpatches-5.18-18.extras.tar.xz 3924 BLAKE2B f01ece5d1568a0a760b58108571cfcad343a37be3d344ea728ff89d3fa5c972d7d1c6808ec41ec699ece98a2049ea2c5cc036bae5f44e93cf23528a71e3aa922 SHA512 e810217c00867d3836c4606586e35cc26e8c934382d5927ca188249610b613605437013ca0015217d650e89bede32d67f4daa443bd445dec382832a4e43937ab
+DIST genpatches-5.18-19.base.tar.xz 754304 BLAKE2B 4827ddbf25d32b89c8635f7cbb16bf2ebe3533450d86e358f0f47084a240bcc5faece567f3d8ca943ad980463b324eac184e04c2fee80229f38db8cddf7d25ad SHA512 157d3093573091224d151c930d309fef2160b2d8130ac4d28155d56cde993b6d17ede10fd33d436fa820da5c029bd45021ff393045250e260f7469660305338f
+DIST genpatches-5.18-19.extras.tar.xz 3920 BLAKE2B ba251facf88903832ba28ea4a7619b2ebfdac8b3d507201cad624763523283936c2d8251a715a7e0bd8c72569b55468e2d5c43dc48e6b504cf5d3c024dc840b7 SHA512 40113011145749e3aab4d0ad23ecf2bdaec2eacbe8def70201f13c0208cb0aa142a4e7be8d484e3db3b31142defdea125fbd8f54f4e3220e15a10b4b4f67bbe0
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-209.base.tar.xz 4887256 BLAKE2B 56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00 SHA512 5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
@@ -44,6 +50,8 @@ DIST genpatches-5.4-211.base.tar.xz 4898356 BLAKE2B be058cf67ca37dd3eecc242039e1
 DIST genpatches-5.4-211.extras.tar.xz 1812 BLAKE2B 3edd098fdbae33053dad710c08bafba66b3fff66e2e87935e904c6c5c4ecc2749d8f3135d10ffa6afae15711cdc92c725a08178eae6091355b81e93375d1cbc3 SHA512 264c25cde7a7371726350b0eeab9cc087fb0e0194e92905e1ef2ebe1467ef7ca3a0cd654b65e3fe35f49113882ab9f4041bbbd02095c935baae93b5a37f986cf
 DIST genpatches-5.4-212.base.tar.xz 4910124 BLAKE2B b09dfb8e041beb3ba5813e3f93ee02ef2fe3a6bb62bc4a9124bb19b74612ddca745e7066d9d11e520b6ab60e4a123428dae8e97ad28323e0d279173654a35f41 SHA512 f13c5f6d38e8b71544ee07dfbd049b611b8228d2eadb26225f0a3cb532c8aab2b321a52c17e11a732c6bbfc71586649850bb4c43b932206d7b5ce4691a0b9e2a
 DIST genpatches-5.4-212.extras.tar.xz 1812 BLAKE2B 8016640dadf0add8c91a6631fba836b97173243f900abac4c12e5ae19d1c63e19d21f25df2f22b2880d18cfcc83d002fce7014a26d9f4f3a4bd788fc084db403 SHA512 0f5e5f8b6ad6538bf6850c506019fefe4e95a36f7f568b0c5188ad2c0c06fcb904287452e5692bf63480c321b24a6bdb2db9adeecd3a181c7260ca74f34fb5fb
+DIST genpatches-5.4-213.base.tar.xz 4933392 BLAKE2B ce7ea84b52c60d4ae9cef1ddc3abd3f37de0ad5d7344645b3e4376db29d45b2acfe7b7b89e557c6265b4abbda9827fc68d4ef7c63eb418d3707166d7ed50586e SHA512 6107308eb5f3a0b1b079297fa7815a335620a2a0023250f1c4a92c84dfcf2ab7afea9388906e93fcc21d9ef85f350d638a8d245c29cca5b38968b71ce1a4d06e
+DIST genpatches-5.4-213.extras.tar.xz 1812 BLAKE2B b6812b7e126a55b2079832ddce8c9ba09aee71b8cfcc137c5d0e553a7878e9fdc6e57e64b3670123cb90661d52b3aa0818fbfb7d3d48bd0521c0a0f46ee420e9 SHA512 1deba84aabde4c35213ab38e0f40fe1aa696470bcd5a6f103635d0078726622574ebdbb5caeed7d1516ef45a326052b2ac9d4f6ef2dfb0e0f84f837f9a350927
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -72,21 +80,25 @@ EBUILD gentoo-kernel-5.10.130.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef5
 EBUILD gentoo-kernel-5.10.131.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
 EBUILD gentoo-kernel-5.10.132.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
 EBUILD gentoo-kernel-5.10.133.ebuild 3600 BLAKE2B da8fd39e45fcd91eadefb6f9a19db344462e9684d107be169ff5ae14dcefdba65fd9366f54427e603d79ed23985ca64bbc37a7d2d644752c51f7ae0588b0314e SHA512 d49d5d244b403302ff553a84e22b5008267449d6619bede6fdf9e64bc520a14a4b443812a914ba69342e101573254c51bab452103015ba8c44433c00ddbd4be5
+EBUILD gentoo-kernel-5.10.134.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
 EBUILD gentoo-kernel-5.15.52.ebuild 3595 BLAKE2B a20863e70f3ad319f36acd163c232939bef6b8336174211c3268cfe86b734c096be052728dbe5760d07674e2d73521a362f7efc248b0ab988e9b663da2fa75e6 SHA512 18bf9037ac3aa860a82e18e63108109a1d80c3c71fb07e39fce8b9782255525c7449412b1c81c89aebcb56ffdb258d8bd1382ce6c80abac720c34a40b00ec861
 EBUILD gentoo-kernel-5.15.53.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.15.54.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.15.55.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.15.56.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.15.57.ebuild 3597 BLAKE2B aa37793f8f5d37ae10a7095722e6546df7aa56549233e1b7e04dc1b6dcfd2bf05db9c357c6db3bdf02caa3414ff309ed62d798028ce81949987d9f0f1b70c15d SHA512 a745f61a8c7785de82bd0de381967306e8a58bfd2732438125ed2ac68140bc7300cf7dd0398bcd005f304e4ed809b314705a10c0b4084f78191675bdafa0a6dc
+EBUILD gentoo-kernel-5.15.58.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.18.10.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
 EBUILD gentoo-kernel-5.18.11.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
 EBUILD gentoo-kernel-5.18.12.ebuild 3857 BLAKE2B 0dee6d23887d04b56e4f6228ca833ee0cc87bfa66038ec7c36ee6874a066cd53322d92d0e12715d92843eb37e40bb71da53ee068c70af45bb3d0465d5036a71c SHA512 49bd98f3c1c0d1ad11d6156e59ccb757df9ab31c81d871efa8dc0e59a1f14e726729cd773a27b30237aa14eb0b364d5325a4818f0a8dd418eb9849e939da42b9
 EBUILD gentoo-kernel-5.18.13.ebuild 3859 BLAKE2B 7d5e5654d596002eec8478b6f72c3e2b8896acdf1f691f3d329e030b031fc8d2fb46434ec039dea09f1def77086663df6710e5690c0318bc15d8028321d21271 SHA512 3af374c1492526da624dd26511c01d401750fa59a8184f978b8ae28c564644faeb91ce8652f2baffe40a8c8f7d9c59b2a269b8c36ee3636f61f8a9d70093f2da
 EBUILD gentoo-kernel-5.18.14.ebuild 3857 BLAKE2B 81b04a8e1a805ba912e4ad3993f5d2915d77f3318e37e39ac95dbed503b965e064be55fd2d8ed6685836eeebb9a50a9aae5f787577cf058098cd002cf8ff9a40 SHA512 b917d360876b37c99d6c43f5884b86910d933e44b095651acef5167e6ef46826004f8f25befe001a6bf42149065a0a3d23a6aff0911d4d17c4bc034be0f89d6c
+EBUILD gentoo-kernel-5.18.15.ebuild 3859 BLAKE2B 7d5e5654d596002eec8478b6f72c3e2b8896acdf1f691f3d329e030b031fc8d2fb46434ec039dea09f1def77086663df6710e5690c0318bc15d8028321d21271 SHA512 3af374c1492526da624dd26511c01d401750fa59a8184f978b8ae28c564644faeb91ce8652f2baffe40a8c8f7d9c59b2a269b8c36ee3636f61f8a9d70093f2da
 EBUILD gentoo-kernel-5.18.9.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
 EBUILD gentoo-kernel-5.4.203.ebuild 2799 BLAKE2B faf615c3252cf128099b4b7359422d78b19be5b647e89e4524b519e75e1fe9a8e778398cce27093e6be22c7977f18a996a6f7e72afa813d6a8369fa9f2395e05 SHA512 70a94b7bcb72a3adb27fd4707a7a4b53d952d37857dc22a3523846faa8f77c7309017264e8601f22c4ab01c3b2726a1dbe1b0f5dd2d81c7ea28c5b486265f8d6
 EBUILD gentoo-kernel-5.4.204.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
 EBUILD gentoo-kernel-5.4.205.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
 EBUILD gentoo-kernel-5.4.206.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
 EBUILD gentoo-kernel-5.4.207.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
+EBUILD gentoo-kernel-5.4.208.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134.ebuild
new file mode 100644
index 000000000000..161f70398d65
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.58.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.58.ebuild
new file mode 100644
index 000000000000..3e9875ab5936
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.58.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.15.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.15.ebuild
new file mode 100644
index 000000000000..14b88df81780
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.15.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.9-gentoo
+GENTOO_CONFIG_VER=g2
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208.ebuild
new file mode 100644
index 000000000000..bf4c0106cbb7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.208.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 267cf51a724c..4fbc42799f2c 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -3,12 +3,14 @@ DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c
 DIST raspberrypi-firmware-1.20210201.tar.gz 191785657 BLAKE2B 7ef315411e3bc572515f9e60d953166056bd5dfe9afc496eda978dbbbd6f38aa12f1eaba72448bb72166d6bda1ec79e3e3e7c613f4202bc804784b566f118971 SHA512 13d899a103e8d3deb98a6fcca661f712b085935336fc31156e0b8ec5e3c71b373d3394777895ee1907cad9a2ca3efd1a66995ff6df3429c732b002d9ad603414
 DIST raspberrypi-firmware-1.20210527.tar.gz 192247084 BLAKE2B 329707dfb2905b36926a3f0ecf1a8e3bc2b52e1a376f98ca7cfe9ec7b69d0fb370d8e23907f5bbd9ea75cf7fed5babd6fe54934919995dec6914e888d95e5fbe SHA512 5a48d1fae768c30528359a14371f59564447d2fb8a145cafa89d7d29352095c5b7ac33bfcbc8da494284c9d41e7dbafe4e863e8efd963a17ea6b6b9699b814a7
 DIST raspberrypi-firmware-1.20211029.tar.gz 193543221 BLAKE2B 308206d6bdfbe15bfe5f39cd230e6d4857f460744aafcbcc9eee6a74f05a3a9dc861e7c3e36baea46fdb1d1d1dc28b5edebf70bce3a3c085228b2ea321ef7a85 SHA512 7a1fe3b1645006c35fa49e842b9ece53b386ece42b8db99649de8d4bc0c19e34b0807767290e26422528606c5847843533aaa0edd0716e9f9f9dcae340a4dce0
+DIST raspberrypi-firmware-1.20220331.tar.gz 195722349 BLAKE2B 7f2748bba0cd255921cc7cd1117bd8a16611a835ab7bcb62525675f6b0d627ea8ad40b39aa83e00f7e73428e2af912906e53c3e3214b5cb079a2baeae985f2a2 SHA512 c510ddb5eb1c6ea1aa69f0063551445dd21092f68e19b64b885558d2c47735d4e9f781ef9674fbe3a9894d66eb07ccbb004541c9a85005318911fabda899c2cc
 DIST raspberrypi-image-4.14.98_p20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
 EBUILD raspberrypi-image-4.14.98_p20190215.ebuild 850 BLAKE2B dae8b4af65b42cedec26326ead4b2e9afaed44affe568cc4bf04a09eaebd6bbd10f93f456327eb9f30b6493670e586cb2e09fe7c5306b883a6d8704c5f10d1c5 SHA512 8833a26f7b6521754ac02ef6024140ee9dc3d1dbe836b9accec13bd844a0a7a087730b9794031bc66cc7bd5ca5ef4ec4f1614c6ff6a609ebd4daa511eb636903
 EBUILD raspberrypi-image-4.19.75_p20190925.ebuild 1216 BLAKE2B cd69ba78849fe10a42928f4a4bd5857c43ef3f79972a423c8b1d92d3ab1a1aa39c5ac42a00582e22c7c447961ff897d303e14f011bbcc82d886b768a640cc02c SHA512 d9d5032f4fb1518dda3d4d230ccb94df327147f3168992e36dbebe522e09c3033c063287ed5844b09d7129700f61942c196361f32a0700599ab8f5a8f97de904
 EBUILD raspberrypi-image-5.10.11_p20210201.ebuild 1284 BLAKE2B ec94cbfba3229ecb0e61aee0781fcea4c10b451bae7971162f89200194d976e9a710a389576481ffcfe6a6834d933a631bb70b87cd7eb9f4c0bd39ff9c661d46 SHA512 43ac3c6030212179b208dc86693bac24f784d508f86535b5cbcaac77d7a1321dce002631a850b7c6bf39cb9ce4375d92499ca7b56029767bb6807dd5dc8f773f
 EBUILD raspberrypi-image-5.10.17_p20210527.ebuild 1223 BLAKE2B 21dce369d11d1c2a2a60552f4e711901c800dfa40f2564cf2785f141c3989538297f22a25372570935a9903a768220c58cf4b35ad458ecb49e5890c38da7e03b SHA512 2960506b6729ee49fcb51da79da3989ae3a4ec5a561bbab134bbed7707544f0c338288155571db3b6b9c69d4b6562320fbdeaa22fd2709fa560f6c64deec3fac
 EBUILD raspberrypi-image-5.10.63_p20211029.ebuild 1367 BLAKE2B 96dd7bb09eb356d4c6e1af2192bc00ff2a135236a166366f4fd2abb9e1d080bf18cb07c7a30853f636ca614d23b0eca1992100fb3178b8866858bcbc9b2e3afb SHA512 401b0d34f9a9a0c474d04e19e7e09b9fbe13737926b01f4596af01b1587d353a4508b180be0c251ff0bdff22527bc8a8ad19d73947482de866e765930220de90
+EBUILD raspberrypi-image-5.15.32_p20220331.ebuild 2048 BLAKE2B 3695b04263cb921f260e6b2da523ac02d929d56cb1c47e167e766c7759986a55ce84e70bfc3705f72e07b9a966319fec678669db22e4f6e6e6d2e5106cc4169b SHA512 88009c090231ed211ae8f95065d61350c4bb8643d866747ed9a2ad7f1731d418fb61fe91625e58a06432ae8fc6be072b832c5533b3ace574c78fdda6b983d3f7
 EBUILD raspberrypi-image-5.4.79_p20201201.ebuild 1223 BLAKE2B 7b446c890c1a0549a43b95a17cd3d20637e58e824b0ac715c90df1f6381479a3a87134acf829093a4742959b27a3d8f1383cd5e8cf0a793aea93860f036d7245 SHA512 6d3630742a016e99c1f0d787cf10b6ca7e62ee93e2cbea0894dbb084d2c66c7f5765032f8668909033df7f0a121b9cb522596a00071c434ba133a6e851c1bf83
-EBUILD raspberrypi-image-9999.ebuild 1223 BLAKE2B 7b446c890c1a0549a43b95a17cd3d20637e58e824b0ac715c90df1f6381479a3a87134acf829093a4742959b27a3d8f1383cd5e8cf0a793aea93860f036d7245 SHA512 6d3630742a016e99c1f0d787cf10b6ca7e62ee93e2cbea0894dbb084d2c66c7f5765032f8668909033df7f0a121b9cb522596a00071c434ba133a6e851c1bf83
+EBUILD raspberrypi-image-9999.ebuild 2048 BLAKE2B 3695b04263cb921f260e6b2da523ac02d929d56cb1c47e167e766c7759986a55ce84e70bfc3705f72e07b9a966319fec678669db22e4f6e6e6d2e5106cc4169b SHA512 88009c090231ed211ae8f95065d61350c4bb8643d866747ed9a2ad7f1731d418fb61fe91625e58a06432ae8fc6be072b832c5533b3ace574c78fdda6b983d3f7
 MISC metadata.xml 325 BLAKE2B 4f9cf3610ce1a44da9fc78b78b9df541c76d2b76da0e040f666579bce00f5ab5cf8aec4ee4921b50d5a3cd249ee857faa39d9f780e8fd42a57506c5f6dde3dbe SHA512 529fe413c16257c123c53c2e09cdc457b9481acc1b85cb76458a6b34fa1424cfa76807d72a298beba20d99349c1a9e224bd8f29af96ec9d14cabe6029dc82c44
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-5.15.32_p20220331.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-5.15.32_p20220331.ebuild
new file mode 100644
index 000000000000..c63fac44773a
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-5.15.32_p20220331.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot
+
+# Go to e.g. https://github.com/raspberrypi/firmware/tree/1.20211029/modules
+# for the latest tag to see which kernel version it corresponds to.
+
+DESCRIPTION="Raspberry Pi (all versions) kernel and modules"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+	inherit git-r3
+else
+	[[ $(ver_cut 4) == p ]] || die "Unsupported version format, tweak the ebuild."
+	MY_PV="1.$(ver_cut 5)"
+
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
+	S="${WORKDIR}/firmware-${MY_PV}"
+	KEYWORDS="-* ~arm ~arm64"
+fi
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+# Temporary safety measure to prevent ending up with a pair of
+# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
+# both of which installed device tree files.
+# Restore to simply "sys-boot/raspberrypi-firmware" when the mentioned version
+# and all older ones are deleted.
+RDEPEND=">sys-boot/raspberrypi-firmware-1.20190709"
+
+src_prepare() {
+	default
+
+	local expected_kernel_version="$(ver_cut 1-3)+"
+	local found_kernel_version=( "${S}"/modules/$(ver_cut 1).*.*+ )
+
+	found_kernel_version=${found_kernel_version[0]}
+	found_kernel_version=${found_kernel_version##*/}
+
+	if [[ ${expected_kernel_version} != ${found_kernel_version} ]] ; then
+		eerror "Expected kernel version: ${expected_kernel_version}"
+		eerror "Found kernel version: ${found_kernel_version}"
+		die "Please fix ebuild version to contain ${found_kernel_version}!"
+	fi
+
+	if [[ ! -d "${S}"/modules/${expected_kernel_version} ]] ; then
+		eerror "Kernel module directory is missing!"
+		die "${S}/modules/${expected_kernel_version} not found!"
+	fi
+}
+
+src_install() {
+	insinto /lib/modules
+	doins -r modules/*
+	insinto /boot
+	doins boot/*.img
+
+	doins boot/*.dtb
+	doins -r boot/overlays
+}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
index dd284762191f..c63fac44773a 100644
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
@@ -1,12 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit mount-boot
 
+# Go to e.g. https://github.com/raspberrypi/firmware/tree/1.20211029/modules
+# for the latest tag to see which kernel version it corresponds to.
+
 DESCRIPTION="Raspberry Pi (all versions) kernel and modules"
 HOMEPAGE="https://github.com/raspberrypi/firmware"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+	inherit git-r3
+else
+	[[ $(ver_cut 4) == p ]] || die "Unsupported version format, tweak the ebuild."
+	MY_PV="1.$(ver_cut 5)"
+
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
+	S="${WORKDIR}/firmware-${MY_PV}"
+	KEYWORDS="-* ~arm ~arm64"
+fi
+
 LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
 RESTRICT="binchecks strip"
@@ -18,17 +34,26 @@ RESTRICT="binchecks strip"
 # and all older ones are deleted.
 RDEPEND=">sys-boot/raspberrypi-firmware-1.20190709"
 
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
-	EGIT_CLONE_TYPE="shallow"
-else
-	[[ "$(ver_cut 4)" == 'p' ]] || die "Unsupported version format, tweak the ebuild."
-	MY_PV="1.$(ver_cut 5)"
-	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
-	S="${WORKDIR}/firmware-${MY_PV}"
-	KEYWORDS="-* ~arm ~arm64"
-fi
+src_prepare() {
+	default
+
+	local expected_kernel_version="$(ver_cut 1-3)+"
+	local found_kernel_version=( "${S}"/modules/$(ver_cut 1).*.*+ )
+
+	found_kernel_version=${found_kernel_version[0]}
+	found_kernel_version=${found_kernel_version##*/}
+
+	if [[ ${expected_kernel_version} != ${found_kernel_version} ]] ; then
+		eerror "Expected kernel version: ${expected_kernel_version}"
+		eerror "Found kernel version: ${found_kernel_version}"
+		die "Please fix ebuild version to contain ${found_kernel_version}!"
+	fi
+
+	if [[ ! -d "${S}"/modules/${expected_kernel_version} ]] ; then
+		eerror "Kernel module directory is missing!"
+		die "${S}/modules/${expected_kernel_version} not found!"
+	fi
+}
 
 src_install() {
 	insinto /lib/modules
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index f22d3144eefc..bd7bc3789117 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -27,6 +27,8 @@ DIST linux-5.10.132.tar.sign 993 BLAKE2B 6a6b55885d0b7fdb00b631d0d0f304e9346eb82
 DIST linux-5.10.132.tar.xz 120432520 BLAKE2B d1abd82c248ac610ffcf2b7c713a647f97b2ab186a54b3ef9ab69ad7c2a647b04f254dba6cafa71ef742ea4a385034bd27883ccd1f5857f0ce0ca6fcd93e6597 SHA512 e1bfc069a91c111a81694e6ecf71f995a33a9dcf89e31ee7c9e01821bc1fb00c1b895cb1786bc62d398c6e9dc657ceb3f6b8033b50b17e77cce9a82039ca5c86
 DIST linux-5.10.133.tar.sign 993 BLAKE2B fddcc2dc991ee0ee8d5b81015bc62c17f3e1edd245a4df5a1f9307a26266418c703bf50620173466fdcadd85be679449c27547201c6baad13b3b05e9e3153c1f SHA512 82b76e437955adbce9d4ca9b22c4c5becf19743c856426f63df8f1503c0b051e5e06a145ce06b7422bf15961ec2f91524b94daa802f5c2d7ae4603273581ad0c
 DIST linux-5.10.133.tar.xz 120457796 BLAKE2B 811a5a7b1796dcb90baf7dc3f5f39947e409f8f8c6fc6364e3269c6a8735f912dcf8e2b03b62022222b20c42fe6590e7a500c04a20c9df44dc7f6544b18795e7 SHA512 980b290bc619a843aaa1ba6cbbeb6c796cd63ec5cbcb6de820afaa33a28a64b746cda73b921babb5d9110b19dff6fa47f368d3427552443b8c2c929c35ba65f0
+DIST linux-5.10.134.tar.sign 993 BLAKE2B eea6723cde53024b73aa785c82dd733b5bdbcabfd6229e1f0f70a5554ca0a183bd6616d11a32de152c026551a56bfe20e963e922baf03458857100d37db7ce9d SHA512 a291efb27ef6714aa970c8e129068f1e32ae0e10fd228a9eb0a4ace04b32f3a097712e2703f0cd43b26d2a0ec9c76d2b9556f8b4ed6e058065baa99fba7ac9dc
+DIST linux-5.10.134.tar.xz 120457660 BLAKE2B 16d43ce64d24bc26849c72749890159fdb5754913275f9829edb13a753991afc9e738f38f105606d6af62891708aa0134d860592ba33cc5bd1d8038b238de363 SHA512 888c5f1000329deeba66e7452d64344b589313e6494d96bb62c89250ace93d7ea5f9201b0b203b6730f5de34e04bd4b093ab4592ec7837ebaf09b2348be20ef8
 DIST linux-5.15.52.tar.sign 991 BLAKE2B 321a5eb8fd8cad2d14705ffdea3fc0ad5cc4618defbe8426b978aac10c28dbf0b4f15a571c16c22ff2437f87ab8d70ade815c5f76ce0d763ad66846a27e02349 SHA512 1ab45e728a768b704ff52551e31cf91fa8a6ec008e3f2aef387b925ab18dcd837f4a4b71f85a7bb96b0ab403c39757ddfa8d22578117728f594768904bc5ce62
 DIST linux-5.15.52.tar.xz 126364084 BLAKE2B 9baf5b0182df91790716f3629a6e163cf87d8e9bde79350f30432e7446d2033de9d081f1693a758a3830a26c03a8bc13713394fd82457afde33ecfb9e353de2e SHA512 01852559b30b177ba350827b076dc58ecad020e63940482e694286ade3debe53919a4514338536f46da1aa4f89b671368a112a913a53a0352d033252bc6b2a1b
 DIST linux-5.15.53.tar.sign 991 BLAKE2B 4d890ec6f124577094dfa178fd64dcbb99ef7f07f3ab5bc6c5591c1a2304286ad8285b3d7bb405cb127b33f05a4bd2bb03d0e438f50c1fc466346e3530814a85 SHA512 e7206e9551b89b3aed1835d8e29832ad457d4c375ccd53c4306bd390d714a6a9329d4bb2f71bc2c2dc4bf932ada7131c5383f23a2d71c44b6a0a8365de7a9b7a
@@ -39,6 +41,8 @@ DIST linux-5.15.56.tar.sign 991 BLAKE2B 4b6acc83e1e6f8a5d3fb79ad16fd2e5343e763a2
 DIST linux-5.15.56.tar.xz 126379964 BLAKE2B 6710a46afe184d08d108bd199d96799e215cacf19ee22999203fe751fd2179888f2b581b83ece86aab6fcb4e2190f38dd67e064ba4d57b9d45a04355bd6fe008 SHA512 9a9e52d80b85d4563fedde43e9b220c8f98524686169bb3247816ef3abbc6eaf500cf5bdbf808e01dadcfdd810f9e93eb1618421f56b5bb3cfb9190af2589728
 DIST linux-5.15.57.tar.sign 991 BLAKE2B 8585f184cdad7fe37a5bb9d38734f99cd9c836408dfc2d0fcb3209981a22c4663e0c0cee2583b9278b38ab4f31567db9d97e544969438d0ef20eff91239fc8db SHA512 37032bc31f811b4f68a6dbc6bff4e48242cf984886336ffe1864a9d2a1439f77cd258214a86e68918ee0f8556635c051b0d4ed0c69e851985a62833012549a57
 DIST linux-5.15.57.tar.xz 126380740 BLAKE2B 9adea6b8ee97ead38ecab39b1ef08b2ee1647eebbb2a8ccd2ba253eeebfd6435c83a03e83e186809473a982a373185874c0082aa0c56f5928d304c7df56dfb86 SHA512 d14968b0fc7f4c3162c2c7975367e5c685675e29515a82d3010bc49a124e761beb90eabb7f0e2823e2afb32c0110df887440966dbf37c29247479d5009905d5b
+DIST linux-5.15.58.tar.sign 991 BLAKE2B da7c889a8485c2f445eec54808aec0e43f9e36cc66b4c566cc4313a1333c0094c2e53da0d93fd49b4105eb3285f159a51d50f2c4edd10efd1efcd54328cb5318 SHA512 34262df54828ea963e2dfaee89ee29b1514de0857be360019281805ae8eac211778707aeb247bd7816f55b0691b6820efb2a87aed4294adf4c263d6f965da934
+DIST linux-5.15.58.tar.xz 126389084 BLAKE2B 0bf2596c9f7c7f112389d47de169c3399305f48241f36fe479d18b80d874d8ab90faf44b5bd6384f4dec2998c22a0ef365a84bbe917a1dcd55875a91399b101b SHA512 b0474dc0c8e7e1bfc45e22f5df3c435066ad69144fc4b451335e43133c2113f3d3c1f7c2f3df6e54539fb6d87ebb16f069907c1f4e5922bb69a07e2a00463110
 DIST linux-5.18.10.tar.sign 991 BLAKE2B 7ce361cbbd768cfbbda3744f8528a3b4115378029682efad4f0d785c156461ce17d012bdd149edeec56979f2b801d37f2c9f09c8610ce197a12fb2fae2c16af4 SHA512 4aae4d2bf37852ccada7709304b6e1f69447df961e947cf78c4d5914f610582958da28c6de2f9a51b9cb544d0addee241bb872d3fe4d50c0512f577a48ae30b5
 DIST linux-5.18.10.tar.xz 129830456 BLAKE2B 71e1d666f2238bdf4c6a10d83c234b02b46dfa67ffbf73eea904254ddd7ded9ad5d520ec4713933388956d2e538e32911f4c99e16c5e3d0c19cbff0fbe38012e SHA512 2140d9012fdc63979c6a737513da46ca59a58f4312e8a1b1cbf481088e03da4bc2eb04fe9cab7164339ef1fde8a2a8a6d5167896e45b061b04dba0ef7b1fb7bb
 DIST linux-5.18.11.tar.sign 991 BLAKE2B 9132a1d3cd6c72930518136df59dbb0a88831921aed6fd21a09c7353ea0dbd7da037438efe8cd12fc4eafdf70a9fcc1eabeb92f8d34e9bffde92a6a5d29d864e SHA512 9bcd4392212659bd9c03da33b9d7c81aee6c5d608ec29225b589d9c170771b8e0729c24d3eb4b649d8209dcf1c8847d12b5148d36808bf2ecdde879d251e6198
@@ -49,6 +53,8 @@ DIST linux-5.18.13.tar.sign 991 BLAKE2B 24d2de0e73e9cd235f58f2ae4c7008cb6d5868f5
 DIST linux-5.18.13.tar.xz 129828032 BLAKE2B bd365ff9a669ff17aeb06a9e227b1d2adfeb65e59c31edc78fa44f4522c9943071aea3f62058cf0f68d509f6d847ff98a469793f107a92ad069d5c6b81f13594 SHA512 f78eacc594db7f27941b0ddf5d4995890f7372ee3bd7ad377c29d263f1e61e5b73c43f7350eb26b0de746204f79e64d08f7622c1441ad98984458ea4d668e13d
 DIST linux-5.18.14.tar.sign 991 BLAKE2B 64bed04a35908e72950298e37ed4d200acafbd04759177260058590264eedccf5f4be97a3f7669226354556592412306c9a9c3ab9f9edf40781bff8132c321ec SHA512 7a15da22d83b176e18ba217a5d078dc46dcb5b99bd2c1e0e2e9f32f8c9ecaf4d8c57c0cdf2550848b67d1c5a0e1cd9fde4a22418630cb90e6b820e346edf2c97
 DIST linux-5.18.14.tar.xz 129850900 BLAKE2B faeadb397c61f3adc70fb03d5ba10c203764d8a43b70cb70838d17780922bf05cd8389c19ba8d323f322d81169d11cf744d86103011c4a17606a2081e18a906f SHA512 270c27efc9557c001314dd80508d533e00c1f5dc6be496e1c4581144e2386550efd42048293f178816a01be1c18dc70ee99eeca5d0deed5dd64f4f8baf90a146
+DIST linux-5.18.15.tar.sign 991 BLAKE2B 9a66fb09918dda77b25b995cb10e6681c1a6c589c19afcce1a3b39d10ad922d728fa9174235c90e29462e34ade9394d4c28f3c485a89af688ee969ffe4fe9058 SHA512 815685c8b0aad3ecff7a1b781ce7d79bfb05e466195c08c39b6aa0c012e23da465537091ee416ce98ba09d928a566061ae43c5d6a748e92b1618b3cb3685072d
+DIST linux-5.18.15.tar.xz 129847068 BLAKE2B a99064b7725f84c6a99819a2356d40edb9117ee4a91c5243a7f8f0611200e7f54d300f48c79b86ea6f23d145b50fd180d33e664b305bcc07917c2162e9f193ae SHA512 9436831b84727bd751741d1f569dc8bc314c33daf02d2405d4ef612ae6797dc4b3b96e13b46088db65e518052780f1bc30c0d1a4c528373d3509039dc055f835
 DIST linux-5.18.9.tar.sign 989 BLAKE2B f763fcc33c0cdc17835596b89f3589aa23c2e42f9569a31ce359595c45f558fdd79b04a29a3165a18271d23b2f7bd2388b589ae147c9395b46bc18271844d5d9 SHA512 c9928fb16009c3c61c19a9d0d3821496bc642c521bfbe942e9769a5f7b85eac1546f7db1878741f4e47875ace99732342ac75e39985003301fd405757f820abd
 DIST linux-5.18.9.tar.xz 129826700 BLAKE2B 9daa0be3f6f528aa4d761db357448c007f2647530940a12688b7b8b769a605d64b5ccacf0215759fff3383e8a9a179658e4e272bd4747c51663e120e0e12287d SHA512 8db3c73c91cc3cabcf24224bed97a790c562d28cd6a6562b924e7c07cc671d3721d7210defd5c9cc4bddfc16afee0086dacc40397823ca3ccb890f2f938f5814
 DIST linux-5.4.203.tar.sign 991 BLAKE2B 4e13305b908e1e158c61ae0667186cfd42e7dac237624cc871f584efc68c53d5de3a90379e801f5e26655293c584ab84e16c5f87d503c1e5381b6b9e8634d8d4 SHA512 867b1ac576df3db177f8c684291aed7a2094405a8c9f18c49c2f5f1e4c68b6fe4dbd211d65cdeb07db3522a6f485c03ce4993c687c0d93d85dd8af31b60fdb4f
@@ -61,27 +67,33 @@ DIST linux-5.4.206.tar.sign 991 BLAKE2B 0d7814ef65a8a70f7113dce971ebae279cb0f267
 DIST linux-5.4.206.tar.xz 112942916 BLAKE2B 7066a482b73c5636f98f369e02eec7023313ae06cb78a2b5be947f9a618b01bc854f997df8e0a9912e25f8be453c277f865004268a558c75c0b7894802877037 SHA512 6f8ae37d4ea918d4590b52468ed60b30f848120ef4949e5719e4b225b4ef9597d449e520f4ed8ffe8a29d659da3191691ce9a2d9968f6f437265057f0ff301ba
 DIST linux-5.4.207.tar.sign 991 BLAKE2B 29400e5934393d1e09b7d694ab4395fcf0bee3d8b85f5b5663d7b7c7c9ba5be4168d217587fdfb1ab8ef36840a24211482358964f9745c4376f466909d1ef0f5 SHA512 fa1d4ca2a06d9a74a4fed2a33439ce450c1969d25ada380b60a8a64432fe59eff5129570494af5c3bf47b4e99e9de9fc35e5200afe15a4c478f17c9706b984a3
 DIST linux-5.4.207.tar.xz 112942800 BLAKE2B 32cbb802084dc11863bb59310503ff92c6d02f0892997e15f5048ee285fc3e7b172d9b0ad5eaf936ef423af786ef14d9c3788b80b2ebc62676c0b3a25e1390fd SHA512 802eb45d93347a4bfd6e194efdc2bac7daaa4374ea7c990acf43b3c7e8280f3b6e1ccaa2f765d3677ca68947c8b9f7d783d6c22df58a64b4f6d8e5120fdb7e2b
+DIST linux-5.4.208.tar.sign 991 BLAKE2B a79d81b6120f8856da9a819fcfd040535b264a01cb647e1fc9d02d827b8948267803467a3389bd215d2a4e10208fca53a224ecbdc3967e8972c1302afa6cc2db SHA512 55fa233aca961a17c57bee0f87fcfd0c4058bdf2d02b66797f073694a1eb941278dc744467838a08e107944ff717e3dc79e4ac4ce69866f674e95c48f980de92
+DIST linux-5.4.208.tar.xz 112935800 BLAKE2B 801adac852dc3cac0307ee6787e67d0a4c5047a6850db1163cf0315b2100e8af6b3eb4eb310b7f5f2bef7bb0d5d5eed738db501718db72a1ced95577082e0012 SHA512 2260262607fce42c0a69900c086be69e15c5fece0efe28cbfe4cf5b4e0829b981d0f0a1c75b64ff0953c527058653fc3e45da481b29167cff11664d1953223b5
 EBUILD vanilla-kernel-5.10.128.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.129.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.130.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.131.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.132.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.133.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
+EBUILD vanilla-kernel-5.10.134.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.15.52.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.53.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.54.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.55.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.56.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.57.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
+EBUILD vanilla-kernel-5.15.58.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.18.10.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.11.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.12.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.13.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.14.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
+EBUILD vanilla-kernel-5.18.15.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.9.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.4.203.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.204.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.205.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.206.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.207.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
+EBUILD vanilla-kernel-5.4.208.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.134.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.134.ebuild
new file mode 100644
index 000000000000..96cb3e86fc4b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.134.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.58.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.58.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.58.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.15.ebuild
new file mode 100644
index 000000000000..facbe03b0e1b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.15.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.9-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.208.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.208.ebuild
new file mode 100644
index 000000000000..4f5f7870ccb8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.208.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index d51f03a71155..e927dad6c32c 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index ef42c56f5dd3..68c0eb3238aa 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -4,21 +4,25 @@ EBUILD dist-kernel-5.10.130.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a
 EBUILD dist-kernel-5.10.131.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.10.132.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.10.133.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
+EBUILD dist-kernel-5.10.134.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.52.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.53.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.54.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.55.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.56.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.57.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
+EBUILD dist-kernel-5.15.58.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.18.10.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.11.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.12.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.13.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.14.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.18.15.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.9.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.203.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.204.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
 EBUILD dist-kernel-5.4.205.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
 EBUILD dist-kernel-5.4.206.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
 EBUILD dist-kernel-5.4.207.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
+EBUILD dist-kernel-5.4.208.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.134.ebuild b/virtual/dist-kernel/dist-kernel-5.10.134.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.134.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.58.ebuild b/virtual/dist-kernel/dist-kernel-5.15.58.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.58.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.18.15.ebuild b/virtual/dist-kernel/dist-kernel-5.18.15.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.18.15.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.208.ebuild b/virtual/dist-kernel/dist-kernel-5.4.208.ebuild
new file mode 100644
index 000000000000..2e0a7cc6b4b7
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.208.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 851ce346da54..b11ac219fad3 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 64f4c69baccd..e87582af381d 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -4,5 +4,5 @@ AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0
 DIST gitea-1.16.7.tar.gz 53657579 BLAKE2B ae9d67fa633bcc5156036f033a4ed084b5b6ac0d71ec6a1ec0d0c88848233f3f0f0c22ca1c33289dc0e9950a8b299e26a88417e03643972f6721f94097b37d85 SHA512 7a31330e46078e215eecfbb2ec28373be1a176790720afbcf9674f3530d66f300d8ef9e47b9b9124cda9ce585d26d40c975e4897e5a3477dcec28b6f2b16735c
 DIST gitea-1.16.9.tar.gz 53660093 BLAKE2B f289a6525b046efa56b0250a997c1b1957c58447b87d7b0f5a65754ff3278da5dd37e1cf090b6d27c61d779fe2f19c4405aff9be526c5689935fba88c8488ad5 SHA512 b27da6b77ac33829ba3108e54c8fab59fe80f2ce88cc5eeb95ec38186da4b34508cdfb1a5fe0a68013001403a69080ebddb8d5116a73e1cf47e27ee4cc3095f1
 EBUILD gitea-1.16.7.ebuild 3181 BLAKE2B aaf07de11af3784fc352f787542e09604950292704cb283d9474d6cec568f91a5df5104c5aa2da29f22d1324f8d4d29357ea3880a8c9d2ee29dbc685f5b83086 SHA512 a2e84529629afc73aa6649bdf3d97f5e356a97c13262dab767e1c8aaadf7c7d26ca35f201f1ae999c50d39d8ca39f62fba00e59fbcb25f01cdc52b8e08b261aa
-EBUILD gitea-1.16.9.ebuild 3295 BLAKE2B 5fb0180173ca060612256e2f2c73dcd30014a2466dc2ca65cb8e6a560af1e91888b0bb578d037aa920c8747bcce5a6035032549e3cb98fb73aac176a5da4ad7a SHA512 aa94734deb9bb13e27c831d917f848c61ab040894f2dbb6f903b1f35f5e2a67cf430d87413d347705763fcc563d0da31202147eefbb34c0b84bcc1ac5b15200c
+EBUILD gitea-1.16.9.ebuild 3294 BLAKE2B 241acb3d3476a33c876208d343fba4794511e7235aa6afb7665ab656b76a2119c3da24290babcfb12361a504a85836811d91945a11a90d2632b6a081e73445a5 SHA512 db2f4946302dcf9432e1b2f6011dd3e79d9dc5f70b1db5ee64aa505bd276f626a8854c8fc9a7b548eee1dcadd2164626b6af066e3ffa9d82b603467217ad5512
 MISC metadata.xml 590 BLAKE2B 2313d3d6632d9d5cd758acabb539be21fed1603279719587143a96803cd89c8bf5c963d15303237130704ecf47759ea6e7e5b42ffa44bbd51c880eee6f535a20 SHA512 aec006efcfe71689dcbc5d37abfb6e566b8b637e3a3bc849cc12cddeb02d568fbfa21f55e97712b413730c2705ebc10ed7a7dc7bec4ec8c7a536457347185135
diff --git a/www-apps/gitea/gitea-1.16.9.ebuild b/www-apps/gitea/gitea-1.16.9.ebuild
index a816c920b1b9..a78f96df3391 100644
--- a/www-apps/gitea/gitea-1.16.9.ebuild
+++ b/www-apps/gitea/gitea-1.16.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
 else
 	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 S="${WORKDIR}"
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index 3cc0a83371a2..0b371a4e5e38 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -2,5 +2,5 @@ DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953
 DIST ikiwiki_3.20200202.3.orig.tar.xz 2689636 BLAKE2B 2b88691591e72dc7d55ace2860ce6faf0bd62fde119bbab9c8db7d55dda384b84a51b562aeb9397457fcfb8cd405cd327380e418f8a65debf1e311942c05c222 SHA512 a1d89ccc0d02cddb3ef53c4c4a4a3349139d558fd4eb418263551a48cb635ed29ef430f8276ef6b42486a9232706908752e15e88590e919db6665e1a8844a4e5
 EBUILD ikiwiki-3.20190228-r1.ebuild 2114 BLAKE2B 52beda8293f45105a4368dd8fe8af68d3901b7da990c10b341de47df730032009f2b728b4067f7ceab791e8ef5e7a51e429c9041e53a9deb46f9c4204342f80c SHA512 87ed038729411d1c75911a4d97a833ad80c0b0b635707862b575eeda715e1ef565ba8866c7bba9c60fe65ff24f8fd0424af9f939c9c9d476e9392279b95dbbb1
 EBUILD ikiwiki-3.20200202.3-r1.ebuild 2163 BLAKE2B 26531e1b2b2021113dcd53a01159c5402e71a50eaef40e2f3e27190acb8056f6f27da5fb515d40bd75fd24173f90a8e545270082c49bf413eabe07bc1fec95a6 SHA512 e6f9667c3ea15f5e2da3520fdae8edb84fb7bdf16fe1c816f6d80e157c6ce81079385ecc671016b9f8cf7156cdd7ac3c05b24ba6c63f20bb2b55df620c698b7e
-EBUILD ikiwiki-3.20200202.3.ebuild 2120 BLAKE2B f123b15680bb53b9c71222188e6712ceb4e599a376bc8eff1c3686ea96faca914e4cb842e111246ed05a155e573239e84d3e49ec7c78a5a4de064af8e2aef605 SHA512 62075861851278497e65a84f53af7be581d37230078200a5cfba852b19b91a99d4e663646450d38983aa7db18a897c51c04ce4b1105fd20f4dca198e76f52eb5
+EBUILD ikiwiki-3.20200202.3.ebuild 2127 BLAKE2B 1a981093f3ab37e0b50376233ece145804140ee72504896c82c3269a6b4d5abf3743c453f68a6baa287e79b52888af4903862ef2dac245798d7e3ecefd509a72 SHA512 4ece2a1e145cfc61d2e10592109e7277ddbd12edc6e00ef8a2c5c023b41db5025b5b5d252c5094b3d4eb50d80ff059c13f1181f4198a6a2fc2900243eb1da8bf
 MISC metadata.xml 260 BLAKE2B 912094efbdb14e53fb606a8d85604fe8963d5c40162db26cbb43b8d18091d28a0d543d64edc7e300755b10e0fdada949901ca5df997a90ffe5be7f4717507855 SHA512 7ad3a45f173d9755b2b0faa91a3f35d110fae001d94f21b3e403a4933e14d385f2e8b1db9ad30dae6a5b282ca1b82028cebd3605ca3ab5cb4a06cf8059512cc8
diff --git a/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild b/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild
index e93412259813..4fbd6a7663dd 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/ikiwiki-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="extras minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 8511585cf482..88b186b17ea9 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 74ee7d217f77..963a9865e247 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -15,5 +15,5 @@ DIST xscreensaver-6.04.tar.gz 26112437 BLAKE2B 42411d5f63a99d4aaccbc3bc34f8c31a1
 EBUILD xscreensaver-6.01-r4.ebuild 5884 BLAKE2B e6e2b8f44c38c9c22181262b227bccc4fe16339c283de394de919670010ed1b0690681da990792162760ff93ff5090f9ffb2a01547c9abe25686d5726586ace9 SHA512 ded2ad6cf75c380f343b33d64ac2f3540b55fb3a91f640dd49d6f2cabae4634b17c124637e38a6ebd6425f1aeaf54092eb75f3787fbdf7f690e211f4960f3900
 EBUILD xscreensaver-6.02-r1.ebuild 6208 BLAKE2B 73c3fe81451df69263624479a6729da783a89618ebbcac9199bc6623ff56b3a7ada878d21185052d45dd3512618e3603a8d4acd2c2be45e1d8432a76acbfa5bf SHA512 15f08b0b0a41363b6f20206741eaf1dcb6d320f6f84df3a6d6ef76bf91e80607043481ef4b2a31e9a6018724213d3fde17a658c9843663ad09ace60a52969e7a
 EBUILD xscreensaver-6.03.ebuild 6519 BLAKE2B 3714eb6a47f0f4673b5e1e01169d36f50df8a8374f68b080bde5916dcc448100beac6cd09e203d1c42e88bd0f6cc7da574f3f5b9d4b243e5078ed156ecd719b0 SHA512 dacfd2604e1774cd53870c7af26db910f123449c360351e43ae6d2b0eabf64d5001e011c72a5362f9c61312d7bf44fe4cc679eed29e84e9c492b9a74fd483beb
-EBUILD xscreensaver-6.04.ebuild 6531 BLAKE2B 4b47d5e87f477c20a53b79b2ec3fd3f99ad4d9f68a9e68d86b19a352af59381e219bea56e60d5a64d215f71af53034bbc5ca36ce90700e5734a45e3939713559 SHA512 686a2c7183cf0b2e2de2b7a91fa0278a3b7e15144f024bc8f8f4f34efa24d8a6c92a626ddcba36c93cda3207051ac616f39912ea9dc200927a99913612f9f296
+EBUILD xscreensaver-6.04.ebuild 6538 BLAKE2B b656f1a376fa1dfa4514013e83ae735afbe291ca5e79cb031ad07503196f6a3dcf2bc3e3388121b0bcd997c861ddc50ee0c63b638d3102b71a09826fc744a186 SHA512 b016883aa9bf44ca253f912ed50cdfa225dfdf7a9e6ee241d23dfeaa0cb6d2a5e86a56139bca9523c2398f5afd9d2569da2bf01608866fb01605ee73a6807370
 MISC metadata.xml 1125 BLAKE2B a1ac7ece845498dceb98238023472300253798ca00e14a278479e0fad6d91dd37e8cbe205f59ba3080b4cd942bb503a8f3c20ec4513d9b88b397f23b7eaf91a1 SHA512 045d8161087ba016fbfc0bf3ba82b3018e93f0be9467e44b9707818084adb110fce2c94f59f2623a2c4ec3ecadb99a91ebb7f1beb31c16565582da37bb6d582c
diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
index 630db4ff3676..36935a41808b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
 REQUIRED_USE="
 	gdk-pixbuf? ( gtk )