gentoo auto-resync : 31:07:2022 - 09:12:04

author: V3n3RiX <venerix@koprulu.sector> 2022-07-31 09:12:05 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-31 09:12:05 +0100
commit: 100ce16c6fb75a4911f388aa77f860324607c869 (patch)
tree: de54fe6a6fd7ceb7a41fdf2b03b666c479794055
parent: 6262f7e48882f381dea4a0751717f65e6abd212f (diff)
519 files changed, 775 insertions, 11044 deletions
diff --git a/Manifest b/Manifest
index 4c73df6d8c8c..4cbbf7c7d37d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29662 BLAKE2B f35b7b2c9a9ae342ee08d0272072d059866568c31c913fc274a0e0a02d30883c29171928fb2cf2cdf9ad652d97bd0d03cf7c8661de5b442513c3d71cb860509a SHA512 9c4db7d1cd2b6526be76879a8c967bf99465cc1c833519654ad955089842e0b4885fdd8ebb7d2f694a08e6575f372231b997703ab4f884854920ef95b9efab01
-TIMESTAMP 2022-07-31T00:39:45Z
+MANIFEST Manifest.files.gz 29648 BLAKE2B ed4298b824b0a28eeac8af6199700def0d0c7bf3485dcb4a2769e9f7d227c6d5af33312110977c765fb2cec8ac2b97820ae59dfa19949725aa2b700d9f5ebf18 SHA512 0bbec86f3a25088abd8887eeaaef09806b5919f6c0b21728f950db04749c10108276802598b562a323e3c17ec7c32c2a923acfe2eb2e272fa046369fdeff50ae
+TIMESTAMP 2022-07-31T06:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLlz1FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLmI7NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klABaBAAoBt2fQjzmR4DJlH60lHx+wMo7G7C20dZeJleONjoJ4bHFUV2z7ipn2Tn
-4iM4jTxUD2rIX9fo3IOXg81gTsRnWoSndLhvIuh/Y16smhsBgZYHDbc9h9y6en5p
-cn55BPRH/a6epEr9LGGI115J1MNjXB5L0RT4cin5ORgidnCzAzcM50snpLjS/Nzy
-oHw2eNEIERVAL0AM9iMXWpnJLzsSGafMz4zsv6Scr5w4bTDhuDZ+CAqr7eioazGN
-cgFL6bKaA35ySsIFeE/2v6eF02iOJIHRLX9Jwf2jS5zlZ+r6JFZ4oNLpXvbnE++x
-xF3Pt8JwL4/ptv0lrxP/5ZaSTsYAfF2y9I6j4Qwj689+zB/6/IoKcGi+51UU6xde
-+OcVmKrniyCHFJ9bEsmjVhxxHpCQFc/jGDcn7yAHKCx5y8raERlUzbH8GIWFdhne
-BSUTeSsUfaGrhxEPgwj/PvulVL0iryjbU8PUj+YwyzuePotOPYA+QF+2BCQfkdgA
-Ji1A3/qATemftCdKbH9ljHeFCRulGDBncmhVVJA+BfIjCGP12/raFIwuMzo39Mud
-RGfFY981Nlp9Mkn9A05pALCV0Kfl1St8qxr+q0zeH7znrvESAr7SweQSpedXRkDJ
-kJT7rZ9tW9Jj2r0YAPw7L/6mqpCoDyEx7h3qRHBjPr69d/rWtEs=
-=Olia
+klD9LA/9EMREa3JPLANpcm20DdM3R24vaBAYXdpDS1TKUD2e0P+s4wKe76cq93KS
+Y26k4tOa8wktqlmP/5NbKquIG8XBYGFLAIzdH9a4JLl80aT+Bb42hVcJuhnSKsBR
+fFX8c71pQoO4npenXtHcAp8ySO9FIUQaFC8i/ps6K+3z2SEKks86p6W4htBJOs07
+UNC4Mp9RTThDbbu5huk0/ZpV3d9j2jsyUiJ00RuLaAKbYO5regKr7yTVkzxTPwup
+RhNqgacTqsAmbE1PSC4YDAnVCtwoWZhTVgv44sIIrrZkESLMaRXUDLEXGT/X1IbA
+8jmEInYHP6prvWdNMpLEoDqHKMPMJ0gW8C0sR9NZEZhHtK1L5hi92heG3iBa/RFV
+EtVS+X4S6xF7mvAONkULi7ACv2dtJrK87H/9/x2uZbXAq84XtofNg06aNdCNZ/IQ
+m2XxCTcjaPaToLelNxenHZEKIZPAomrM5hK/jQExthNzvfoJfyBTxQp5IqeenjW/
+0w6EKVRI3k1WOeF2VoFcMdCZgQ3oSZP8ArBpbl6hnYLgXUsHefyDCEP4Z5Fr3+US
+Dv6pBxLTxPcQyS4IP8sE65ySwRSpJO+UR05BKQtwR1rcfAUcLvKp5rvmpYhiOAea
+FtRxAC2USMOn0luDyj16inNJ8cRfP4eeG4seKjK09woYWZBdqQ0=
+=7dvN
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ac7f79f2d8aa..7e1be0a0fbce 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7b01116b8cca..01f2b26e7d8c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index e37dcb8f9193..0b9d3400203a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,13 +1,7 @@
-DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff
 DIST aws-cli-1.25.31.gh.tar.gz 2233721 BLAKE2B 791bd78851c5643ee72faddc8e4d4e39c94a91e4879d749bcf2cadbe4797cdd448a95dd2b3c626b76e648303ec93fc0338d08f79227f05ff467754810166731b SHA512 586f0fa0f81ec8acc0b79fba5372a37ebcf162981c8fbab31633f63736337cae0b4788bb7a4cdabf6e04800fb63ed6804a6a73a7d5552a9b4c85b4eb273ee6d8
 DIST aws-cli-1.25.36.gh.tar.gz 2237211 BLAKE2B fbab136a1c1211646c1213357cd80068da376e4aceb38007c14b2fb670a694b37aaa0157d58eb4edf10c3a9b5a700575a42b48c06db1c4034f39ccda584be19a SHA512 b66ba357085c82dcefc4ed9a6d0765d8768c8d216cd255056be055d3b5f604b62bace3eacccac83275d7c9487847f7de542efa804f8e0f454947cfe453d6e705
-DIST aws-cli-1.25.37.gh.tar.gz 2237143 BLAKE2B 3c51a5e56964fb8c4e5374892e185da7817f798a66fac2fd181acf068e1419bf4e8749590c9cbeb0d4344b82de4ecc44ce8b4eaf8b133895d60055783f1a6263 SHA512 533459e94db747fe4a6daad598b2b0d894202e60080505ad3d0864c54c8286c7d56d615cb1232cfadd1bd1181aede327d3fed3eca863dcfc92efb4867736b7fb
-DIST aws-cli-1.25.40.gh.tar.gz 2238762 BLAKE2B 62d4db7d25ca82f744726a7daef740bc9726b5c99098c5f6d45cc469dba73000371c76cdb19a7bedb2fbc3196a11c31ff4701f9ca26d39127fbe10210dd5b480 SHA512 e7f1c368ecbdb75440072e0bbe2f839713b49922be0375e2c9df3d3e99e42c71e266c39923694b143685ce5f5d3dc719aa0baf1dd190f3d0a83c20d4e905db21
 DIST aws-cli-1.25.41.gh.tar.gz 2238897 BLAKE2B b0e4d1b96048971f41a0fce9c9149154778177ec8569f467cd210edaa063d629ea6998c1ebfa4506f8b2cca65caef7f73b307ef6aeec683801045c6121f85a8c SHA512 712c237181b166cdf1148ca4b3588a92939dbbfbaa5cdff9bffd8e2da35089539ef3b0b0ba271b234918796cd5fd83bf2a59e29c974f9e341d0e42e05bb8b69e
-EBUILD awscli-1.25.26.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.31.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.36.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.37.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.40.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.26.ebuild b/app-admin/awscli/awscli-1.25.26.ebuild
deleted file mode 100644
index f241876330bb..000000000000
--- a/app-admin/awscli/awscli-1.25.26.ebuild
+++ /dev/null
@@ -1,72 +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_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.37.ebuild b/app-admin/awscli/awscli-1.25.37.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.37.ebuild
+++ /dev/null
@@ -1,72 +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_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.40.ebuild b/app-admin/awscli/awscli-1.25.40.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.40.ebuild
+++ /dev/null
@@ -1,72 +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_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 69acc4abc249..2dcba312a147 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index f27124e12b91..1ddbf4534f1f 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,6 +1,8 @@
 DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e
 DIST pax-utils-1.3.4.tar.xz 753448 BLAKE2B c105ff568a8e4378cfef5f8b9acb415a850b1e209ea8413cdf518de82e5e925fdba60288557f042bf02d2e075ed5e538175b2078e4dafbe5c54117ed580fd87e SHA512 44a475860823e8b70b1d09d69e5fba3ed8298511d07e1e7b09ce62237cb8b1ecee8fc2fc550d6853d0b9f8db3c350bf78ced49d5f210997b294dc10e36627fcd
+DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836
 EBUILD pax-utils-1.3.3.ebuild 1824 BLAKE2B 4d5e2039ad372c70caf76594938228223c1169e984b3e7cce0dd8f892ad137b910d65a985bf3ba7ab60a1b9a89c7fe04eb7e3c2f0b0436c1371a3717f5fa24a1 SHA512 f9ada3fea1b51dabdb6b12348ba6a245cf31462c3f8d7ad71b3352ad481edd730c697c76a80608abc7379fc66aef5d57ed7068ccf2d94fcdeb5e0ac3c0d8fe4d
 EBUILD pax-utils-1.3.4.ebuild 1784 BLAKE2B 5ccaa1d471f9bd9560ff5940d95944226b73262ffcb856df2d07ef22aefe9ff3767a2c97651973f20aa6a31929d121a08700f696a8939897bbbe28f6b05fc50e SHA512 25bd378072743c57a23ea0c5704d25c3a88955ccc62193c7ec641200c16e11dc2f272b1e895260948573e86164c6edae28a29b9e9272aba16d2116b40d29a0ad
-EBUILD pax-utils-9999.ebuild 1905 BLAKE2B 86201a0dfe199516eb4cedcbe743ec55420b7d9665eadb309d81747302072a5c725d1d025138a9cdf5584f95c00fcaa59e6d541b4c458f8faac67e367b49f6ab SHA512 db5455610e0cdec1a4452a8302ed24552b5b693cdc726511f51bbb0072a71573a81a392c2cd47fa7e05eecfbe017c2ede4cdd9105c9d604e414137c9828fc24e
+EBUILD pax-utils-1.3.5.ebuild 1900 BLAKE2B 65ac53f71d2a87509f67c14de02b4dcc752470c682dea07341ae7201d5878735b97c98a82b0a2112658a53d278e1fcb39f0fe8e412a8a92952257fc45e1f0cf2 SHA512 0dd44d49c2336841a7d8fa3e079f10a04b8d2ed2320ff5c9dd411e033a16f736f63a794ff3fc7db61056afabfe476919587978d459aaa3e3e4a69cca67eea1ac
+EBUILD pax-utils-9999.ebuild 1912 BLAKE2B e70d992c11df700503c62b31746251d7228b6d57b41f59b1f5f667ecebc019b3e30311268a415cf9bebfda92c94e68b31f1d41e8266f572f338a2295e5832752 SHA512 c839c87166845284074d0e53084625e72da5b24e47e6f4d567d0688298d81facc731fee26c0347d54be65198a811384b582c080486cd3b2a7dd94cf14a9da800
 MISC metadata.xml 678 BLAKE2B 347b6f8175b20bfa4f592b41b15f5fa8228fb3e657ab86b4692aef468130e7625e41ec1266a89ed1fb2a81d608eecd957e773863b440afd7bf83873a357ec7ce SHA512 e6739b52ccaf7f8e4d0c3b173c85b368c974fd62b231ce83513c342b9e3148b5b29aa7f985af929d3d07e9d5808ff6aca575b88dd23f0b25bb89d952fa45dc70
diff --git a/app-misc/pax-utils/pax-utils-1.3.5.ebuild b/app-misc/pax-utils/pax-utils-1.3.5.ebuild
new file mode 100644
index 000000000000..7a9dfc114553
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.3.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: if bumping pax-utils because of syscall changes in glibc, please
+# revbump glibc and update the dependency in its ebuild for the affected
+# versions.
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	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="GPL-2"
+SLOT="0"
+IUSE="caps +man python seccomp test"
+
+_PYTHON_DEPS="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	')
+"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? ( ${_PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	caps? ( virtual/pkgconfig )
+	man? ( app-text/xmlto )
+
+	python? ( ${_PYTHON_DEPS} )
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+"
+RESTRICT="
+	!test? ( test )
+"
+
+pkg_setup() {
+	if use test || use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		"-Dlddtree_implementation=$(usex python python sh)"
+		$(meson_feature caps use_libcap)
+		$(meson_feature man build_manpages)
+		$(meson_use seccomp use_seccomp)
+		$(meson_use test tests)
+
+		# fuzzing is currently broken
+		-Duse_fuzzing=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pax-utils/pax-utils-9999.ebuild b/app-misc/pax-utils/pax-utils-9999.ebuild
index cb9ee508e9ae..9aae26cb7eaf 100644
--- a/app-misc/pax-utils/pax-utils-9999.ebuild
+++ b/app-misc/pax-utils/pax-utils-9999.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="GPL-2"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 9ee2f75a3dcd..a484a9b7f9f1 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 48010e087c9d..8290e4f2f021 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -392,4 +392,4 @@ EBUILD bash-5.0_p18.ebuild 7423 BLAKE2B ca28a57b4407a5971bdf25f477e4c6b40b6c2b1f
 EBUILD bash-5.1_p16.ebuild 7893 BLAKE2B b22235dbbbd3ba1cd85a8144cceadf3e6b06540427077d8da07fd6a63fa6d28b3a2f52783a90b056cd853c9261a94cd6e7f6bedf16d723dc59dad1ba6a93de52 SHA512 6b30679bd495a25d360b96b1ef124b5a32c50a641a2363de0edc45bcfa338d3b31a8a0da5c48466d6e5b47373ba2570e627597c4b5cfa55ef5c69bc3b42ac2bf
 EBUILD bash-5.2_rc2.ebuild 8561 BLAKE2B 2f181cbc3a3d87b0a414733c0ceb900a32e18a49e65fd6099819d43b481d55c6c35d980a5f15638ec837244d5bfc142da8e045479145584f67a15088782c9a31 SHA512 bdc909059c916ec58229ac87fdadec72d49cb4548f226fd4bf467d6a9dedbdf1406ad44087ad9a59913064b886e8b74c08377931a579fffb5716bcc572731b23
 EBUILD bash-9999.ebuild 8561 BLAKE2B 07cbcd0d2a7ced9015fea244a577c79980b65f80ca7361c05ebeaa00cf924e22f01d1038444b3c83be69783550b3c519db5e92ad9777c6c6f333880e195af43e SHA512 a92b5acb854f9e9907c4141018ee04dfd49b8e0f28dfb82f85cfd4b33810404aa4e01bf8978695facb13f43c25cbad05b08476cf26fd91d6227714241f0759e1
-MISC metadata.xml 735 BLAKE2B fb066d2f79f6b109d949f711d97a1446d3399b16aa2ed6934ba953179d0f6239ce677f5d887e49d7f5a9cf0680f31b560437e9b4399209ba8a7d2e09f05d864d SHA512 91b1f9e7c6419c3a7165180140fbc9754686fcd31f726b52a990a4dcddd290b049f3b681242ddf06f8e6ce0b2fafb7915052fa55c5fe205488361aa61dbc3b57
+MISC metadata.xml 872 BLAKE2B 44dab1d48a5fc7820a6c8c0f643142103c086c724a1f187ff981d463b9208197087729e2fcc0f37c78abef899fb08b292bb23b0775161cb20c8177d386d804f0 SHA512 476513729efb606963986b96231db6e8fc00757f026981ba4ea5d6a60fee4f6c16ac222466ed8e49bb6e15d0f2dfc5daea2f1f695d94d185c184cea6dbe2b017
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 77e4f896fe1c..67efcea3d7d5 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
-</maintainer>
-<use>
-  <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be
-    used in restricted environments such as honeypots</flag>
-  <flag name="mem-scramble">Build with custom malloc/free overwriting allocated/freed memory</flag>
-  <flag name="net">Enable /dev/tcp/host/port redirection</flag>
-  <flag name="plugins">Add support for loading builtins at runtime via
-    'enable'</flag>
-</use>
-<upstream>
-  <remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="bashlogger">
+		Log ALL commands typed into bash; should ONLY be
+		used in restricted environments such as honeypots
+		</flag>
+		<flag name="mem-scramble">
+		Build with custom malloc/free overwriting allocated/freed memory
+		</flag>
+		<flag name="net">
+		Enable /dev/tcp/host/port redirection
+		</flag>
+		<flag name="plugins">
+		Add support for loading builtins at runtime via 'enable'
+		</flag>
+	</use>
+	<upstream>
+		<bugs-to>mailto:bug-bash@gnu.org</bugs-to>
+		<changelog>https://tiswww.case.edu/php/chet/bash/NEWS</changelog>
+		<remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index ab7c461ed6fb..0473af500b41 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/base-compat/Manifest b/dev-haskell/base-compat/Manifest
index 545f565cc60a..e2020d8f1b92 100644
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@@ -1,5 +1,3 @@
-DIST base-compat-0.11.1.tar.gz 33691 BLAKE2B a598582e1a76b2b83d4168da3fbdf2b0ab34127d60ba46c9803101d075989000bed7f01384d58292d96c1099857964c74d9d7bad092fca94502442b635a82245 SHA512 d92a81e670535b4ca6fd95d51800972bbc52008ef21ccc22119341974c45bec66ed725c795da8d94c8ef824dfaa7f9c03a173b643daf339a4759c49453cfcec8
 DIST base-compat-0.12.1.tar.gz 35504 BLAKE2B 8b450d9b89509b36c4810d9c1471c782af3f782c7069f764ec79952c61ac59db8cfac3def772b8f7b61c311c7761ad793226aec1a58ea7d521733a2563e1abc5 SHA512 2ae3e1baad0d0f25c227a9b066ea266cff4f274448c418546d37c6274d77df4349215722fce3d6eaae2093ad31c9b2c70b02f1233513eaa59a59c6255669d318
-EBUILD base-compat-0.11.1.ebuild 536 BLAKE2B 8ca70f87a7c3960db4fa06ad3762a12b15d85f9e404808ab92cfe09a8b4b5b6660a65f2be588908070ece3a5478dba8ffbd00c04a2b99e2b1eebd5d6522e7cb0 SHA512 b774f0fab6c147a2dd97311aedf82581d1ed4385733844f05213af7727cacc889441bcc9b11bd83cb48923af46d86c99a0d62a80e4a4d7d65204cf8713d27b86
 EBUILD base-compat-0.12.1.ebuild 546 BLAKE2B a5cea6ae097abf86b5f1d1fd20581ddf53625bb4f176e6c59ebcbd1b25a2ede10edcc1f0cddf60610d95a48a9ac4561a8a124c1e60301b7617cb9bb68b6db287 SHA512 31f16f606bf7fd879ad0537ecac0e199b6d78540180daa742fb408bb7ff90afb55cff0920f81774ed4b596ebcb31763a10c32c76c7edda60705f18611bc9c464
 MISC metadata.xml 404 BLAKE2B 761fea42c742c94669841407c89bdd572a31203bc205572ec4d382665d634f5536721e6a93090339d016d945e8c1258ff8523d666623cd9d193b4b63fdb9adaa SHA512 0c7a01a6ceedafca74e55189c99bec8e3ca5e226710794be8307312ce3b85c89d86a147a889f02613df93c17c54270474f0b5dbb5e0376d97cdf10303354985c
diff --git a/dev-haskell/base-compat/base-compat-0.11.1.ebuild b/dev-haskell/base-compat/base-compat-0.11.1.ebuild
deleted file mode 100644
index 792d6215c9b6..000000000000
--- a/dev-haskell/base-compat/base-compat-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +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"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest
index 028d03d49a8f..4ce0951defc5 100644
--- a/dev-haskell/base-orphans/Manifest
+++ b/dev-haskell/base-orphans/Manifest
@@ -1,5 +1,3 @@
-DIST base-orphans-0.8.4.tar.gz 22573 BLAKE2B 0fe59f562864e41419a9b77087d70488cc6d9e5c762c92815d05d326bfb0a6aaa11e3da82b4bb0664549e56e4abd5f81330a836010f7b56cb26f86c8b82c3038 SHA512 ce59bd56c5acc38f3c5c55d619b27684a8cc35c0b14c2dac6a4cfa56d503e25c7a764210a7cb9cef93b0acc02371af0e40d8024b7a48e88a8ebdf406fed206a6
 DIST base-orphans-0.8.6.tar.gz 24255 BLAKE2B 8e8106cbdb58956ef6fc7c133e5a5c5537af8fa1ab56545a533f7c061361583b3921e77fdae2277a39cbc505a7e108fb672942528fe752fd7ef0506a4821547b SHA512 53cda663ee88e2ea53cf6b6d07b625a8343a6a26474bff9fa09554ee094e50429239615a892460fd676e9c3f80cbda0ad824052d785694fdbf1f2a90fa1e29ff
-EBUILD base-orphans-0.8.4.ebuild 797 BLAKE2B a823d186e884852892f537bcfcde1ed3549a951a410d46a586e8c3663bbe433757440e8a165b8072dcdc2ef9377632b2fdd2aa05736a8f579a009963d040eb3c SHA512 2e418787a9a27779cc2e5fbc5a5182d508cbad4d49708cb108a8bb73088073518dc37d1b9b0816c4830299e340be36eace31659e5c922a4eb542bf00e6cd3264
 EBUILD base-orphans-0.8.6.ebuild 654 BLAKE2B 04843f966b7a6b90b79709dc13108cb2250c315687ad9616c2305350dd4766f2536fd174ec844fbdfe83392f78b8f819ed05f7e1db950ad7e387e4a2c3e70691 SHA512 287d3d9128a56b3d70fd484b1075fcca1300bebe36e07c70e6cd165a1c9bf638b5c8689a116800b317d146b70e9175562d2a8b81f3ca5c307b8050880b7c9060
 MISC metadata.xml 807 BLAKE2B 38c0b75bcf2ed3539cddb1598182b6f6a00c3f73a8d9e42cb264b3f850764e3f13877b244f501b9d46ad4cc9c4616437f82f59b61a6a165f05c6d054b072f901 SHA512 9dde1cf788f1cad0f1bf33c1320f64f15cedc01b1ce7b1b4f99c963659555a2c3c77eac0f484fb9e258473d7ae9584597f62115b7f882d7bc9877af7457174e8
diff --git a/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild
deleted file mode 100644
index d7683ec48d2a..000000000000
--- a/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild
+++ /dev/null
@@ -1,28 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backwards-compatible orphan instances for base"
-HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends: base-orphans[test]->hspec->hspec-core->temporary->sxceptions->test-framework->base-orphans
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12"
-# 	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-# 		dev-haskell/quickcheck )
-# "
diff --git a/dev-haskell/basement/Manifest b/dev-haskell/basement/Manifest
index 462ffe603024..8785a7613ef2 100644
--- a/dev-haskell/basement/Manifest
+++ b/dev-haskell/basement/Manifest
@@ -1,5 +1,3 @@
-DIST basement-0.0.11.tar.gz 134032 BLAKE2B 52d9d674841d048b53011589c7a87c7cd7e45655db3c7bc2c99574b8a49bace33f20abf7d4614cf3106e2b87cb67340e5d2f76416889038c2e081c1f62f46bdb SHA512 2396e692fcaa080418eb90c38148dbb2465490ffaa5e35d141573d32729794dffb444bdddd55082878520a22629cfead5fdc1ac98f1d369600cc3165b64730d5
 DIST basement-0.0.12.tar.gz 134142 BLAKE2B cf0ff62bdd69cdcb075b5e63e9d60e7033ac85007101cd8c1d38776cbd1b60b336606e502a91ab8fb7275273f9fa3eae7344f0e47aa269bada2649c7be07caad SHA512 4515fbecfb8280cfd669313d236a5e3b4ef45ba3fd3da8626073fa3a44a889370c48c582ea633eac5df4a5e716c495cf827deb9239274fbdb63a14d19f9682fb
-EBUILD basement-0.0.11.ebuild 562 BLAKE2B 0554ad3f9b0ba9195a19c5603a3566ad1324572c77a6ca022024ad903b66a558c9fd8cc4d3d5c9a97c1444493fab08efd17556cd93d4c5c1a71d5cb1eb38f82b SHA512 abc0dbbf1b94ac220fd7bc587b2a0431188c97f32c1f179dc18c3146df287673d4cc74888e879566f1ff1c8b86785f903e16c0c7553487c98593eff7bae59a3a
 EBUILD basement-0.0.12.ebuild 560 BLAKE2B 7ca7bf920793ff42de934bc6bcb33022a2d605c4ea3212d1d6c3cd29348f65c434dc64f0b461e0924a30d0ecb8aba94e44601e4a20565d4afacc0b4be04a2e0c SHA512 0b08a9d5a920ad55a3c791ed42a75c0a59d17c2fd034b2cb979fe1dbfbc34158f21088aefa74b1d06d7f68126fb5d6fe511d90cf03f6e8fa788c603c0be14c6e
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/basement/basement-0.0.11.ebuild b/dev-haskell/basement/basement-0.0.11.ebuild
deleted file mode 100644
index ea25452e60fb..000000000000
--- a/dev-haskell/basement/basement-0.0.11.ebuild
+++ /dev/null
@@ -1,24 +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="Foundation scrap box of array & string"
-HOMEPAGE="https://github.com/haskell-foundation/foundation#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/blaze-markup/Manifest b/dev-haskell/blaze-markup/Manifest
index 51bccc02d36e..c41f12d56f98 100644
--- a/dev-haskell/blaze-markup/Manifest
+++ b/dev-haskell/blaze-markup/Manifest
@@ -1,5 +1,3 @@
-DIST blaze-markup-0.8.2.4.tar.gz 14518 BLAKE2B 43f07bdfeac60e60b55a7a0f8a1bf3c1386597b09511a6df2139246b05d10bc66899ffad7eefbd97cc1c981e7dcc8f7e345ec41675293599f22e1d3849ecd5d9 SHA512 e75fe4162f165975febced4d54460c64a4a4d1ec1db963fcda7d1c1e2cc2c24f8eb565ba0170524aa28da3b3cc1d8057d036a1ab963052436dd550189d5cd263
 DIST blaze-markup-0.8.2.8.tar.gz 14519 BLAKE2B 14e411fa06da460f3ef2362179d910562d292190396430c9fe6fae76195d0d6d0a5a2110659f41217515afdbece60618eca6264906a554fc9668f25abaac7119 SHA512 d677b611c751c2dfd4bd12c1b1aa612b08356c90b9962b60d4972a9626ddd0337bcaf40b4595b64c1d3bf506d017f058771d00fa55979b94283095061be18944
-EBUILD blaze-markup-0.8.2.4.ebuild 1119 BLAKE2B 51d66b29c40adc6a20558c56c14ba4236ba58250b0821acea2195a174443da6b6517341d771310f7c813c25ee22958fedab61bb45c840a4c797e33cdfab1f8e6 SHA512 184e2d31694b8c60ed54eb7c6cfc6144788518a0f64a4679eb61c53c10a9e8afdaae4debab9eed7b0bc947ab852da0960318d70affde11460b44708d65ec1ae5
 EBUILD blaze-markup-0.8.2.8.ebuild 1020 BLAKE2B 9cd56fec389983b0884b65a0330eb30c8a35c9d2e34dfb99a5781eb812144c03ce31b142c3e364b037d93497bd566917fa0f124a03e2480f51563d55fa39f076 SHA512 12bfb33a7cfeb14bc8fd71fefd8eda15524d906e1f27f2dde3715bd404ef4deaca0f7bbe869140acd7009fa406f46b71548808d829eed05b9c143dba135dad2c
 MISC metadata.xml 517 BLAKE2B 6415424fffb8f17871896295acb0a6a8d776ee4baa14bc699599fa36661f4e344275713da819a4cd86f22b034120a716c34ab0533204e572a15bae45a5841f26 SHA512 34d24897ff45b301094feb5add9246306c3c5eabf06ce5da41c3889bc038ea1a403f385fafb9989cd9e12a31eb68aaca5aaae5484cb1552e252d8522ac3e6e09
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild
deleted file mode 100644
index 522cbb17b49e..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.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="A blazingly fast markup 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/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.7 <dev-haskell/quickcheck-2.15
-		>=dev-haskell/tasty-1.0 <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 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base          >= 4    && < 4.14' 'base          >= 4'
-}
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 634503e79395..7417be7884fa 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,5 +1,3 @@
-DIST c2hs-0.28.7.tar.gz 207782 BLAKE2B a9f29506e6aaec3400d844ad85b2a6b6e1b87cb3c6c641665ab6bc5465903da8c2c82c3511b451e54cf30dfac61092dd323f8a2af48b5daa6081a4e9c5f00c9d SHA512 69c877349ae4864763d20664edae07a67aa1c55f5d4fccc3fcb6d06e94eb14d6b4b0201fc2840a9ebbc45a2a21ab55ad0e79f9cd88c00003df67abf5c1fd62d6
 DIST c2hs-0.28.8.tar.gz 207816 BLAKE2B 6d912fd93c6076ccd86ed62e075f1addb7b44378c82acc0cbaf04b6b91a2ed4530cde60a9139316d928a2867474bafde5c14aedb4ab9e78e5faaa99830276a71 SHA512 ff9119acecddd853f2f797385f971c249bcd92d4b141e8e7ea5f5d3e63aa257502c80ded2720a46e3186260026b94c9e518f08f8e452a64c9f888d0183ee1749
-EBUILD c2hs-0.28.7.ebuild 1113 BLAKE2B 89b6071b686da6f0116d04be90ffcf797ee06fe8f687a8d15c441fe4095dc96ed90883d0f01880be5bedb2baea4ab0a99fe10a7f9fb886436018f89cffb166b4 SHA512 c3ba90614f7e15a8911e250ed61ceebc4c456c6d7bdac83c661858e9e3457173a876d1ebbd67a24fc9931a51e020b9645b13c8d8e795830328297160db40e098
 EBUILD c2hs-0.28.8.ebuild 1070 BLAKE2B df0bc48723b18b29d5327d1170f9b795a28edc447bb6b829fe0f1553e3e0dbe0d8f724c7364664a9924be1e1322acec642aa8d5059209fabe308cfd0a2ec10a6 SHA512 28866de33b5b71c47e75f6ec63e7313c7b578d56435e4d9960210eefa5e89af79490738724f2fdcbf7f09d4064872aaf3a032fcce9a555a512e6aca4c994788a
 MISC metadata.xml 775 BLAKE2B d57e7bfb66cf558914ebbfb029294df8bc0383fb39fcf528f0fed45949193aefe2931a006e5b4f1c95c4c22faf6ba324abddce5bb1f8d79d9e5ff3d4bed00103 SHA512 791234ce7ca1326bf3ed4f9b6cb1b6947adff0019bf42ea37202eb398042d918fc2953a847dd7a368b49730b3af64db0b65e962eab36cc32ad1cf1659113a2bc
diff --git a/dev-haskell/c2hs/c2hs-0.28.7.ebuild b/dev-haskell/c2hs/c2hs-0.28.7.ebuild
deleted file mode 100644
index 99e58a64012a..000000000000
--- a/dev-haskell/c2hs/c2hs-0.28.7.ebuild
+++ /dev/null
@@ -1,43 +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="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RESTRICT=test # needs unprefixed 'cpp'
-
-RDEPEND="dev-haskell/dlist:=
-	dev-haskell/fail:=
-	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.9.0:= <dev-haskell/shelly-1.10.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		!regression? ( >=dev-haskell/shelly-1.9.0 <dev-haskell/shelly-1.10.0
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest
index 808e01f0a2a0..6f0174a7ee5e 100644
--- a/dev-haskell/cabal-doctest/Manifest
+++ b/dev-haskell/cabal-doctest/Manifest
@@ -1,5 +1,3 @@
-DIST cabal-doctest-1.0.8.tar.gz 10812 BLAKE2B ccfff885efdcb4e2d1233ef6e9a1ae6b2e2101dd0811634dd1be284439e3fe2ffa8f1817d3b1f5106a49365a848b2178c637450a23de7b326c4f476a0e73b3bb SHA512 121827f4f9117673c5c41beeaff2ef74f75ca55fba8460f6289d69b1ebfdebb9568f23b4b7d0ab2f3d436cbcdaa073709a26562b39e5f57a6a705088d0a2ff71
 DIST cabal-doctest-1.0.9.tar.gz 10770 BLAKE2B a85afe1e184a8de3f2fc641f442e420202b0b40a4f0368de365c1581648d877efbc9e771b3fec0fafc2dc29f35e9ca0fb5689975e71889286767a53580d7d1fe SHA512 e5946a300a159e9adc8dd56927437c2e1db643d0f23c69325a33075e4da011a7e681814d9ad475ee4029f8f95151b6fa350e9b6912133167baa0bfc79b49da77
-EBUILD cabal-doctest-1.0.8-r1.ebuild 768 BLAKE2B 388f49569c581fc485c0bf0b2a3a3a98fe1a140b83ff3c008883837e4f6edb88f3fddb781e7465c75f3462ce4ee6d5aaf028c4368f18afae292c3a8f07a989a3 SHA512 faf431b81d18512e68fc880aedc4050fa5a7aea821bfc90f7574c4cd56e3bf73a710ec34771ba673bc4c7e83b5e82630075ed03fc03db491f78bc7ec96b46bcf
 EBUILD cabal-doctest-1.0.9.ebuild 623 BLAKE2B 48fb9c6030e828e7d2aaa18ed954bff877849e6adf54774627a0984a644eaca5e61269a89ece6fd5c6e7827d2b1b5b6502a79e5b7803805706cfc97fc1de88e2 SHA512 21d623aedca9250c11c35ed42aab2283899db21dae324b7244a774b593bf096f5c83d7dd55305187a6468958f2bad7ea1cd101a9b9a661698ccb6a4650b048e5
 MISC metadata.xml 724 BLAKE2B a4b26a18617660db765fb29c357534746aa1120a4efe8ece526c88af01fd76e44290a27990160151ffd89f1d2878c3ebd5081e200716dfb815a56853e83df013 SHA512 39b8c4d2ce64aec279b60730d33502434b45ed913fe02a1ea030cafc51e21b037c6bc49b1b89434f66a66c0708d24dbe1fcc8ec9443ddd4ba91dd81310137d64
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild
deleted file mode 100644
index 97eb27900f0f..000000000000
--- a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Setup.hs helper for doctests running"
-HOMEPAGE="https://github.com/phadej/cabal-doctest"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >=4.3  && <4.14' 'base       >=4.3' \
-		'Cabal      >=1.10 && <3.1' 'Cabal      >=1.10 && <3.3'
-}
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 491c4a7d765d..45833ad2aff1 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,4 +1,3 @@
 DIST cairo-0.13.8.1.tar.gz 53026 BLAKE2B a05302d41bda35d3864b675e08b9bc296a218d528d3f2ecda34325650cde67a127cb1d21f2bd8d92dfa9a5e768ff6e622a585b81ac5897d86b9d89227af8dda4 SHA512 9c4ec738fe6e335f635c3fa47a26edb9264ec5a9713ff8c0109f2cf321e21331009402d3715321b63f5423e32ad90a0dd3ca9ca83544d554be5463c9784ab727
 EBUILD cairo-0.13.8.1-r1.ebuild 1156 BLAKE2B 6d898d46d86206e1a0b42e7c5d83c6a5094ace5bbbf2f71325337134a4f8fad47de33c9977ba0383018415ba08c0a8c43eb946491ba374a309901c7b9ac2a378 SHA512 d0c7a1a084d13d2fce3b2eaa126f10b04a4475cdb2a241a0ffd1ddedb6361395d778c40c00900892ec76a0c98d91a966eb471a11c27b40b11bffb14c3f470b21
-EBUILD cairo-0.13.8.1.ebuild 1091 BLAKE2B 8b3bd6dab36ae0a3e7a2a9c9cf2df9b9e4fcbb9f9d81911489dab7eaaa57d609b927827b076f6f4f355a53da5dc6f9c338d1c68178b7a8d85cb1bf6e458e7cf9 SHA512 365cd5f56a429ae2e909b0d2414a3a311f992d75234c012c720fb044cb35ed56d43d383c025b9b4e2a38db811d3a73309fe4ef27043014fa13171211862ecd9c
 MISC metadata.xml 469 BLAKE2B 1b72b7942922eda8e595babe307a133ac22a1a45ba7f1b1e1ef4d7c99352ce534c1b2dc1f382686c9447a2890a0a1e8193b2bd2bd897dc83ab41e08342cf3a59 SHA512 26cf5e547b38e592ebc1d5a1bdca716c6f7a33ed201b0c6b261436e68b72ec8953e42b0246101e2410be6716586eebcccf848089444100027d1aabcaa47d96c3
diff --git a/dev-haskell/cairo/cairo-0.13.8.1.ebuild b/dev-haskell/cairo/cairo-0.13.8.1.ebuild
deleted file mode 100644
index 174a94c5d100..000000000000
--- a/dev-haskell/cairo/cairo-0.13.8.1.ebuild
+++ /dev/null
@@ -1,38 +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: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag pdf cairo_pdf) \
-		$(cabal_flag postscript cairo_ps) \
-		$(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/call-stack/Manifest b/dev-haskell/call-stack/Manifest
index 1387222df6ff..19222692e97d 100644
--- a/dev-haskell/call-stack/Manifest
+++ b/dev-haskell/call-stack/Manifest
@@ -1,5 +1,3 @@
-DIST call-stack-0.2.0.tar.gz 2565 BLAKE2B f9c8440947c5bfad04d57d5865bfc82d9009dfff4b8de11c6281ef8c82a5cdb39c1bf83153f9b3ab58f0dea0b641c348b3096ae08b7368a92bc2ddfa638d2578 SHA512 c22862ca24906b07e258690da8c7f6fadf87f4216023cbe847e8ddf0c87548e5c353b5cd82c4748c6ef09604556884caafe5fdc1996be9d000d2db29aaef1537
 DIST call-stack-0.3.0.tar.gz 2544 BLAKE2B 7a668213daaaae0c2ba9a1670aa0073585ea1e122149b88c2a953b4aa8960ef4221259c2a331f3a32913727373e6f7a9e99ad5cdbf747f9e84071c4da01ca522 SHA512 32d805957dbe8965c22a74f1c9fed950f5c8df599ce5d447b3eae08fbbf65a01286be95444ca9db654a5189b062b4cf121dcd771c6bd981ca9d12e0df206533d
-EBUILD call-stack-0.2.0.ebuild 591 BLAKE2B 507aa5957da7e75365152e4c410cae568ba698f4b5711eaca637138c54723f11278654ff3c1c2e195179c6c8c6ebed59a6b34c76308755dfd019a9ee7343c114 SHA512 12926a1c14ec0b03370d20fc79ea2d6c19a09d70ea25b9f223039e3712adb7a2a66c4ba18f7341ff9c3a3a54cbe1947368715a62e0b578016525c27c2792776a
 EBUILD call-stack-0.3.0.ebuild 606 BLAKE2B 853cc3eec96f522ffbd9fd74f54f9b4811ab6cde894f226f019a5a4ac39f3215296bd7febd2d56aad746986ad31c2990460ff08fa6f197b81dc28b9ae6f4bf57 SHA512 80e766d58e1b713c9b5b2572e98fd3156535fcd0384b84348074d7f55666da742957454c5ab3a70008eba2d2c13bc5c1f97da952364aef76554f7f7c81bb87ac
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/call-stack/call-stack-0.2.0.ebuild b/dev-haskell/call-stack/call-stack-0.2.0.ebuild
deleted file mode 100644
index b3441e33b82c..000000000000
--- a/dev-haskell/call-stack/call-stack-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +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="Use GHC call-stacks in a backward compatible way"
-HOMEPAGE="https://github.com/sol/call-stack#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( dev-haskell/nanospec )
-"
diff --git a/dev-haskell/citeproc/Manifest b/dev-haskell/citeproc/Manifest
index 8bc5aa3788a1..f483f53ff34e 100644
--- a/dev-haskell/citeproc/Manifest
+++ b/dev-haskell/citeproc/Manifest
@@ -1,5 +1,3 @@
-DIST citeproc-0.3.0.9.tar.gz 572112 BLAKE2B df1ff046f4356f5feebf3551b3be9807b3bfca6ef927805efeb2ff5133968f1bd0ae14923ec83309ad2b8dd50d674f4506b1f62adc53a78f6afccea7cb6da5fa SHA512 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f
 DIST citeproc-0.7.tar.gz 528208 BLAKE2B 9ad395c2c3ba7bc957554b37af1a514c3deb3247a55a41b35c88b25f25db474043d18de5909e67ac5723fbfb0a5ed8161a16eb851f59c5648cfa3b30149c46fe SHA512 e24675c0d9227bd6ff5f13788c251647df1e61a65a1b0fe94d80c0bf064bd3018285ace6397d0c5f2b5d6e4ee9b91de8b90e6e4251e9914fb8fcbf58ed3c4539
-EBUILD citeproc-0.3.0.9.ebuild 1529 BLAKE2B 1b106817f7a352aef0b867101d3e2d138914d89e03dd80d1026c8f72007155e2b7380c871f25a175f8947b7358c5b4ed822634e9dfaebb25848b302b94f0d6e7 SHA512 7defd3b05a00223e6eccb0bc8280186759874f467adaa19d62267a21dc0901070cbe2420889089bce19e110bdf8a1b725acf0bcc5a95d54cd127b507aeb87a34
 EBUILD citeproc-0.7.ebuild 1797 BLAKE2B 7a42674d43e80bc1f29e5343d9a165f475c622b2f2b0ec6170f1d2e7b8b74fba5c22b3fe1690714bd4882ed4e48c4cf6ce9b970bb66ce98dff96d2e213e40301 SHA512 a1cca34667a88bffd73ea5bfc7a224db0adc435077ca9bd078f510e46b5d9e8f0be4304019e6c9c6a206142ed85bd8a2dc9ae5a99a8d46309e45b0317e3199e8
 MISC metadata.xml 625 BLAKE2B 1c97c851e9df58796f5ff864598ea1d0d7b9567ffb098ef45b796c057b3a9bc6ab4219ab064d0edee79a00b49ae572b5973e34f7c0106293e48a348005436ac0 SHA512 82f117d0c7ab996e1ce3bb672d1ab7eaad4d373dea7a53b65acddca52cc028c77fda1289eea01af616a9380c6dd950cfc83d7bfaa50c9ff0e5cb5f8efae7003f
diff --git a/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild b/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild
deleted file mode 100644
index ee9b06f64280..000000000000
--- a/dev-haskell/citeproc/citeproc-0.3.0.9.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.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generates citations and bibliography from CSL styles"
-HOMEPAGE="https://hackage.haskell.org/package/citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable icu"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	>=dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	>=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/uniplate:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/xml-conduit:=[profile?]
-	>=dev-lang/ghc-8.6.5:=
-	executable? ( dev-haskell/aeson-pretty:=[profile?] )
-	icu? ( dev-haskell/text-icu:=[profile?] )
-	!icu? ( >=dev-haskell/rfc5051-0.2:=[profile?] <dev-haskell/rfc5051-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4.0.1
-	test? ( >=dev-haskell/diff-0.4
-		dev-haskell/mtl
-		dev-haskell/timeit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag icu icu)
-}
diff --git a/dev-haskell/commonmark-extensions/Manifest b/dev-haskell/commonmark-extensions/Manifest
index 32c4fa9a033e..9181ba7e4ac9 100644
--- a/dev-haskell/commonmark-extensions/Manifest
+++ b/dev-haskell/commonmark-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST commonmark-extensions-0.2.0.4.tar.gz 32043 BLAKE2B 5a0f690b04b8c2e34383b9e2d8248ea5e6945af434c413aa289bbf1706bbfced8fa68b625682ae1c916db25a577d7f029e9247e908bb87e6979f702d93b72a9c SHA512 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3
 DIST commonmark-extensions-0.2.3.2.tar.gz 37074 BLAKE2B e3519ad4ec8bdb9db5ab8cbb57ffeccf2512621c7e5fe423dab1c5afb075f55fcf348dabcd770ab84abf1efae24ad73c013ab76d080122e55736e59fca2ea7c6 SHA512 93b6c856f8aa5858e2700e8ffd98dd56a294cae95430b0ec1ea1c6a48f952eb5c1ce8223a10a36f4249933e2efc92d8110ba54463af467535b435c236b03f619
-EBUILD commonmark-extensions-0.2.0.4.ebuild 879 BLAKE2B b7e4b903d7a975ffc0a4fbc76613857ac81f0c8eab10c07e32e9a08e695cf3918ead9721db4ca4b919bb91266fd8b0c73b70049155d39813578aa4ac88b2dfdb SHA512 45d0147fee42fc394b87e6c2fa69ce71c3315aee5033cdd90ca17f2aecec57787d3f2c4d5b3d6519e92acda3aaa75daa427c5c9705f76bdc6446fdcb8a20c8c9
 EBUILD commonmark-extensions-0.2.3.2.ebuild 796 BLAKE2B 8485ff1e15125870a40b5560fba990d1e36154c28ea61909769b916b0c59e702640fd4974a62c34b64d392fa2094631ebedb7aab25012f231af80abdf03b3569 SHA512 f26d0f52583cab1538e7035511718d4517fa9b73bb68706f04acf3de3d78c8989b6a8566f0141924f11d3e8ae099751ad77556fa4f05b614f65a5f32aa447c2a
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
deleted file mode 100644
index 4af1c67261ac..000000000000
--- a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
+++ /dev/null
@@ -1,32 +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="Pure Haskell commonmark parser"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
-	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/commonmark-pandoc/Manifest b/dev-haskell/commonmark-pandoc/Manifest
index 80048e088b58..a0b788a149de 100644
--- a/dev-haskell/commonmark-pandoc/Manifest
+++ b/dev-haskell/commonmark-pandoc/Manifest
@@ -1,5 +1,3 @@
-DIST commonmark-pandoc-0.2.0.1.tar.gz 4754 BLAKE2B 4611196ab63844bd1c40c9e673c43cfd8c44997ba31511b45bcb9a9b21109cd9c1fad98dbf99de2bbd203b39d93d841604afdf4acd0cadecc45ab2230d952f1a SHA512 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d
 DIST commonmark-pandoc-0.2.1.2.tar.gz 4937 BLAKE2B 26f46b663051aecc204f2e67f66e62a6943909d496542d31b0238cd6bdecda4e0c8594d8ed3f8147fea5bbab4680c147379feddecb59f93be810bc3a9015d08a SHA512 85c7505b29c99e38bbadf93764e51ec40da3bff0799e99eecd011962f1103b81970cb5ffb7399b48927e0024c07554ee0e7d420a88bd2f37149a4777d8bca032
-EBUILD commonmark-pandoc-0.2.0.1.ebuild 849 BLAKE2B ba636e066bf39b2d85db69f5e2f23b0343328190aed22c243547738208a7610a093fffd595c7a22ea34e894b4c5a813c75db048e2ce5cbac9b1328540f99385f SHA512 b38b9291705b8607eb71b78d9b97406bc4555af8b0d55af6241403ca85b9030baabf0211ed3c04f51ed05ba21ef01ea859b0e4a8a3fed26bd8a9bbd3d6193368
 EBUILD commonmark-pandoc-0.2.1.2.ebuild 847 BLAKE2B d1401063f3276ff6328bc7db9d44c50a5fab86bad7f68bfee7c85ddc28e4a807a396e8a9c2505b4710b7b5c270b4877b7e566e2507025c319d0325cf303a2033 SHA512 b4ccda6cd6716691a88f2d7870a78fe05169f05681366e9d7f213737c74ab5c010ea4b003205fa292cb9f178f6267f72195953093018fccdaea031c0cf108918
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
deleted file mode 100644
index 3fc16f6d2a8f..000000000000
--- a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.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"
-inherit haskell-cabal
-
-DESCRIPTION="Bridge between commonmark and pandoc AST"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/commonmark-0.1:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
-	>=dev-haskell/commonmark-extensions-0.2:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
-	>=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/commonmark/Manifest b/dev-haskell/commonmark/Manifest
index 47f7422c2a9c..c2b95f529250 100644
--- a/dev-haskell/commonmark/Manifest
+++ b/dev-haskell/commonmark/Manifest
@@ -1,5 +1,3 @@
-DIST commonmark-0.1.1.4.tar.gz 99102 BLAKE2B 28fd60d2ddb385856ad824cbc73f9f20a35616312e2a4b340e4f0b7fd4311f35155a6fe3d6255a3e2e75a2058627c44119620e0e2caa917e5608cf1284a19641 SHA512 d8f8f652a78d6fcc0b623f6750f3735c22d623a3a8e423384ff0778993c0ac65e986bfb37ba939d0c4cda3db95af2289520883579d82372af5cf5e5bb0540657
 DIST commonmark-0.2.2.tar.gz 101438 BLAKE2B 1e6183e2a9a3d90fb3347bd03779c77314e51d817de7740ae933f328a144a22d729a5dca90f40e1a35967a335d03aaf8e6836b8fe42d12c8d2f52963378c8f6f SHA512 fb1e9d8774c7a2682af8702b94ea4b255ff9dd38fcaba96048d037b3c75051509332ef80631165670a513280e984abf1fa08dd53e85d13f1b4e46941cceadc96
-EBUILD commonmark-0.1.1.4.ebuild 710 BLAKE2B 84e5ed868323c9a5e7b69ac362bf66f10f984fbaaf64a4f590642134e222d172ca765be21cbbcb324f6133ac2e291dc664fcb08aadc10ce3ea0476bf905f96c1 SHA512 16a7bbca1317c3e8dce096ae5c32d798d20dae9fc47fcc8201ed6773bd0177a18fdf5555bb91ead1be0e16f95632f14eafec659734521a817cce85bc0bb2b637
 EBUILD commonmark-0.2.2.ebuild 720 BLAKE2B 1086ab9232d66437369c1a1fe6b3939223af07094e2e525643c2758351e2f2f7a3374ad8e51951b98a08b82b8c60d0b2d40b51edf97ba8292a426bebfc5c2a1b SHA512 559142101a1d63bddc258a061101e21c4f20b591afea5d3172affbd506ee281acce382c28b64be45e86c0305ee550555e69c7b0dcec6050f2b7dfa09e21a2a3b
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild b/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild
deleted file mode 100644
index f6eee2250939..000000000000
--- a/dev-haskell/commonmark/commonmark-0.1.1.4.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="Pure Haskell commonmark parser"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 63643b980854..0b07c89e14ca 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1,5 +1,3 @@
-DIST comonad-5.0.7.tar.gz 18108 BLAKE2B b7d415a2b7eb48f53727fa9ada77078de538d5cf477997a2953095d7410dff1a82f7ab2f53b2bf01b21671a6e5e938962a2ae2a6d50351d77a4dd8b3ae18a9e1 SHA512 6377f13b651c30aaba1f68448394a4048b15c4f8e97fe714281d15a51190b8ec6e1157a6fb332abfb75060bb2f4948db22fb35c537bf01836ed94ece99fdccce
 DIST comonad-5.0.8.tar.gz 15227 BLAKE2B 5f316ed68d35fcc2857cb7250f2d181ed77d2e87cc5d7dfb671cdec0c602080a6e3c0ac28541bd4cac43b954f96af0e1077bf2b28c040202bd3e66a820c5ccb1 SHA512 b823ea36826da74c6ec46cb835493224f62da66516841b9660a04c391dee803c31e140b2c523b563fb51f46509d99cce157b456a88fbaf2371da11933d5d787e
-EBUILD comonad-5.0.7.ebuild 1448 BLAKE2B 27a498b27e7dbeb84a37c6e428de4afdc92e4f958f4976a9eb4edc4c016f2ca51959d8f278b9e665ce189f114b5db8f2668c9351b0455ebf5c067b04a7e7f3fc SHA512 5e7a19291c8336d3a3e266abff528d14f9296295c9fd3c921f648e0209c4e943e70ab74d05786bfc07c9d6d54f6c9ff6b86a68de6bcfbac303ca6daa3ba21a1e
 EBUILD comonad-5.0.8.ebuild 1262 BLAKE2B 8e256ed09d185c96f5975cc5667e0c9f429b1fbc5d10d18b26881bdbf94e72755f5726c31c05f46fa1258a696c8c39cac13dcf2fac3ce42ee97030dce16eaf5a SHA512 ab877292ff305832e06744eebbc2999870feadd2d635b896d4298ca8d243e546692d2d34dd4a819aca232b7667cc4dcc2c924db36475339c3efa94e46a64b4a2
 MISC metadata.xml 589 BLAKE2B b2943802da0e42c68a86f8c7ed72e616e0afdf852280aef209c7713a790ed3a1c2b7e2ba5f82ace6440fd94154139ce98ef27b95d7fb12fb500ca6fb66073a3c SHA512 354a469e7a971310516e0d396fbd67de0375d79cd7ede3e31cff36fb154d189c6a6c823d21625b2e6f460e6c6169ed6e73cbac5176a12b55f166da12e96f6e30
diff --git a/dev-haskell/comonad/comonad-5.0.7.ebuild b/dev-haskell/comonad/comonad-5.0.7.ebuild
deleted file mode 100644
index 3480cf6e57e2..000000000000
--- a/dev-haskell/comonad/comonad-5.0.7.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.6.9999
-#hackport: flags: +distributive,+containers,test-doctests:test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell package providing comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+indexed-traversable"
-
-RESTRICT=test # fails on USE=doc
-
-RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[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.18 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=containers \
-		--flag=distributive \
-		$(cabal_flag indexed-traversable indexed-traversable) \
-		$(cabal_flag test test-doctests)
-}
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
index 0f7a0e1ab0a3..5172718c322c 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -1,5 +1,3 @@
 DIST conduit-1.3.4.2.tar.gz 88962 BLAKE2B 0c4ade4df87c8ace3206e7d4f6b52ae472828f0ad67d5cf970797054f4423c86256c50fdd20f4a7d215b0f1b5ac424ce9431927732c17b1c7c73fd98707e9cfd SHA512 8caf67020e33ddaadc5f05ad3f1aa38d436388f0cb3dac66cb9a645c1693bcd134f1cb8d311eca7b64f9c5ace9ca97681511e5dc28bb70b7b52c43c62d5f3e03
-DIST conduit-1.3.4.tar.gz 88861 BLAKE2B 79821013c6177ed2d555c6ad0c42a694f927c069b11c637c881d3cbcdf99c6ed8238bb8fd2d846fe1e89199dd7a35a4d75ddbb7e4c44ac2edb5314e9062229e7 SHA512 a70f41f45b9014fcd4155167114e0c42b98f33ffe5111ecfe12f3d7f579fcfe82b76e27c16670538f71883bb10af159a2e56eee322e0a1f1cf79bbf862db7611
 EBUILD conduit-1.3.4.2.ebuild 1077 BLAKE2B a83a04dd86132bd934f79e233c4f0c69d9a013bf7f0ef025df632b3d57de8239447623ba3bc5ec2102f4a7b0d6031986779883b71260559feac281c497803f5c SHA512 9e2ccea0b12b865b12d925626c72dd4ed2a1576a262aa50bb201c001b35a3c39f3d4b1eed1d2fca708b2bc02b3c0bee55ce8c038d614e0ba0178a0de6ed07575
-EBUILD conduit-1.3.4.ebuild 1081 BLAKE2B 374f1c8ad26d0fbcc6154ba69d675eb81ef0db9fefc12f18084b832d5c9fe54f702cf11d921bad760071d99de3b07e36c7d109870e5b2424c4d89827a6733c08 SHA512 2a9e83a3073da445b893feae3bb1b86a4ecb81ec16a060e2d4df490805c4320f0ac24cca8f05071b697ec73cf9f14944701c2df19e1d2f2a1e261d42abfddcaa
 MISC metadata.xml 675 BLAKE2B f088af609d60542880063221bdb170aad8f456f1e41b5411354365f53c06cb4f0fbca9a3a390239a7a9b2ba5491fadd27a8147b8d9adcd4a7752febc47531005 SHA512 0d08d0bdd4bb9d302672836538c11df4e4ea166153322744eacd0d06d8f6c8b49371a1617b8d134921a51977de91c4dfde94de0608c64b3ba437a1a59002bc91
diff --git a/dev-haskell/conduit/conduit-1.3.4.ebuild b/dev-haskell/conduit/conduit-1.3.4.ebuild
deleted file mode 100644
index be3bc3632468..000000000000
--- a/dev-haskell/conduit/conduit-1.3.4.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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/mono-traversable-1.0.7:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/exceptions-0.6
-		>=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe
-		dev-haskell/silently
-		>=dev-haskell/split-0.2.0.0
-		>=dev-haskell/unliftio-0.2.4.0 )
-"
diff --git a/dev-haskell/contravariant/Manifest b/dev-haskell/contravariant/Manifest
index 7cf80307e6d2..391f40c7b576 100644
--- a/dev-haskell/contravariant/Manifest
+++ b/dev-haskell/contravariant/Manifest
@@ -1,5 +1,3 @@
-DIST contravariant-1.5.2.tar.gz 16006 BLAKE2B 251d3f8e0d30176eef224000e2c9185d6161ca6de38c7f8737864d72921e75d715ccf286028c4079781ff25f0e2f2de9c01038f13f3052532eae7d7c9fa23836 SHA512 f59cfbb2c7b1dec7532c3ffb260b5788fc3fe160ad730c1b49ff85d57cc46c4af24e37ecc8cd46df112ff1e92b5b03f2064b81f8ccda88465e1fe695331f5410
 DIST contravariant-1.5.3.tar.gz 13726 BLAKE2B 89dd8d2265c50a848a52ae21022b9a63781e2ff8945d767349f3d14c0b9dd9fe221c564014ae516bc074c2ac6eabbfc4d114378ac81c107a403e15f78655c5bc SHA512 f84e534ea208ebb949e6e1114233e56f284b94ceb756bddeb5786d2c1ed7ed7ec93defcabfa285887316cf880e7b6d2575a76c72bdd9ad73530b4397f5466c87
-EBUILD contravariant-1.5.2.ebuild 1075 BLAKE2B 416734ebef85cdc70ec2297e4369373749a701ed74faf2de5e516e96eaa811bac0561d8c69d47f3e800d415945007cd227d05eba2f252689abd45eb07b3b6b5b SHA512 6bb36800fd85eeb31a2067471c9b579b9fd2d72501c91c1c0c00d1c70c73d984c9f35cf187b7f2f0950a187c4749823db3f73644af3a3e437b107bdc6cc07c78
 EBUILD contravariant-1.5.3.ebuild 1086 BLAKE2B e8bfc8c049a805944e566fca35179f00cf387fb8f16bd0e27290a4663d47653a72ce63080eb1cd55122951b586078c4435989c5a829c5955f35943c96f50c7d5 SHA512 73b96b27767239aa6658ecca80826c3c10a939445c569f32cbb935694fc0605ab906db0b869cb59f62a538581d3e4784d21bf633f728fd2842d280050467b58a
 MISC metadata.xml 1100 BLAKE2B a38ff0ddfc091c3e33a8566291385e414aaf39c868a9871ab763fa1ad54230383847d9c2b139984cbd764e1542029e8e99a848e3a5bbddb221716543d60e3cc7 SHA512 22c72dc641676ef66d825a01d12ffdd6b4bc295f82a7804461947b2ac848d3185905be0caf5248dc792cd4713f22a9ae717d6e6821aada9f7f5ae24383d25bcb
diff --git a/dev-haskell/contravariant/contravariant-1.5.2.ebuild b/dev-haskell/contravariant/contravariant-1.5.2.ebuild
deleted file mode 100644
index 4406606f91bd..000000000000
--- a/dev-haskell/contravariant/contravariant-1.5.2.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"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semigroups +statevar +tagged"
-
-RDEPEND=">=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag statevar statevar) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest
index 39fe1bc9be36..ca1c49ff79ae 100644
--- a/dev-haskell/cryptonite/Manifest
+++ b/dev-haskell/cryptonite/Manifest
@@ -1,6 +1,4 @@
-DIST cryptonite-0.26.tar.gz 581153 BLAKE2B 2becdd3d0c6f1e037fd4d38143a2a8644e38e9826faa271c971d4feff8a4ab1e4c0a04df338c99a8454cff626f79f3334a0a37b19cc136f33e7c8f53e66bd33a SHA512 4236d411542fd104e5cace61fbdeda615f7d13e442594d7fa12acc682d917b0494b10b242a88fef19e91e93489797206fee07497bff92e43d3849ebac8ee11b0
 DIST cryptonite-0.28.tar.gz 616309 BLAKE2B 3fa11777574fab06c264709d4de7b56fd4b276fbee93f4731683a9a18f83cf77d2042679f2eac3044d336c5be382e1e4eb0c90862c20b0f452eaafdee401e616 SHA512 c1e485522938f94f15910a5b5a4a3e4dfecbb62df463c80faaa51e9d883c2612611b8486bd0fd13660766cfb6d62d366fbbd03df2db874d525514aae247b6242
 DIST cryptonite-338.patch 1823 BLAKE2B 99a502e16ec061b37e1d3dc343760c86c1eb1cecf23a9061ef3198082d2777fa129196af3322153558e1da7e87b125bfa3a1e32501482767bbbe2e4ca874d65f SHA512 1f00a31791fef52e7bdb2b052912f8ede9022ee4013d1f74321ff10517c4c8df68be9b97d4bfd88140f5686b3b9d01e0937909dd5a2c462920e559accde8e72d
-EBUILD cryptonite-0.26-r1.ebuild 1467 BLAKE2B 1edc40a2a7cd40fa975c5536c4d4af4b6ffeb4d37893d88eda24d728d72c5fa074f42d93e6ab0e032944fda95faea5f20ec904613688c90d712ab5fdfb477d18 SHA512 05c6197336561311e83020460505ad25001849d2dfd12b8a1c2cd73f340ecd6e9f91cebfa85bcb0485578af5971014c5dfa1706ca9277d9d11349d0ca2a4c75e
 EBUILD cryptonite-0.28.ebuild 1954 BLAKE2B 742c5284df75753bce2a4227fbbae47ae3aed2234130c70777da1dac72c1ae83393764f310e348adf7fe88752adc774e185e84f346289e93aa6503c2ff236904 SHA512 993b12d911fcdba64e9fc448d5d9a2a76b84743ef674acbbe6906a54d3bbd02bbce661f764e5c0f2caabac1dc7ed5f2917eef2a9b3e46cc2a366a5b886bfe178
 MISC metadata.xml 1369 BLAKE2B dce4bc44ed0f1348aa690a9012811c9ed24c2826f5ab47612426621c69ea865576cb748c7d887a34b5fd6ea14c67d1eb40b95d9283cd2e15ac9c2b835dad6560 SHA512 5e3f9bc2d199ccedc44f4545bf3ed955f5d6b5eb7e9c2a3c1fccf380e95c946e5ccdf86383900d8de91cf44e3eb5ad4fd98d9fe27214b068287ce389237e97a5
diff --git a/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild b/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild
deleted file mode 100644
index 8728bac1d522..000000000000
--- a/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild
+++ /dev/null
@@ -1,45 +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: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu_flags_x86_rdrand
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptography Primitives sink"
-HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp"
-
-RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
-	>=dev-haskell/memory-0.14.18:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/memory
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-kat
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check_alignment \
-		$(cabal_flag integer-gmp integer-gmp) \
-		--flag=-old_toolchain_inliner \
-		$(cabal_flag cpu_flags_x86_aes support_aesni) \
-		--flag=support_deepseq \
-		$(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
-		$(cabal_flag cpu_flags_x86_rdrand support_rdrand) \
-		$(cabal_flag cpu_flags_x86_sse support_sse)
-}
diff --git a/dev-haskell/distributive/Manifest b/dev-haskell/distributive/Manifest
index becaf1fc866f..dd24e956e2ee 100644
--- a/dev-haskell/distributive/Manifest
+++ b/dev-haskell/distributive/Manifest
@@ -1,5 +1,3 @@
-DIST distributive-0.6.1.tar.gz 11256 BLAKE2B b8c964137613b828f2908b210964be06a39bcd360727edf816c9921d6f7c16c245fcc6cec702ff8f98e0f63c90396796af0bfc7964f25d589ca5616aa30eb934 SHA512 6f14660e14ff5dfe90eb44386ed111829d4a621f77908049197ce1802b4d5ddd67ec66dadb92f8726c03f455e077ea6a5b8503e24bd5d205883d53f13cceb630
 DIST distributive-0.6.2.1.tar.gz 8140 BLAKE2B 34cdca12089cc097619469e8f559e978ac6d96c7dd8156cd92ea3ef7a3219afb11af6dd78dd30f7aa72405ae90cd37860d845d7f0b5c7ce6055316d8c3f429bc SHA512 387c7b6e0b2f917fd68d52ffbc79b9db21e488629309bfaf0dc77450bfd37c0f7f8a29458532616b5395552f84f3727b462cb2876e5aca79101e2c752b26e0a7
-EBUILD distributive-0.6.1.ebuild 1205 BLAKE2B 353f74833bd8d2488630ccc4ee006cf14ccfb9237941692d33aa5bc1fbb7b4242396372560fbe0b08be0d12f25cf77dadeeeaf8956128618164d8c278092f6a6 SHA512 6e6ed365f88fe3fffdb75ee23a7165f9c3a3ed2c4989804989e686d6bab3c756421740b4ba52e8d44b5d3dfaa033dc68ff5ea47711cae4fb4a80ff19ae6a5f07
 EBUILD distributive-0.6.2.1.ebuild 971 BLAKE2B 99e0884d15c01b7d6ebcec541a2c9cac4ffbe25acf9b594f47eadba9e04a46b95fb1251274c742857b4fe382f23cf573cfc0e97564238e567f2c037d9141deb9 SHA512 6fffe5dbe0e0b6c3ce15684ab1a9774e42df1adb45e38443ae2b36c591d90494f3a5f9f22fb0fb5e791488f5f62f8e9c7c08e9cc1e017f1ff72150474a677b29
 MISC metadata.xml 334 BLAKE2B 6d5dfc7e3e056a5083e168407e94e028edd0fced4f673ba49d48f2f0cbc44f252ef99c35babcff2918134c44aef51c0d8c7a155d77aa8f90522879e10ca60dbf SHA512 8f138d76aac43915348503502d2c195e75ed94c8bc2da32d7136f96ebb942c0f49c7d3e3cad0e4e41547b2b1b4f4931362177ad62a13de4b6487eab9d8d4ad3f
diff --git a/dev-haskell/distributive/distributive-0.6.1.ebuild b/dev-haskell/distributive/distributive-0.6.1.ebuild
deleted file mode 100644
index 2389f0d37e23..000000000000
--- a/dev-haskell/distributive/distributive-0.6.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.9999
-#hackport: flags: +tagged,+semigroups
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails on USE=doc
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/semigroups-0.13:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-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/generic-deriving-1.11 <dev-haskell/generic-deriving-2
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=semigroups \
-		--flag=tagged
-}
diff --git a/dev-haskell/doclayout/Manifest b/dev-haskell/doclayout/Manifest
index 90bdd9d249d8..7dd5d3a51fbb 100644
--- a/dev-haskell/doclayout/Manifest
+++ b/dev-haskell/doclayout/Manifest
@@ -1,5 +1,3 @@
-DIST doclayout-0.3.0.2.tar.gz 12140 BLAKE2B 831517277dad7cbec04335fa69a83a1fb7bbd90edfc14cdf4ea5a340f28416eaf28639c8388b9c305daf60097871d1c5454e28600374dab176aa3babe4449a98 SHA512 5f777b66c5bb589021ce6f74e4cb4520a5078621cbcc62bc4eb8b73d54771f18523dfe40935f83553a5a4244219a86b6af22e7e3f33d251b3c567f91bb9596c0
 DIST doclayout-0.4.tar.gz 38804 BLAKE2B fab7c7090c0416a0d6a377673892ffdd684703f773416fd08ff95e418637caf7a61242931a492f321c09374c020374630e6223d2838650c5078408a041fc9bfb SHA512 78d3f64d72c2991bdc9b7ace27ed93e977d3e5fc3afa511857234f1c756fbdb77ccc74ba11af0aabfb09f31a4a906324abc1945160f435c83a07ebd3ae1a44c4
-EBUILD doclayout-0.3.0.2.ebuild 728 BLAKE2B abfb116e9070617b556a83d9a96e65b1cf85c7fdc19088e9f1ea3629d237cf2379a5119900cc6c26783fa1ba3e5686d0df5e2712948f0154ac09b4aa94643ca0 SHA512 110f13bdf7ebc81511e75ba1dfbe92ebe52b3b3c45a9464e45ae72392028f66f9a88e60bbe311b2e2dce12df7368db9495eb48e81405ad445b495a563dbe5811
 EBUILD doclayout-0.4.ebuild 749 BLAKE2B 46bb54b198565b989edd6a09675c57769fb91fee33bb1c8abf70a7038af027b3350fd2934ddd07421abba5c629a892eedb1eb94774d0d0d45a5d42e6183ba513 SHA512 f1908208a7b07562bf540156d19df550cd2a0859f00087b451ff3fbbee9326e66bcd9ad0caf03e2c4089350d46d52a1fa69d39a700e3182609de611b1b71a4e6
 MISC metadata.xml 483 BLAKE2B 586f7adf03c5a90ef97f731ec689ce245e1f9f20b32a97640cdec42abfbde91a217b9572545a9251912c584a6895acef3ffe4fa443835786973ab6bb2f03db1f SHA512 21db940accac5f56ac97095967d54c17ce544f35efc64d26f9f3c24ee729f08d755061accc9b9663e9afe1b9d4b3c2d3858f26d5c7a4fcc84855b2a1e2d38458
diff --git a/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild b/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild
deleted file mode 100644
index 7ddee0ab5658..000000000000
--- a/dev-haskell/doclayout/doclayout-0.3.0.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.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A prettyprinting library for laying out text documents"
-HOMEPAGE="https://github.com/jgm/doclayout"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
index 74291aca6c3a..54aa2af12c3f 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1,7 +1,3 @@
 DIST doctemplates-0.10.0.2.tar.gz 27788 BLAKE2B b4c2d505dde62123177c87b7302095a02a6e27cc3f4e311e9a4464fe4eddb43e520146fdf6758cacdb8a9b348ae0b8a46b0485bc105366776e6bfa60b31209cc SHA512 47bca3c29cb306ce0dd8cb91c255f2ed1988136380ddbfd3220ca5a14527650b44d2d4f5c7fef3245c5c11e5287dcf2523eb1b0ab861436e7f950fc8188af36a
-DIST doctemplates-0.8.2.tar.gz 26780 BLAKE2B 32554545d451a382a490dc6d64b9f8ff0465b1e345daec457196cebf61f0d6975fda8eebc0e7115089622c15e7a96cbe490ae78d63b7b06ebded9c9b79f82a3a SHA512 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad
-DIST doctemplates-0.9.tar.gz 27366 BLAKE2B e4c88e3abce07f6fa94e51e63124a7a6f1fa054a1f70595fe81b058a5fd6c87a25085cc5373eb6ee191fcdabd34650d30f9ce6251bfedaa2e16961ce3b74a816 SHA512 3216fc7ef4e2a45230a2854c22c2a8622774bc834bbf59d34134912b3942df2a541230bd91324995e13e19098a0fa0bf7057c7d55ca35ec75da7840fddd61a37
 EBUILD doctemplates-0.10.0.2.ebuild 1003 BLAKE2B d5d80f09f7abe1c5cdc15191326553e772f8ada690599a995cebf71644ed032191550ee1232f24442d4a8aa1888a575ae5729e4d984398fbbe019ac1d351a577 SHA512 ce1274cfb3e6afc41592edb447be54a094f47878e503e5c37ee56f33763765f9c6bedd124bc608433b02fa89ba3c1e71235c916b99ec57a487e98050a4cd2659
-EBUILD doctemplates-0.8.2.ebuild 1098 BLAKE2B e910ee9a939f767336e8773d73b1426afe21d5a614aa0904c52624f62ccf5b11f5ae555733e74b3055d631dcac0c2779627e5e39334a2a020c6b421a2654cf3e SHA512 eb72d55c9652162f6730747767ffcef6f6900a412a005c6a45c6d0cef6ba3637e4031ca4604cd625e42acbb2a43535911cccccfcd02d09178053606640156959
-EBUILD doctemplates-0.9.ebuild 1140 BLAKE2B 8c48f1deb24c71c4e551ef7a74953916f2af687a54361096dcf5d11ed9a8cb63806888d4805b2143e07d6c3aba8a997af2f881896a4db454b9b9a91ccc151fa2 SHA512 ab017d6e971ed53ef6b3b97115b8b95bc9e58c4cdbf42921c54d6aa7e47b2c47d810e737a80290354059719497fa10fc3bca12ace4d3a2c6b0ced132431d3459
 MISC metadata.xml 331 BLAKE2B 9ea840b738070cd128c11432d058bd4e84157a5652abf6e8ca72d8f2d5772b51ff78e99507b3f436bbf02bb07782846aaeb6b6df319fad6090e0b359d14d7e92 SHA512 50695ed98a24108411fdabce74608e50b89e5ce198a221d0896e1eae27c6d954c592621de5b28b5071594fb555c047ed007fff1153c3d757a753cf2231229f58
diff --git a/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
deleted file mode 100644
index 5fc32b279a83..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.8.2.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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-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/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
-	dev-haskell/hsyaml:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/text-conversions:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/glob
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/doctemplates/doctemplates-0.9.ebuild b/dev-haskell/doctemplates/doctemplates-0.9.ebuild
deleted file mode 100644
index 88f81e5d48bc..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.9.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.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-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/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
-	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/text-conversions:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/glob
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
index 4673971bcc42..9240e74bd7cc 100644
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@@ -1,6 +1,4 @@
-DIST doctest-0.16.3.tar.gz 43261 BLAKE2B 981779f93d014b8340318b931f06449914a6d44bb935ced021cdf40e96ac6741369899b25a8d6bf5f2087ed81b7a5f539c14a0d68fb24a0a500354b019930530 SHA512 c5fa7c5c49bdc1bda86a259177538fa573627772dcfa18dcb19a5c905eceeb4a086705bf40ea6f330df5273584068ba154ed664a124f8ec704c9926b86564ba1
 DIST doctest-0.20.0.cabal 7121 BLAKE2B c9f87ca2f1a2250d042004ece7d6957683f487e2e87dca74e564792839019ce017ebdc19afa3742163cc1006177524ef130bc4ec701c3ac49e5a5918880af102 SHA512 08a3fcb4572b6c07266ae93505bc4a5ca0b52b03f1268dffcac291c5603babb9072503c7103a6b1f591235d26a52cdc66b86b2932f56b52d2beb06595510469a
 DIST doctest-0.20.0.tar.gz 43796 BLAKE2B 7fe8b54ea9be6983cc3ce8d4c340528df533e48eafcd4c36d1cc38813b1b17469f4702064205a05e356e41d3dcefa3ba8ad556596851970edf639a5e50104d4d SHA512 037866d709fdd371941132aea31d15c65cbfcad7832cec4fa98ed580b939930cc2ef87eb77e8bdbf77bee40088b673afe66d9021d6e227416ede25159f8d93fa
-EBUILD doctest-0.16.3.ebuild 1085 BLAKE2B cf81539800051147bf7a514493aedf602319191b46e91b96f3f4d81851f4675e9cdc73b2df1e14a537d90481ef220c82b6e5d6bc71362bbfa062af6d956a3f6f SHA512 105864196cbc94c9199202c5e032410b8196f15fa5e73abf37d930b32fba2fd7953e289cf391909c74c5957d3a6c3efe32d4c7a31af1b848e504cad6e15dcd9c
 EBUILD doctest-0.20.0.ebuild 1420 BLAKE2B 9f478cc6edfc85693dc818f3eae6ad868191cbd1f3dd910f768fad8809f58c9611e0d28432d01e8e5dfb4e1184783c6d45bc59ac3e5fada8fa8cd527c5dae3a3 SHA512 f4362808c49aed1347032096b5f19012785f24348eb207a1fc4639a752a7d266e2e35c92cf030200cedef0134f194d1fff98fbcdd4a4944ec251e54a48968d46
 MISC metadata.xml 623 BLAKE2B 6d2a70c8461de87ae732dea2f8087dacce237e700b69c5eb9bec1e2a945a30e006423b277d901335d3b100e0d4fee6ff3070279057fbcf2ee1497567f60f6a79 SHA512 a8e16b76970091341ea9b50341d74fe248f64134686f5d5cb04dc465567434ff506bcbabb22eab527bff5a2aa2ea437b029665179d63a8d9e8f60798ad2f2dca
diff --git a/dev-haskell/doctest/doctest-0.16.3.ebuild b/dev-haskell/doctest/doctest-0.16.3.ebuild
deleted file mode 100644
index 012b822c494f..000000000000
--- a/dev-haskell/doctest/doctest-0.16.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="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Upstream has no intention of fixing it:
-# https://github.com/sol/doctest/pull/135
-RESTRICT=test # module conflicts
-
-RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
-	>=dev-haskell/code-page-0.1:=[profile?]
-	>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
-	>=dev-haskell/syb-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.3.0
-		>=dev-haskell/hspec-core-2.3.0
-		dev-haskell/hunit
-		dev-haskell/mockery
-		>=dev-haskell/quickcheck-2.13.1
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/emojis/Manifest b/dev-haskell/emojis/Manifest
index 2cdb6eb82ecc..22df985398cd 100644
--- a/dev-haskell/emojis/Manifest
+++ b/dev-haskell/emojis/Manifest
@@ -1,5 +1,3 @@
 DIST emojis-0.1.2.tar.gz 49333 BLAKE2B c67e578cd356c2e7edc4f7880dc3235eff33dd98f773a24c4791442c4d0243b59cd775d8fb2bf4c53c6943434f340104183a99544d16a6d6c8f56c7d0d402dd3 SHA512 e34d1c1797f37e3cbe37f5f617496aa70310ca654c98069d393c10c5fcf56e336f35d06e018c859354ea54ae1c5fbbe4a24d484a5f59cceb5a9e3c25caf2a52d
-DIST emojis-0.1.tar.gz 36219 BLAKE2B d77008408436a37400f5a325bd3e80721226c5bf127266c96a5919dd0249d94827140285a02ecabeb6ceca273eec37e06aac86636da899b2806c7b8b825bd445 SHA512 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2
 EBUILD emojis-0.1.2.ebuild 622 BLAKE2B cae16abf416e4560b82a3dccd8b46e7126673e79da1367da16825b0ccbd12cc81c472d2ebc7a7cf57c9e5d849c26d526d3dc9399687a32d87891b84e7d44066c SHA512 363e39781f6c8606a5dac1ce10d1a41850dae41a6714c8e46067ab83916dd4f8a8e55d10597be552c44bfb5142ca9b6fbcd6ce711fd7998cbb1297c05b969540
-EBUILD emojis-0.1.ebuild 613 BLAKE2B 89085d543d9c7c4f57531c4f9ca2dd15d7dcd0e4045ee4e082518dfd6de65799972d735cec320cb144f1530aca1d7b111914127c55e35305b4b600f567dd9172 SHA512 d629a7e47533e8b6646737ab5025a3130625b4156c0c7669f3596f047f4c54504cd7a0dbd30ecd08325ac95aa590ae9997e796fc886d088ddae547bd18b97119
 MISC metadata.xml 748 BLAKE2B 7e029eca57755d56cfcfbf0c39c2a4a5b5f1ceddf19c2f666608ef07bef915a963aef023bfbcd2b08f356926acb4b5d0dd6e0dda686eff3d8cb7ca93b52bd416 SHA512 3d8c74235fa2ef5dbc1d7bf381a0d7f96fa8e1a594f0243f25b78c087e56f812e9274d8249d80ae53bd4c6e25cab3fbf2e2239efdda20ae94c17c3084a4c3881
diff --git a/dev-haskell/emojis/emojis-0.1.ebuild b/dev-haskell/emojis/emojis-0.1.ebuild
deleted file mode 100644
index 7b74ee4c2e43..000000000000
--- a/dev-haskell/emojis/emojis-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between emoji characters and their names"
-HOMEPAGE="https://github.com/jgm/emojis#readme"
-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-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-"
diff --git a/dev-haskell/foundation/Manifest b/dev-haskell/foundation/Manifest
index 1d676ee2ffa4..4213efb7cd3e 100644
--- a/dev-haskell/foundation/Manifest
+++ b/dev-haskell/foundation/Manifest
@@ -1,5 +1,3 @@
-DIST foundation-0.0.25.tar.gz 120472 BLAKE2B 2cff11363840b0b338b57d38438a13211e41a8e9bc6c359552dfb1854c9277c3228aac88b4a7930031fab75f78574cbe1cac6d5c87936f9b179e5c2277c00ff5 SHA512 7335795a1cdf2975d6e9471c5b469d99cc6d224d2da66838d830593a5abda73675920acb2dc823a6b92f2141dc2364c8fd5ad53d7e8aecd8df00e6998683be60
 DIST foundation-0.0.26.1.tar.gz 120487 BLAKE2B 9ded2f69712de5f3af7fd6a2457defaaf7643c8eee51ad27c863ba0f00a39d05c768a3ae03cb9b8401c63e545161f194237e6bd346e6e6e8858ac7d8a33c6cc1 SHA512 56285e445dbf58204fffb3824a2f6144c3ef8eeb1630a5f5e9a658bc216a9bbb4db6f215e1e9b11bb516a389e23a9fc3275242d060b42db6b82b6a449224988a
-EBUILD foundation-0.0.25.ebuild 1014 BLAKE2B 217be1b6cb7318f94badab77cf39a1d5f7a4abfc8ea584c847b426fee928a0f06d6ec3abe3ff848988eb4c1d342bdb8b476d5519b3307d5c714a516456ee858e SHA512 de632b91a9d3a5373067be73666facb43183eadf25a8c0a0a41804fd5ac1b6a5f2fcd1d79f723a546df0ffddc23b777d61c62e1879291223a7f1f5e7c2bf97bd
 EBUILD foundation-0.0.26.1.ebuild 1020 BLAKE2B 0b95f101b4f215f05ed2c2544d1ab377c68c79342e080033e740d0e9b19ab7d84df00cf984f3cf301346a883cdb66a5e600d9cf8460025a554f1e7868d3540e2 SHA512 b3945c20ed6891849eec9524a5fc1d4dd33b68825e4834a25d014b5aefa14b3b5b841c9180dcf9360ad9c6e9a02c64ed9697de5139718b24c69a2fc5fd27ce24
 MISC metadata.xml 1111 BLAKE2B 8333415ed28f72d9a8a68627532464d9c469a608a9cfa6f7d3d9f8d73e321ca19c8fcbe5c7dc33a86d9079c66f547566e4ce8607b68dc37c692c0db5831b83c1 SHA512 de2cf7f20b973f1835536bbaf40ab72aae7a63029f8ba6e35bc4987cc436530107cc58e8b51b4cfc5dd983fd524195e62166a96495e1a8fc1445fd4348522e55
diff --git a/dev-haskell/foundation/foundation-0.0.25.ebuild b/dev-haskell/foundation/foundation-0.0.25.ebuild
deleted file mode 100644
index 1f75b31ea271..000000000000
--- a/dev-haskell/foundation/foundation-0.0.25.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
-#hackport: flags: +doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Alternative prelude with batteries and no dependencies"
-HOMEPAGE="https://github.com/haskell-foundation/foundation"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RESTRICT="test" # fails to doctest
-
-RDEPEND="~dev-haskell/basement-0.0.11:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/basement
-		>=dev-haskell/doctest-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bench-all \
-		--flag=-bounds-check \
-		--flag=doctest \
-		$(cabal_flag experimental experimental) \
-		--flag=-linktest \
-		--flag=-minimal-deps
-}
diff --git a/dev-haskell/free/Manifest b/dev-haskell/free/Manifest
index 88c90719a23c..0f81cdf7c36a 100644
--- a/dev-haskell/free/Manifest
+++ b/dev-haskell/free/Manifest
@@ -1,5 +1,3 @@
-DIST free-5.1.3.tar.gz 64257 BLAKE2B 6e2b462c55e425622eb70d3013bb7194e6b126d0f176991cedd96d23f8d533448953273a979c7cb73036d84ab1f20a843fa7ce4b1d0f43548d052b2b57658a0f SHA512 09e18a487715872ac62ba434b71035f7de305078568e761a6c3c65c6c742c1850d110fbc8c7b462d49aba82ac4e841bd9a1011242a4ff27307c527434bc97d91
 DIST free-5.1.9.tar.gz 61606 BLAKE2B 0cf1e666f281c1610411a4f34a94cf1b887522db64d9957db36761ee596cc2d97c5bb7ebfa7c8ed40f42a5ab561d1fa8e2309843bf024e95cbef27a077ec02aa SHA512 925d9271adf5d16a48efaeebd65d54a9c5b4e042f1733382ee2269eee1f62d4b184e54209b384bdd145b76b093d7866f0115a56156c73f85bacb04cb7b265ec0
-EBUILD free-5.1.3.ebuild 1385 BLAKE2B 5187736e3e0bd55c1151434100f7084056071c7a975f0dff50f9a81e5ccac4ec14a455780824d585ee38caffa746f1557e0a4aadf5ab8d481bb1a83fc399c31f SHA512 823d92b562d90c8227609e147458e68beb498963505968626cdd4c3ca40615803a9b13e8334c4a4c7908e7a33d2f4cec859d602a05fd0041c1a97bb082d7da17
 EBUILD free-5.1.9.ebuild 1146 BLAKE2B f48dd0e74dfcdc6367b30eb2611814f170229a3085b41307e185c2413edbd6923ed879a60667c4b594bae760b55ec196167e0c4f043cdfa6368b9d79465b42e0 SHA512 e70308c6e06cc1cd8f397b4aabb7e183c35c301ca404637ecaafdaf031faf6ca205bdf09ee8834d528e41b806784d7dc64058a3e1b611e921dc09701317ad408
 MISC metadata.xml 326 BLAKE2B 1e18a1ca3423e30d33966dceaddfd8623f081ed9e3dc4cafe3799e2a8bd14427ae15b52eb5ee8e25e300c5157a0515f82d0ae49f4f437f3862de65baa7a4de39 SHA512 4506949fd45be279f4bdd5385361aa941a5cb90bf4de205c617505c6296164d2b4b61dae51f07b1c380f609d1406e5f47e24ffdba9b367a38fcd72983edaf7b2
diff --git a/dev-haskell/free/free-5.1.3.ebuild b/dev-haskell/free/free-5.1.3.ebuild
deleted file mode 100644
index 3bc8d782882f..000000000000
--- a/dev-haskell/free/free-5.1.3.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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.0.1.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-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index 28ec43d86832..38807bfba835 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1,8 +1,4 @@
 DIST haddock-library-1.10.0-rev3.cabal 4178 BLAKE2B 72b7e3424ed6e7974c9549f77d924bbccf6caba55bc91ef2ce13fa0c48a1eee4dd4f3a74286b64cb3b77f60427736fc4674de10b2390bfb28145cba18ec67e2d SHA512 7b9d61d23725920f4a303be38800a5679e317b8633307b028bd8168ddce5a0cc0e42d149b3b595f5e2b6afd062e87a8df877c73cea9182d21fd0292696d1e860
 DIST haddock-library-1.10.0.tar.gz 32427 BLAKE2B 7c1b26edca2a40a43622c376cd8c064c6dd333d85db37e38a26b91ff1d61004f96e1ed330c54987b5891157f560f46a56e88a730a82b2561f430014fc7aed4f0 SHA512 dac536a2b8e2764de1a1b1a16fc328e15455656c2992fb3b3bccdeae2bb6ac81fe94e164aa2a70cff7cea3b97347b8510aadb5fa1c0564bb2429947f0aace0d1
-DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed SHA512 f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b
-DIST haddock-library-1.9.0.tar.gz 31465 BLAKE2B 785935a7f80831c000db796ed9d0071309de86d36c68d5677b6c948aa914c09a00582af500a25d2d751d96ef6ebb30696fba51a2ed84fa1b4850e5795ae5f55d SHA512 ec41df15a849a59fc41a443ce233dfa6293f0d201ed1847bd8a7732bc0e2138bab2305c127bd60f51919d8eeeb6808eec7a0add38edacd059956d852167477b5
 EBUILD haddock-library-1.10.0.ebuild 1766 BLAKE2B 2d2df3f30141799844db02e0cb11487f3f69523dfd394b274ebce8bf43ca22a2cae7153c7d36482b68a8a3b26b78f90d379aa8765567292d5cb876b31aa4ef11 SHA512 c1cd11e05ce940c1fb69325f8621ee8003b5a1a1d435be1fcbb3d02fc16ddc77f30e337f6c6384c2ed132e4d49d7053591668c64efbad71e511b0d6e6ad73195
-EBUILD haddock-library-1.8.0.ebuild 1282 BLAKE2B c0a9d81b4089b42f77252d84dc024874df159a4c70a7b00a71a33a731dc2ca167eb327cb2e0ce2533c3d1e4f8ed9fde445a39ca686a8d8ac66b0213ffc7c6a13 SHA512 d01f69bf72370bb80127f4ba2a78ab8ddfd20056d3ca5dd15f35e5ce1bbd5dd2e7f80528fb52a8b352de5c50fc13cbe666f02a3634f8e5c47512352af4d07e10
-EBUILD haddock-library-1.9.0.ebuild 1350 BLAKE2B 803ede5107f1c85c2113b78c5f7229726bab76665464dd33ce55716439071870eac145d80ca8789250afe365d09d6633154fb5cf6bae9646a288841497e363fc SHA512 41889bf7c0f9db230a7075512378b1c2567d05a1dd933f969011858bb3d6fb404e34870b52ca3d489e6a2a7748bc4afd3f5eedcfc8841f8fd0297044f5d98182
 MISC metadata.xml 650 BLAKE2B 37a104903d704fbe3acdf40bc12511625e1588afd3e4683e87aa03af4af462a7f2cd341ad2bc2cec410483a1020dcdd05b505164181959c741fbc6b970c60967 SHA512 159479dc9f468297b4c6f79763590d28d38a6216d008da9a0b48208896775bdbe0089de431d9f63eeea716216254729fe5ed6be545d4d52b606756e40ab5ebe6
diff --git a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
deleted file mode 100644
index 343d2a617f86..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
+++ /dev/null
@@ -1,40 +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.4.9999
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2"
-# 	test? ( >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
-# 		>=dev-haskell/optparse-applicative-0.15 <dev-haskell/optparse-applicative-0.16
-# 		>=dev-haskell/tree-diff-0.1 <dev-haskell/tree-diff-0.2
-# 		>=dev-haskell/base-compat-0.9.3 <dev-haskell/base-compat-0.12
-# 		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 )
-# "
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3' \
-		'base-compat           ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3'
-}
diff --git a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
deleted file mode 100644
index 59c2d563d118..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
+++ /dev/null
@@ -1,43 +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
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-	test? ( >=dev-haskell/hspec-2.4.4
-		>=dev-haskell/optparse-applicative-0.15
-		>=dev-haskell/tree-diff-0.1
-		>=dev-haskell/base-compat-0.9.3
-		>=dev-haskell/quickcheck-2.11 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat  >= 0.9.3' \
-		'hspec                          >= 2.4.4    && < 2.8' 'hspec                          >= 2.4.4' \
-		'optparse-applicative  ^>= 0.15' 'optparse-applicative  >= 0.15' \
-		'QuickCheck   ^>= 2.11  || ^>= 2.13.2' 'QuickCheck   >= 2.11' \
-		'tree-diff             ^>= 0.1' 'tree-diff             >= 0.1'
-}
diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest
index 7e0dc3571b8c..e6328ed200a0 100644
--- a/dev-haskell/haskell-lexer/Manifest
+++ b/dev-haskell/haskell-lexer/Manifest
@@ -1,5 +1,3 @@
-DIST haskell-lexer-1.0.2.tar.gz 12202 BLAKE2B d4171347eac2f9ea58368dfa76e6e1a82fbaba8c9cd0ada13497579e3e9dff25675d461cbde3fac2c90a0f9d9733a3c6bd3a49797f9cc5f6fbb1d14d2b593643 SHA512 7f5942bf159936488894649e4b5cd7b33b6cf018685299b9cfc2f807ba1b08061deae287e613c88345842183bfb6f177b8538d2dc01badb0c94fc259f110255f
 DIST haskell-lexer-1.1.tar.gz 14368 BLAKE2B e06a1399c45511c8f67516fc7abba2eecbdb22a39f6278ec17418ae43a4f2c74bd1e47053f55b06bf45697f9760b2efc3787429674b08554fd2aa51a3203e673 SHA512 7a93d135d8994941ac73feba6b22a82e05b3c124d2aaefeb33851c28d2268714ebf5fac6abea9544097b7afc2cb3945caed600cc08f9867bc819b96fe467b28f
-EBUILD haskell-lexer-1.0.2.ebuild 532 BLAKE2B 8982ab92c2ced21f21982694647de1aee2edcd35a7b35650ddb352d9493c3047ff728e9ef9d6857eb5aa176c22599b69117e1bccd92caca4f51679ced6c30b70 SHA512 5d9a2acca362d8a8db0d54fe4302c497dbd6c6c6da4b6332f4ff49e7237230ea4c34703e1a933146dfdc3573082da24f129b5a600a29148ee88a5f8f269df5db
 EBUILD haskell-lexer-1.1.ebuild 536 BLAKE2B db93b5755ae1b2c91c9a8d10d8731e2cede884a72789d55f006b2d39582c909a18283ef9e3615b71badc97f9691658b5d22b3db5391074967a9ec8032e70ba88 SHA512 2e6768edcae878ec038512f16179e9b4de9ee4ec166a262214c79cfbbfe5072911f9fbfb1eef09ed55f437b399731de3cd013e266881f6cf162f61742a00fca7
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
deleted file mode 100644
index d4c2c7acfd7f..000000000000
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
+++ /dev/null
@@ -1,24 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fully compliant Haskell 98 lexer"
-HOMEPAGE="https://github.com/yav/haskell-lexer"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index d016d3c2c481..7cac35ffd3e4 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,5 +1,3 @@
-DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203 SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
 DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
-EBUILD haskell-src-exts-1.17.1.ebuild 1077 BLAKE2B 53d381b8e438fa91f8166e5f916a777c1433da7c619da67cfc60bd286fea4c7ec95d63234672ca977c442aac0b1331926d7231d7fb55118581f36aa26c5b807d SHA512 498d2c05878201e0cce8ff10d4ca652269787f2c1af1a88defc1728fe689b5baaa49af73d4d03ac7edfaebca7dc005654ea9223b5a79487e7222e0b33c04fd9d
 EBUILD haskell-src-exts-1.21.1.ebuild 1021 BLAKE2B 27d77b94e881299280118beba5e64cee0ccbd3d605afa380261456fd3ffea7d97c0e502f49aeab0ce5d966e521a939403348cc35854d974ba79f61085f3f9e46 SHA512 f41f15ca25cb0c4f9f3d20720940dabda2f0b4589f5db632c9906279b262270f27e71e447d89795a03a0ee1407128e2dd7e3fdafad2e14d7f32e2b016a63ac7d
 MISC metadata.xml 779 BLAKE2B 2b013888d9598a0d62f1d56a6ddce956ae645c7f8fe518a04a63a3aef1816415666d565b2cca5b1f48aca5a3a2ae04990956e68083597c6f48319e1473c5bddb SHA512 da393ad717c05f7a54e767035c0520a55d8f709eefd153b045151ed4cc10ab0f808d2fd566e44ac93a7d3ca4b15bce3e0791f70358605aea878f66f972742f2f
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
deleted file mode 100644
index cc8b39436970..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ /dev/null
@@ -1,48 +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.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # very slow
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( dev-haskell/mtl
-		dev-haskell/pretty-show
-		>=dev-haskell/smallcheck-1.0
-		dev-haskell/syb
-		>=dev-haskell/tasty-0.3
-		>=dev-haskell/tasty-golden-2.2.2
-		dev-haskell/tasty-smallcheck )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest
index c65a5c3bc108..7f843e5b080b 100644
--- a/dev-haskell/hedgehog/Manifest
+++ b/dev-haskell/hedgehog/Manifest
@@ -1,6 +1,4 @@
-DIST hedgehog-1.0.4.tar.gz 68959 BLAKE2B db9b5d2202d1a27fd27703f45083ac3b1e6c26505e4ead2c26bc79f5bd42f9523f2c11299cfa42b095467e289a5c80d2b75cf628828af4b702ad22195f2b1457 SHA512 71eb946550c0189e598d2a4205547c007cc4fd101e1cfab38f79535e7c158dfa3b43dec6dde2331d5fe9cb5b0d4c6212f51b820ec146e47ecd9823a99f0f8133
 DIST hedgehog-1.0.5.cabal 4533 BLAKE2B bca8b965bc8e6d78c0eb72ff1ad555719cc260a8744d6e52dbad8b5f6dc61cb4dcc156c8bed04e0a5eb67bfeceaf0ad23acc1c9ac2332f3d5d2ade1520e130fd SHA512 250275ecf38fb0127350539a476cf84a2db8986ef782e0be3cd321f117a003e67c5454ee7ec89a05fadad872bb6dbc4df44b8bf9a661dfb41bae10bbd24fdff2
 DIST hedgehog-1.0.5.tar.gz 69389 BLAKE2B c3349fba40b43fbc8079fad9e1725db49bb73b2fb2c4d45fb397ec03ef9b003a49ce1a36465d7b989109b3cafec72200d2784a99ecee9e33f64534c97f8c78ca SHA512 03a1bd64451ce90ce7bac67e9f558a97b33cb2f7eeec7885c76558f34018eb794f82344563c6b511094e9cf610a6c0f4c0a229455e57df8729fc093ec212dd98
-EBUILD hedgehog-1.0.4.ebuild 1905 BLAKE2B 7bd39a3a986fadb18f88dcce8882e1a47915e21de0f58a8d7198a3cb4407215f93fda1d440aaff8c40af34d20bd0892d193a7a3d9e48ed1cbbf8405c266bb9a8 SHA512 264ce5a3948bd5c845663f8f23e6c9be70d7130e1c44c1f5896cb2bbcfb6eabcad8355c2ec91cdf8d75082be729b8ab40550beaa267ebb2125ed0f98ac6340ad
 EBUILD hedgehog-1.0.5.ebuild 2175 BLAKE2B 1891fd61d6034f13ec19ae15ecad392cf33b8075eeb76aa1290ebf900a3829eb03c3358c7dc0fc37c09af0aece8c33dfbccde359a1ae46e80ed2c54e17edc356 SHA512 7a738f6c662fabe28d1e461f1a622cdfbc7d5c6e55c34082c891686908fc1a1f42748cfba2fd783430e1c8d79d8a61db1c3242f1b547fc171d20a5c140a4291f
 MISC metadata.xml 613 BLAKE2B 114f26defce62e04cdae5b75c431d771cdde0ec89bf239fdc60d49595c41ccd9f672e75758b07b3acbf69e26bd29e6e6763201f390e98ddbe14d1ea4e11d3cb1 SHA512 920016a7b208a0c5cb21c49231357c6a4a281d15296b8e1b0363fb032a41a0374b4c21c67a32cda6d3efbcc725cd0e10db3b447517391b9c36a77048d1da7b4d
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild
deleted file mode 100644
index 2b09e994ae4d..000000000000
--- a/dev-haskell/hedgehog/hedgehog-1.0.4.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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Release with confidence"
-HOMEPAGE="https://hedgehog.qa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
-	>=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?]
-	>=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?]
-	>=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?]
-	>=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
-	>=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	>=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?]
-	>=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/hslua-classes/Manifest b/dev-haskell/hslua-classes/Manifest
index c8bb3f214f22..b4e07d69adf2 100644
--- a/dev-haskell/hslua-classes/Manifest
+++ b/dev-haskell/hslua-classes/Manifest
@@ -1,5 +1,3 @@
-DIST hslua-classes-2.1.0.tar.gz 11581 BLAKE2B 4327d4763d5b19c8b4345b994eee62cbc99c7f54f7645bcc92f97d0651ef80828c1454aed4c33b1be7d3c5cfe36c42fcdf7b425812aff2826596be642b4751a3 SHA512 1f67d6b75891f5dada8928afdfb51cc0e293ed7091f3fb6b050a4d4800889130f412002abbf3c75360381c5c144d16758be9b6ef6d736939a37e5586ea96bd8e
 DIST hslua-classes-2.2.0.tar.gz 11614 BLAKE2B 4fddbdd4c130562e961c627ae6a0201362036df846f18b03293d237a9b658157d8e607b5cf840ad793724dfde308e240c299a3633d185e75a40b9e9dbedf0852 SHA512 21d9da7fca86123cf1f6ac339b2453393bd97c052eb9b5ab75bf06a56fc0ff81593e30c88082aab5eb767816c479e975622b01f78e3df13ed476710d424f48c7
-EBUILD hslua-classes-2.1.0.ebuild 1095 BLAKE2B 2ef9c3cdabc8df7c69019de969e3db392d1f66ea5d318960fad2fe05ff671f05c167b8735267fdfdce666b3637e0b28e64438596a887920773ccb08285ae2d4e SHA512 1e615f8e0d2f6a551289b1ed56f05b7487f3a384f0b6205c7810d06680379a517ceaea1369e51a92a482966096aa6936988ae5f7103192757a1e7eb36c59a03e
 EBUILD hslua-classes-2.2.0.ebuild 942 BLAKE2B 98736d7f85a5aaea07c46f603ac84fda28b5cbbbf9f7b6f4b52954f5ec09d72487633140e4260f90dc0cbc7baaf588e2dcf92050a5a61acd665f44bdf532afb1 SHA512 6a55cafee2cd6e678ca2eeab42ed0e380053ad7d8acb85234acab7e655276e3bb7375f8be4c589683939f0ca577ff791a8e6ee66a30ce5a7d8a5dd8ddd19c2f7
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua-classes/hslua-classes-2.1.0.ebuild b/dev-haskell/hslua-classes/hslua-classes-2.1.0.ebuild
deleted file mode 100644
index 835873acb47e..000000000000
--- a/dev-haskell/hslua-classes/hslua-classes-2.1.0.ebuild
+++ /dev/null
@@ -1,34 +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.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for HsLua"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?]
-	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
-	>=dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.2.0.0
-	test? ( >=dev-haskell/lua-arbitrary-1.0
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-hslua-1.0
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/hslua-core/Manifest b/dev-haskell/hslua-core/Manifest
index 638595c918c8..1653cff7ebdd 100644
--- a/dev-haskell/hslua-core/Manifest
+++ b/dev-haskell/hslua-core/Manifest
@@ -1,5 +1,3 @@
-DIST hslua-core-2.1.0.tar.gz 36047 BLAKE2B df175f92df38d4b7ab4810eabef30c9f89479f905fd586cc85c124ef19896dca0532938012c7c55186cfad2d0e057f632f75a967420c2fdc22c57816731dd2f1 SHA512 7a92937f129125b58c0534d2c2b3b2f1798d6a24326ae6a6ef97d93630d9fb53604ead4d9bce23d1f0d3cb7fca4f716284619b651ee3bbdab71619edb30249c0
 DIST hslua-core-2.2.0.tar.gz 36808 BLAKE2B 02cbb94ea562fbaac9c2eb9445150f6f79a345ab15b2062aa7900d18c671ad0104a0ad3abe6603a38ddb40a9fa59cd13f4892d73c7dba4baff5727a9211fa503 SHA512 cb2f8b76b44432698624aac3d425be7a0c068bec1d41cd8a13b75854ed15fc614de5a0aee46c1092ef22b0e6b706a931188879d97354c01c37aa47a334baf5f3
-EBUILD hslua-core-2.1.0.ebuild 1048 BLAKE2B 184d44143dab4019e788bfc32b2b61919e908cbc069160b2d75d67c92c62ede973a7c60b7718b21d6064236c3e57806516742cd4ace6424d4cdd871732d37dad SHA512 759835495a8e1871e038b5f6d49330ae0295927146d015eaf38eb2877256eb9ffba18df9a5f5de1a3af7ebcdaa3db3c2e007763765aa45cca3100395c74baf95
 EBUILD hslua-core-2.2.0.ebuild 827 BLAKE2B e7e61b863cf190d8b737c8253e3a59e50712c36c2a083d795513711c42d951433d3a3af5adb71a63f8b21cd1254da1fac1529bac7524d9aa1d5b5090fb04f61c SHA512 a75a7f1812080034ab262a65bddc5312129e88da8f8bfbc5379f9c9e0c6013be9f569cd8c5d51fa65c4366a00580e2b56902c149f6496a39bb5e423ed68dae72
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua-core/hslua-core-2.1.0.ebuild b/dev-haskell/hslua-core/hslua-core-2.1.0.ebuild
deleted file mode 100644
index 53071a64e051..000000000000
--- a/dev-haskell/hslua-core/hslua-core-2.1.0.ebuild
+++ /dev/null
@@ -1,33 +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.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Lua, an embeddable scripting language"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.2:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
-	>=dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.2.0.0
-	test? ( >=dev-haskell/lua-arbitrary-1.0
-		>=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 )
-"
diff --git a/dev-haskell/hslua-marshalling/Manifest b/dev-haskell/hslua-marshalling/Manifest
index d873259f6116..fded42ddd408 100644
--- a/dev-haskell/hslua-marshalling/Manifest
+++ b/dev-haskell/hslua-marshalling/Manifest
@@ -1,5 +1,3 @@
-DIST hslua-marshalling-2.1.0.tar.gz 16393 BLAKE2B 25a7bf9958b128a38ccd4f5cf9acfb7b9db47b8996e68874c2772799b65262d3ee63608e9e24a8c33b652bd027da756c5e00f4818535b15d25a5af249935d5d2 SHA512 58a0399c339751c94ec3582960396311904d07df188d4fd2e3e18d35c30c01aa2a90eeb7293f5c8becd6cc68601589f69d9e114af1a5301465049b5c406dfd56
 DIST hslua-marshalling-2.2.0.tar.gz 16488 BLAKE2B f5aa47ecb431c5ea2308e16f0e4568fe7ba979e4f08901fd85c1c4c7e516c9b1a59e42f58a93db6dc113646e4ab826c13ed0e669972ea8980aabe9ad41828244 SHA512 80436b67fa73a970bcbcf4b8684187ec81590030c0cd38b4feb28e9a719c32f2b0f3cd1288b03f19b130112037e47ccb9585015d7f806ce6dcfe3b12abb7bd51
-EBUILD hslua-marshalling-2.1.0.ebuild 1000 BLAKE2B e685e6bd55a1618aa3f31dbe1675f6559b70b9e323f72de579b31b58d4720c8ef2d62c06222f9e159cb9c6f3c31018d9df0d9b04efcba6dc0a266f66f0d60df8 SHA512 9218ae80c3b0faedc33b2ca61c713e1e4332f22d183864086ec68163ecd93d59d477d7c3dcff09a72d241e2da89d15a14a46ccda0fbdc1c423a609fa35394a1a
 EBUILD hslua-marshalling-2.2.0.ebuild 862 BLAKE2B e088929a5b1edcd52de8c04866d061ddcf9bef9df3c800f881b91189783571d4aaf4a842f0705bff038fa8508ca3fb09c660f9a337b67dfba1d31ca29ceed9a7 SHA512 32cf670bd8b2ad565e353a6f1c6b195464a303b2096ba102ac8375b8bacc3478865fa1a27b9d0a97d859a1a9933568d89d8cc218fab0f3913417d9d22d6514ee
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua-marshalling/hslua-marshalling-2.1.0.ebuild b/dev-haskell/hslua-marshalling/hslua-marshalling-2.1.0.ebuild
deleted file mode 100644
index 8255e17c5d7c..000000000000
--- a/dev-haskell/hslua-marshalling/hslua-marshalling-2.1.0.ebuild
+++ /dev/null
@@ -1,33 +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.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Marshalling of values between Haskell and Lua"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( >=dev-haskell/lua-arbitrary-1.0
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.11
-		dev-haskell/tasty-hslua
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/hslua-objectorientation/Manifest b/dev-haskell/hslua-objectorientation/Manifest
index 60e04cb4fcb5..40b715a8fbff 100644
--- a/dev-haskell/hslua-objectorientation/Manifest
+++ b/dev-haskell/hslua-objectorientation/Manifest
@@ -1,5 +1,3 @@
-DIST hslua-objectorientation-2.1.0.tar.gz 15217 BLAKE2B 9505b1a40790518a9b7362636d0715ff53abfede550d606c1667b4b4812be8be55b2ee2c4d2510a5366fd89dfe0c46c89b81912a4af159b619808791b4418d87 SHA512 f7eac02ac6d1e6c18874d6ca5bdd1466ae670b264005b24e3dfccc31b8844dce4f17a9a7c5523ce332a4477bb67d2b520f97ff414352d68f1e11f59dc0cecf45
 DIST hslua-objectorientation-2.2.0.tar.gz 15240 BLAKE2B 741298dd4d47b5b0bc4da565f9bae1004f13fccb4cb617ad1603821df884604a12f481626af9314f84f781a48bff836367d7fb71ce0ca5e2d3d8058c5899b394 SHA512 c40f0526264db229093f39deb9e77a44e575e6ebf97f257ff063b61279cd47aeecda4204db2ebc686b3e8ac467e2a0f4887608a54386f4afca2d47b469ee6107
-EBUILD hslua-objectorientation-2.1.0.ebuild 1175 BLAKE2B 434e28d3778b8320e23ea0dbbaf57430bbca9885ffc37743a08474e4b4d1fb3ba363a959ad979d2e2617a2f1852681993ba30e2a2163ab18bbbe553b6d165fa5 SHA512 313920b78300420a398a1cf1a96d56535a6573a9e3714b9a74df13f1c22fd299d8543096593b5931423fafe0aa922c6bd256d37a5744d3ea07800e0771cbb19f
 EBUILD hslua-objectorientation-2.2.0.ebuild 954 BLAKE2B 70600968f82ff14cedec9dff8357b504825e2cf95110ac03496e8bea5db1e43ac41afddf77d1030a6f35be11f33c96c9de438c25a83dcb91b4b91da1ccca3064 SHA512 7c93824f52b404701b8f66a294f67e47630ebe13507e9ccfee9a0852a015aec87b6ebfe3a195fcb1e702f1a66b140a5430180e0d2bd69e4f220c7e356aa91e6d
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.1.0.ebuild b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.1.0.ebuild
deleted file mode 100644
index cd06e87a53ed..000000000000
--- a/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +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.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Object orientation tools for HsLua"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?]
-	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
-	>=dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.2.0.0
-	test? ( >=dev-haskell/lua-arbitrary-1.0
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-hslua-1.0
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/hslua-packaging/Manifest b/dev-haskell/hslua-packaging/Manifest
index 36847295cadb..bfbfff7a257e 100644
--- a/dev-haskell/hslua-packaging/Manifest
+++ b/dev-haskell/hslua-packaging/Manifest
@@ -1,5 +1,3 @@
-DIST hslua-packaging-2.1.0.tar.gz 15904 BLAKE2B d876e959da64132355535f9e4eedac5095a84b41552102b88021094cc4b3367804df6e9c027648659b77464e9eeee90846c94551e8db034a299803747ecabdcb SHA512 71e4efaa5047681423bc7933fbcd7427e77a892e089d0597d03af9655e116ed5dde733147cc0740c3d5df2f69c3d001fb1ba816e963c71ca2686808f07b989cf
 DIST hslua-packaging-2.2.0.tar.gz 15932 BLAKE2B 724a28d8c7414766555968bca08cd6007e6637f8c4183da9524699b70b198a82f8cb4a6430af9ac6a0d26d1cf5abe25bee5153e8e8e09d058153f17a93298035 SHA512 f2dedc0674dd569f76e753edb3f20fe395fd6af082162b648d36ecb2eb0f5adaf5ab7354b809fa995c25cd17f30b7035d40c0ed9b0fb4fc78332f430cd152685
-EBUILD hslua-packaging-2.1.0.ebuild 1046 BLAKE2B 8ed09f5eaeee5ee7a263b058bdfee3780b6b86c706a3e3689e86fd366dc88f85525229de3030bf34b39a9d512ad9e5522a359e71aa4e41585dc51f29948be75f SHA512 ebab4945dc907dd85672d0a0496b3ed21127b027726e47d10fabca6e7912552f23cb6a82e958395775a9375d540a2a482ea8dc2bf8e1ad3c43b5477543ca749a
 EBUILD hslua-packaging-2.2.0.ebuild 908 BLAKE2B 03674dfa7391cfb49f39d34d4386cb025458fecfd3f484be127be9181f72e5190b84cc1590d0594032ba276d88521319b786258e4db6cd7a0d7c915ffcd5be88 SHA512 7bcd708a19a89d790840633fb45b78d136987f585418abe2c956f2d176820b50f21a4e56c14174fdcb38c0d8883a515d1813fe730597b73a468f45ca4127c125
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua-packaging/hslua-packaging-2.1.0.ebuild b/dev-haskell/hslua-packaging/hslua-packaging-2.1.0.ebuild
deleted file mode 100644
index bc362bc398f8..000000000000
--- a/dev-haskell/hslua-packaging/hslua-packaging-2.1.0.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
-
-# ebuild generated by hackport 0.7.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities to build Lua modules"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?]
-	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?]
-	>=dev-haskell/hslua-objectorientation-2.1:=[profile?] <dev-haskell/hslua-objectorientation-2.2:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( >=dev-haskell/tasty-0.11
-		dev-haskell/tasty-hslua
-		>=dev-haskell/tasty-hunit-0.9 )
-"
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index d6ed0be5cb4e..7d85e009395c 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,5 +1,3 @@
-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-2.1.0.ebuild 1675 BLAKE2B 44e9d52d5c74b8695a0cdfc232f8527488d52ed374a5cf5fcd4f347baf2ffc92fc7acb1ddadce5d56d8090f285af1e29eed6c41b8d69167d9e5a9d6814c4acde SHA512 fea7eb4ad8757d3b9cff601f48eb68f781a4029cf2a1590e161e001db02b70e2a31f15860801289d6ddc43d21b549a1bfbd9032bb248f7d0fd0d6de32d9c8b7a
 EBUILD hslua-2.2.0.ebuild 1668 BLAKE2B eed8948adc91b743f1c22e9f32c51d2018f9f1b83b7fdcba472d37eee2627b464e8527c9f49af408590c8ca64161960ff14525384d9e859c856caccc0c779e35 SHA512 0e2a2699366670b5e6f9c22338ccd9191dc6c40efd9265a1b8b32c376afd8cbedced02d25148dcb41be8ad4ee7f34e7abf2e590636c75af9081879740c9af4c0
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hslua/hslua-2.1.0.ebuild b/dev-haskell/hslua/hslua-2.1.0.ebuild
deleted file mode 100644
index 03079ce68233..000000000000
--- a/dev-haskell/hslua/hslua-2.1.0.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.7.1.1.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.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/hslua-classes-2.1:=[profile?] <dev-haskell/hslua-classes-2.2:=[profile?]
-	>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?]
-	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?]
-	>=dev-haskell/hslua-objectorientation-2.1:=[profile?] <dev-haskell/hslua-objectorientation-2.2:=[profile?]
-	>=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.2:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
-	>=dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.2.0.0
-	test? ( >=dev-haskell/tasty-0.11
-		dev-haskell/tasty-hslua
-		>=dev-haskell/tasty-hunit-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allow-unsafe-gc \
-		--flag=-apicheck \
-		--flag=-export-dynamic \
-		--flag=-lua501 \
-		--flag=-lua502 \
-		--flag=-lua_32bits \
-		--flag=-pkg-config \
-		--flag=-system-lua
-}
diff --git a/dev-haskell/hspec-core/Manifest b/dev-haskell/hspec-core/Manifest
index 62da04fc1264..73b86005ba37 100644
--- a/dev-haskell/hspec-core/Manifest
+++ b/dev-haskell/hspec-core/Manifest
@@ -1,5 +1,3 @@
-DIST hspec-core-2.7.1.tar.gz 58835 BLAKE2B b6fa09a26c6adaf25f99d6fc3b1df80ea5407f6e8963c16473b4c98ccff694457131a9c7c35e5250beee47a03fb1c695d74f33be335623340a2d729b6221cdff SHA512 5ab0925566c3b6f05480bd4e464ca32e0a212b4b4ff439d02b3df5b75b23b45ca0c63bab8398ebeeedce0ba30bb653b1ea85df2b7e6e3a058cb4413dc1c53ee2
 DIST hspec-core-2.9.4.tar.gz 79521 BLAKE2B c403787898de2296506cd2906641c2d91f3a4cee4cdab69e7e63e2ebab26a5729b37e938001992cccc76930ad5d4e39c0f204064ea542a2ca979b58acce77fdd SHA512 55859f3a6db6ca855a560b7b16f001784a81f6a70061374d58841fe0d6bdb99e98b522df03677ea132222ad6c96b3fed8d87aedb96dfde5326b7e6fde238e387
-EBUILD hspec-core-2.7.1.ebuild 1152 BLAKE2B 2943ede4842adeb2f19f73784794ce12adf08751c4d9629d6a112108a097f0e5939f5665aaa1cd849ddbb5ae74a38a5e1593ff4c782ed138d0dd1ecabf200ce4 SHA512 94cb50226a9a082a7d14ded33d9ee904b7cdc4f02461da89f5c52827f19239c14c965920300b9b442100b3d6a8944263111cb524505c70adcdab90450b5f1629
 EBUILD hspec-core-2.9.4.ebuild 1209 BLAKE2B bec4efe1e6af8271ccf45235c13827cf67b23bc8c18545e9b2011481a20f8b79c1176b386d839bdbb7db0cbc80d923ffbf134b1a88f03a69a78ed3326a813c98 SHA512 c7441454d3c60bb493eaafd62706d63b7e0a157bd074f71b712e72a408706e3cb0ad3684fc8058f9f99378432d6597789f5f865d354cc60907552f506e197dc7
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild b/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild
deleted file mode 100644
index d93f992ae506..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.7.1.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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	dev-haskell/call-stack:=[profile?]
-	>=dev-haskell/clock-0.7.1:=[profile?]
-	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
-	>=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?]
-	>=dev-haskell/quickcheck-2.13.1:2=[profile?]
-	>=dev-haskell/quickcheck-io-0.2.0:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-meta-2.3.2
-		>=dev-haskell/silently-1.2.4
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/hspec-discover/Manifest b/dev-haskell/hspec-discover/Manifest
index 3da1e0cb1216..78ca5748cd91 100644
--- a/dev-haskell/hspec-discover/Manifest
+++ b/dev-haskell/hspec-discover/Manifest
@@ -1,5 +1,3 @@
-DIST hspec-discover-2.7.1.tar.gz 6755 BLAKE2B 009f49090de3d79c7776e8b9b22eb975f276081c39980b49e157dfd50c97f3253140b2d66c8f392f53f83976d01d4302d78afc1ec95df45cb0a61d4c7a741234 SHA512 b07e7be5bd81f2e116b63f27e307ac628b6d678cc24dfb519bed7dcc1c27f772ff5d4a18c801474a425d4450337e809b9563b4ee1ca397830dfc7f9a92d7359f
 DIST hspec-discover-2.9.4.tar.gz 6829 BLAKE2B c0f3a762db63f6d50edf2af0d240c5a9ccff7092ba0f440a342c809b4cc7c7c7e9fee95ca92d426baa6956f4e459ea8da04f2d7bb2545d4ca948395d38c75cff SHA512 0c76cfbe56ee67ab14040c7252a2f1ccecf8230868435d64c9015c472c85557921f1ca30e12df6f3097866b5b791e86d06026ef5fa5e998c354f3fa26c95e5ea
-EBUILD hspec-discover-2.7.1.ebuild 614 BLAKE2B b159f52dfbb34bf9099090c6f0b78fc3f16066ae008e599179b25dd8c395bd410ac2199918e054a680fd27cb44a8ec23e478dc57430a6c2b033a524c221b25f6 SHA512 65698fc1645c255271e117af7b86db209eb4da0ea7b98683e8426be3c0846548f317bc047601e30c34283a106b0c05bdf65597c42a3344166b7fa528af919f5b
 EBUILD hspec-discover-2.9.4.ebuild 644 BLAKE2B 6c472c3d21bde0539a3800e01b1e7ce3477f2766c68a715c0a6621ab19e89ffe71970fb9169a52d4fcd1239c01d880125efda18ece8ee7ad60f403cf97fb9c0e SHA512 47b8bf46e2efe1b9e29a63f29e5ba5a0931204e41877b08147682c1cc33c9691cffcc19394809b5a2b4fe3ee7b02d281bf4bfa78fb0e256cfca52f345a93a74f
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
deleted file mode 100644
index f1dbd5de681f..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
+++ /dev/null
@@ -1,26 +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="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( >=dev-haskell/hspec-meta-2.3.2
-		>=dev-haskell/quickcheck-2.7 )
-"
diff --git a/dev-haskell/hspec-meta/Manifest b/dev-haskell/hspec-meta/Manifest
index 49660bc7dcb1..0e832dd8a27d 100644
--- a/dev-haskell/hspec-meta/Manifest
+++ b/dev-haskell/hspec-meta/Manifest
@@ -1,5 +1,3 @@
-DIST hspec-meta-2.6.0.tar.gz 49275 BLAKE2B 1c79dea90807e4cec62fcec6f894fe57639e1f8f46e360d9a668bde1cc04c9c172075dfc2b605d7d3b6399a8905920ecfe2cbd82412b8f0224e059717d19013d SHA512 c35d09f84c093ab5fe7ae31cf004d485cf6d15a06ee7c98270d3f5c471da6e0c9a71c8ec6ca0aa87e7454c9470b218c24538270711677003dc63d316fb23dce9
 DIST hspec-meta-2.9.3.tar.gz 69002 BLAKE2B 2ed9b44eeb9b5b3335a4e7a695a199cda1bd405c9e041e251ac1f33cf9ade99be84853cbd32bb6204ec879ad342b55841425b0f76399c0a5d588f8769a7a6dea SHA512 d6205a4aead9c8824a89b18f41d2513a0115c76f9130b7100e349f2b8c91dfef34c704ba169f5b103895d0144a8fdf79eaf46abf1c7447da7d634eb3b7c8e80b
-EBUILD hspec-meta-2.6.0.ebuild 966 BLAKE2B c23ccd0386783bce410ed74238a4c8eb03521821d739f3a61d88e04892dd05a45d1ccd9e560e24fe341f3112e4b8084112e37b708a11355c69218852f2fe9152 SHA512 ef35ca7a8ad6769120c836f545ae27338f9004ac24d882674755227f5a33ba28e0d3dd980d9e314b4b312aea74091e75c5c349c09d0090bfbcd40dd8493271a5
 EBUILD hspec-meta-2.9.3.ebuild 830 BLAKE2B d53fb3269ba5de10e2ba9f219a1d885a3bba04572fd53b822d49821899855044b3b8fdf4e316210e1b47c63f4929e67548826a693dd9f507b50c671e32e50007 SHA512 006f18f5a89e04f1ee0e05c0496dfc2a240e29a36c426833c1c9ce7678932ab8d7fb383d36f4928940ff16eb167c3f694c00840a3bb30ac926bc18ae3b12c4ba
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
deleted file mode 100644
index 9b5b1040a23d..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.6.0.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="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/call-stack:=[profile?]
-	dev-haskell/clock:=[profile?]
-	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.12:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hspec/Manifest b/dev-haskell/hspec/Manifest
index 402351134eab..c584b78cfd69 100644
--- a/dev-haskell/hspec/Manifest
+++ b/dev-haskell/hspec/Manifest
@@ -1,5 +1,3 @@
-DIST hspec-2.7.1.tar.gz 9270 BLAKE2B b4cd1433c0e5eb0075c1560c244767cba9b0d34591fbede96c6ccc4f3ccc55f414fcdbcc943a21b7e42254ed091b4f2d496af5b42999ec8802468d9bd3c83965 SHA512 64e69444d447072ec501b745c7c8913f38bb6b540db4867ed4cbe4752e9d147e8a7e75538c15be7d8c65f9f8e7b48654e8fc2b53ae733a28236074fbafe9a6c6
 DIST hspec-2.9.4.tar.gz 10117 BLAKE2B fbe881a560fc015ab4b3b3d81710d9fa758e65fe6740aeea5273e02588d373cd83b64cc7bba870bcf943787614681ad9a139912c3cbe04e9e822b8cb24788e5c SHA512 648fd812f22613616c1f81206e8bd0ee3bbfe52a4e367344887a832b56317615711aa401c1ac6dfab46f84404885e01065d91e154b9136bde041cf5e419b01a0
-EBUILD hspec-2.7.1.ebuild 755 BLAKE2B f76fcacaaedb033a7d697a55e998ecbd79f5e0742d501468fdc111a6beaebeac1260c1a3f3e1314bb1b6a0c5a03d46bc546a0ed8f639074e6957da769b28b8aa SHA512 b8da1c861cf44af2308bee033ba12ec6c9116d99aea06d2a886989866cc15db6edc679fc5ec54c3ac9fda3a71c3023d0d979f5a4444525a952c4292dc72be4cb
 EBUILD hspec-2.9.4.ebuild 756 BLAKE2B 198150030a3225bb4535d05b29388d706b03c9bafb1a04dc1fa13180e61c4fcd3391bad53923b793ca6db95285ab108ea5d3bae6f159807cf2f91bf83e879410 SHA512 8e6bc2d3a6d1f6f895fd8d599fc565254df5db8e64c8bd46d920a33b60015f822446a12d89d6d88831e5b84add43d2ba256ae8c77ad6650adfa526b08789a6ec
 MISC metadata.xml 556 BLAKE2B e66e80620ff47674f1d7e43d4a062cc346426fd20597edbe51c6bedf8dd6a7358a7c673b0a489f88afbe24d7f60bb5229b656990c5604cf6ff42c3f0d9fc9687 SHA512 4cb3445c9d5f36df300e8839ecbf80f59f420bbcb4ad8497d53f4e64e4c126ca68086bdb601aefa3d801624eadb275c0c2a717cb97529877f05f83c27287de84
diff --git a/dev-haskell/hspec/hspec-2.7.1.ebuild b/dev-haskell/hspec/hspec-2.7.1.ebuild
deleted file mode 100644
index 4634717e59ab..000000000000
--- a/dev-haskell/hspec/hspec-2.7.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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/hspec-core-2.7.1:=[profile?]
-	~dev-haskell/hspec-discover-2.7.1:=[profile?]
-	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
-	>=dev-haskell/quickcheck-2.12:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/hsql-mysql/Manifest b/dev-haskell/hsql-mysql/Manifest
index 423ba7f5fe8e..433fbbb90574 100644
--- a/dev-haskell/hsql-mysql/Manifest
+++ b/dev-haskell/hsql-mysql/Manifest
@@ -1,5 +1,3 @@
-DIST hsql-mysql-1.8.2.tar.gz 4659 BLAKE2B 342f9baf9deb2596d2276e8050c202bbf476f56c5eb654f71b52959b8d5fba31ad4cfaf4c2b9ac47cc862e4d97468dbe5c312a73c2f8496f561183b1d226b46d SHA512 8476cfe746085f75a50aa2d24ecfd87abb8e5809f6292e3f5ebab184d96672178dc23a2d6f749b99d916932e19894ed022138eb192e4e90de94097625374941b
 DIST hsql-mysql-1.8.3.tar.gz 4366 BLAKE2B af5fcd66b15d7ac4d9fb3cf72688fcd47e262cc9fdbf77b93fef5d13d8242806c433dac98ae52948639a48d8318db3736c3bba03ced3c9463a0d49bf699d0980 SHA512 8004ad313774ecb628e9d1a8876c90efba854d2e36c5918d378269e6e1c3d09eb1c2ad0250f1455879d5097a75ec33a18a379228ea250a69af261c6e7846577e
-EBUILD hsql-mysql-1.8.2-r1.ebuild 614 BLAKE2B b25abe2a373af1bee95e02410d4eb02f08e31806381073e01ebd95b78ad9fd14aa56e372c1f3424061c0ad220cdcbaebc30d7d667d5285e92e7eacc17822ce39 SHA512 98bdb5460aa02e60449c0f1cd5deb00c799ef7f8bcb0891043c6d23a23a438c561e73e421369e785e012b7d4f86b3985c3866667ca016fb9c17bcc4ead15f197
 EBUILD hsql-mysql-1.8.3.ebuild 627 BLAKE2B d59d340aac5e02186c1a9afba31e711ca37e4754b14d2a9ab9989cfc428c29f27ae8e4d713ae3a5f6b0af2c3623e6905e470774553784883da468d74518f22e0 SHA512 b878501a9c159d737ba350268b402d681b5d988811ee21a17281339a4d8da84468b8bd6114a85adb958b6eba49f02df63378b89fb48ead78c397b6f0534c5f2e
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
deleted file mode 100644
index 40d0c3b3a3f5..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=8
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
-	>=dev-haskell/hsql-1.8.2[profile?]
-	>=dev-lang/ghc-6.10.1
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
index 23aea2a94e17..af7fdac4ec5d 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -1,7 +1,3 @@
-DIST HUnit-1.2.5.2.tar.gz 24889 BLAKE2B 7dcc49f58cde674a5555a064bcb16d73925f31cde251acc245e5c288f536550e44c465c5bff778413db180aeba62e5f1d05df25bda193e2523264d2de33e4659 SHA512 ee16c33faacc1c26e242095823ae8df47889946a6a161affab3789d7f40b423d2f002526f6cad018084dc7b151a911cf28b37b2aeef91d186bb765e940534fc4
-DIST HUnit-1.6.0.0.tar.gz 21937 BLAKE2B 7c61d812206097d2c391f13ee9e5ccd05b12565cf43f011deb4f60f8d118e79506adb860f2b5cbe91c5d938097b81d4265a4a3fd39b9d9a8be6c40b5dcf404ca SHA512 06503884bb85733be05b82da1fcc47e5b81122c3a3959ef047acbea2df1338b4f4589479b46daa6a0d554c7cb06b8cf1712462a3496db22cec5621e878467120
 DIST HUnit-1.6.2.0.tar.gz 21179 BLAKE2B c3a299cbe8f6cfe2859baf1c8a212420fd745cb5927d54ad8aae5d13dfc657a27b972de73b405d1464695405ba932e6bfd2073386e0bb9b1f398178ef1a7ba2d SHA512 b27c33545fcb4ca78dd9543eb0ab2f09e5edd989d116fe2136d876eb94745e6d384967ea4b3c6dbf0f03511091a82ecd0b299c8ab00769c57d6dddcddc27e8e5
-EBUILD hunit-1.2.5.2-r1.ebuild 620 BLAKE2B 0488a1b29b187f24158ef6a768bb645124092b3e29b48d6960647ca38671e2e047749bdf031a873a2bd217f0ca9c7a68deb745a44b946e9a6f4a6f939361aeb5 SHA512 6532b5f1dc5552c25d57ac68738406c93d5b349719f6fe2c62faf8cc1aaf85a415ed6199a0747bc39c05c834bdc5fba4c9ad3d3539a7215754a7efab442423aa
-EBUILD hunit-1.6.0.0.ebuild 652 BLAKE2B 6dfb4868f5af493f099612547c9a98c54e30b7b4c51c6c3752f9f6314074e8d05bf0fa37aac2d5b86810f36ddb647da90c3ba346f7684f4e7a095056111f90f9 SHA512 99c3e2e5f78151e6a76ea4033686999b34cba08bfe10daf75a65c6cfd350de4dc53ef6f91c7d8a83479bcd45465387ebf967e13246df868a088e30649407b391
 EBUILD hunit-1.6.2.0.ebuild 670 BLAKE2B 65323da97c1f13546ae58c2cffb3287be34178a7480bec549901181a13a05947639c62654751a9b63dbeae649fd16eca61e403fc3b5ca7825c53e2cc8caac792 SHA512 a7a7bc20236dd840683502599339c1c7354963ec2881738ba6e493181553d5b8dfbe1ec37bd66a688f101f063e663e3c6247a41a37db899cf191126e7a492c83
 MISC metadata.xml 487 BLAKE2B b40040a474e1e64173567f22f7194ebb6048940eda03ad2f89838019e2d89557117dd1c00b55eda74488d82c1f1ac55d32145b55a2513c91337b6a04d12cfb35 SHA512 e673ac6663a271b6f2f8878841028aa77b9b4a6e796f50c4e32922ce4e5df0e66a9d10630bdae882ed5601c32e4d27115e46c0073532a85ac45b8778a033098c
diff --git a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
deleted file mode 100644
index e5dd40bab7be..000000000000
--- a/dev-haskell/hunit/hunit-1.2.5.2-r1.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.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="http://hunit.sourceforge.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/hunit-1.6.0.0.ebuild b/dev-haskell/hunit/hunit-1.6.0.0.ebuild
deleted file mode 100644
index 23d2fdc9578c..000000000000
--- a/dev-haskell/hunit/hunit-1.6.0.0.ebuild
+++ /dev/null
@@ -1,30 +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.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="https://github.com/hspec/HUnit#readme"
-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/call-stack:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/integer-logarithms/Manifest b/dev-haskell/integer-logarithms/Manifest
index c373a3c09fd3..22abcb49c437 100644
--- a/dev-haskell/integer-logarithms/Manifest
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -1,4 +1,3 @@
 DIST integer-logarithms-1.0.3.1.tar.gz 9023 BLAKE2B 29a9e2e73a6fb63f31ad87b53161b9f669a3cf6fed2992d7bf7414d9c9cff9cbe00baa301f7a7889fc0a31ff635d85dafc49ed5ce3f009202ba017b47e75c8a0 SHA512 670aff419de8d6afd1b7e1a40b68290bcf7aefad788c3b08aebfa5ca3e709f5d22543fce82fb75dc18b3ba0ef6d8a8f61735cde647a7a6c9392a60ec365534b3
 EBUILD integer-logarithms-1.0.3.1-r1.ebuild 1252 BLAKE2B d669bff1f1f7af45b3352d27f59b675397ccbba58ba611bca69297bf62c81d08479912eae3fdc2cddfe88a49b540efae54dcb09e7b94d4e1931f24ad2bebbf35 SHA512 1eb4605cafe643cacf92f112db422faae5d735ae620473f730d36f57e34da1b9b85af1ab09164b80c8f8841b5898e0a4a15624e9a0f2189c9a9ad26ed14ccd5b
-EBUILD integer-logarithms-1.0.3.1.ebuild 1149 BLAKE2B cef70a6613af65354d771bf81de23863169dcf28289ff971e27a9f6028bd50cf8d6fbd66edf52d29ea0467b9d01431e2b4c75542f4bf10898c2bdfe7df8088fb SHA512 e2b28c5a154ff168d90b2945b753eef8cb8b99d844713b1c6ff7ec2e9a0382218bb22b0db94b4a9aa3beb0aa94eb63c0071341d14d0f0bb7eb5176da53ef4aae
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
deleted file mode 100644
index 2951f7036eb2..000000000000
--- a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.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=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -check-bounds
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Integer logarithms"
-HOMEPAGE="https://github.com/haskellari/integer-logarithms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#circular dependency: scientific -> integer-logarithms -> tasty -> scientific
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1"
-# 	test? ( >=dev-haskell/quickcheck-2.14.1 <dev-haskell/quickcheck-2.15
-# 		>=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3
-# 		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.4
-# 		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-# 		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
-# 		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 )
-# "
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check-bounds
-}
diff --git a/dev-haskell/jira-wiki-markup/Manifest b/dev-haskell/jira-wiki-markup/Manifest
index 3a229b42bf19..1635b21ca513 100644
--- a/dev-haskell/jira-wiki-markup/Manifest
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -1,7 +1,3 @@
-DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
-DIST jira-wiki-markup-1.3.4.tar.gz 23759 BLAKE2B 0492ceb9cbd2d4b7d579446ce3379dec5596c89b1617f113d2d455ef3c8a9bc4f9cb41905f6ca61229e67433c2ebe4e04927cb3b8261c0570a27063bcfdd8186 SHA512 762ebecfd8fd903ae348a9f09fa8c610e48a5a8b1b5177a749cb51f94d01d7fdf6f8e078f48797ae94ad8e352d06841189c649ef5131b41470d1390a3e23f481
 DIST jira-wiki-markup-1.4.0.tar.gz 24883 BLAKE2B 565c0ddca8361848683ee453e4eaa0020b74d52d847930fd8ae0da43e435c325cf42a1ca1547ad92f10607ba07137ba6a596e90b97f599d0ef055922023cf6ca SHA512 f20bf4b5242657a34cae1aeeb88ba6de61748ccc212243ae6a6d5a4defc3e2ad25445705a87a55d5cb3b6378f5f500887bf509459a66741a75a49025e1549750
-EBUILD jira-wiki-markup-1.1.4.ebuild 835 BLAKE2B 7ea9a7f709e4575923a82a2b5c849213b44e626dd68db079dfa8224a59770fa6a5bc83acc12bfd0d1fbe4c9a675e6d94de31323a0d93b8c40f304214ec4313fe SHA512 3ea322122f948cb3542be50ba85165034fec5ce6362d47158cd6bc0685ff4f30f63223842316bf2b91d4442ebb7f7bece8fab536961f570c1847bef0d2fc2316
-EBUILD jira-wiki-markup-1.3.4.ebuild 805 BLAKE2B f75aeb0e45321a4c38c17c15d9c6e979958d31ae20da663b57f0385930f9ee75875ac102612779adb91eb18fd586d63ff3e404d12b20381ff9cfd8d7865301d5 SHA512 ae0f6b8c9d1103dff2784ef11dddcc1f390cc21353743d08138255f127bcccccdef7b114301f309e4d0ae6f5b1eeec626399a0ce6495aaa90bb63908c24dd30a
 EBUILD jira-wiki-markup-1.4.0.ebuild 810 BLAKE2B 2e71eed957eae6d8195076ddcb1b3707f6b040b44fbba7530800198077765b9f74db489280981b2fa2617025ddd8eb0e61e46e4f0fb199abcd6bf70cae3a88d9 SHA512 219198b013125aec17cecd07b7cd15241a5dd5df2dd7d9399ae765caa317de0f9a457a4476c8c634123dc594b65747e1f7f5e14661ca08be5970ff73443d352d
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
deleted file mode 100644
index 3bd4d3067c1a..000000000000
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse jira wiki text into an abstract syntax tree"
-HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild
deleted file mode 100644
index 08606428538b..000000000000
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.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="Handle Jira wiki markup"
-HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.1.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 )
-"
diff --git a/dev-haskell/kan-extensions/Manifest b/dev-haskell/kan-extensions/Manifest
index 8ad0843fd97b..d14a363830b3 100644
--- a/dev-haskell/kan-extensions/Manifest
+++ b/dev-haskell/kan-extensions/Manifest
@@ -1,5 +1,3 @@
 DIST kan-extensions-5.2.5.tar.gz 22205 BLAKE2B 372b83ed6d024e97ed76fa1a7cbee08d0ef8a2871d8d103a5c114c8616d6281e494503900e1f51d6c828f272be826e5ab3e6087e0de0b6c5119960f06a7c326e SHA512 70303f23e4935ca662f5e094a0ab9c18997c5ff2896bbbe1c8f7d994002f75176457757ad8d4647699ea1cc28701c75cb10cb4fcbe81d8c2f3c71cf28244ca9c
-DIST kan-extensions-5.2.tar.gz 24151 BLAKE2B c36692fc89f4bd378a1e2a12368cc0b34548b40a56ac72cc744dbf37a6832ae8970549adda42b3b5286db98f9cb8474ebeee2754503a52caeb223ce216e7874a SHA512 209700c5c912ecebf2b8f5a5ef8a2b6943281a9a7181f47b99faf78c383cfe0f6054eb5fb59ed558cb55f06cae4b8e980c655c862717afd003f05ee952eca05e
 EBUILD kan-extensions-5.2.5.ebuild 1387 BLAKE2B dd063eab0678cab9d05212017dea5feba7adae08f4055866871cac8a0ec99dd366f6cf52239d59813088975b0199a8c61bd209bf8a99d7bb8482152ea2edac0c SHA512 065f59ff3ba667cf2d5da83ce77cf70df17ab4bc8f06e5050690743486139562ea200be5087431c5bb32a4b182a75d1171260bd9f80bd0d75232f01ceea4482f
-EBUILD kan-extensions-5.2.ebuild 1530 BLAKE2B 4576fd8c7920a50b474effc81a84bfa9315cca5905f7f42a0fd4f40e763682dfbfdcc3312a2e8536680f6025424565c30f552cc3cf5ca93595bb8c0c72829477 SHA512 711e7675820488b5a7a695ecd3eee1d75c32bc04f66ef973a8858d2c05650a9eef85b115514b68cb05e5a18935a24aca46ccfb05ed6094bc39545ea4cdb6d4ee
 MISC metadata.xml 336 BLAKE2B e94f4e89cce96252e1c979e0edca23f56592193fa47f3af5c20d49a02e4fe58c6ed55671e4e7c7689fe8d36dad790bee063400fcafb7f1eb0b9f2ff6bffe66c9 SHA512 bff6ab97eb6af88ccc95c4021e27c5eab15e2ed587a61c419092161aee0869cbb56f1335cc9eade3391878bc7a6e987d829c7b62eedbc3948a133f071a40c7ed
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
deleted file mode 100644
index b42a508ccf77..000000000000
--- a/dev-haskell/kan-extensions/kan-extensions-5.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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
-HOMEPAGE="https://github.com/ekmett/kan-extensions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[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.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
-	>=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[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
-"
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
index 58de8efca129..64f5e78b1c0e 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -1,8 +1,4 @@
 AUX language-c-0.8.3-gcc-11.patch 1458 BLAKE2B 7d9adf32532e7fabb65bc7f71389f2d85b1ed053d1934ed8d1af023fd295ab06fbc62731b820dd72dce50e744d64134ea14e5d11959ce0aae3af45ce6afdf7ae SHA512 8c83c4ee53c168fb3147ea30855579c4f59a20eca6845dd44194d127df02880810480d1d7cfb8e9cd8cdb9ee33de42c67dd6915ba0ad3c45c3a73e9073669466
-DIST language-c-0.4.7.tar.gz 112569 BLAKE2B e7a1333315f10ac3e8490b8dc3b5aa04e40b1a7e1f9c68615f549c82f7d02bf7de5b687dd9d4f04f82202b89e468b22833816346f53bb1cd075ed6386ee1142a SHA512 fb2602606b8c2e678e170d928c3dd023acccc079381a37b64624af658788c0dee982c2d53c2d3ba66b576aa75de350d12e35a94f867e1d714e89c27d26f2af6b
-DIST language-c-0.7.1.tar.gz 181648 BLAKE2B 6c5219698fbbe995d759a0bd6e629b9dbb29137c3dfa879cbdf139721f4acd341245172ccfb3f7d3cec58a831f72f03d092f29960f6dfcf190480df02a30e66a SHA512 c62dee86b70ead9c0795cabc6b1e0487ab3d4e1e4df693cec94c255aa96d21589d9161150073a5ec1d2ae168924dd8a11ae6ee0cd46730a25ccda009f7a45f58
 DIST language-c-0.8.3.tar.gz 194870 BLAKE2B 6b35d741f73543d929bac18e3567911f7d2fa56734463cbc15f2db4ecdc127eaaa1ec2afbe6962f39feb860669c33b50d6c7c941cdd7f6b3c97b42f911b21309 SHA512 a2e653c3d6fe4573c0a7f34115d5a5d3db925c174cd574755bb174de834165bce236b354f04e1158309eda654d12104ea03e88f94cdc8b3e11cffba7260282de
-EBUILD language-c-0.4.7.ebuild 775 BLAKE2B f7e191f462ff6c1757f10669310c439a0b03a56fe9ed5927551d65b93e64bfb5ee5526c9ce004a0716ef9c392a9b3c40858b784ad5a999fbad3d66bcb1f71860 SHA512 ef7bf4a3d66ab6f0a136f7a9b5366763b0c7841d25991d731e69ce2e46e936faa946f4292f013463b087fa25e35f3cb0d34158ba91d61bdd21bb27363ed4cb2b
-EBUILD language-c-0.7.1.ebuild 755 BLAKE2B 7f003b4d9cd81e358f13441b0cd5b7b30e0ab1183dfef8e3236bb8316e6b48b86b1543dfc5ce61a0c2bf2319243185f0c44eb8b39b03deb940c9a42d656be8c8 SHA512 e54d69d98c3db00a002c9e07768231ad76b334344c2e8f5e73be2b55229b45b91be3a785426812ef37171574055902c25e5f8e6c1f12e3b131a5309a97bb7397
 EBUILD language-c-0.8.3-r1.ebuild 921 BLAKE2B 10dc3c8b25c32a5728e988758e7a6273bd174dbf9561faca9278379cbc1f09dbaadcc032c38e455212db8cd986382577ff8024b0eb64d4c556f65a5cc7a295a8 SHA512 bc34c71bf52eb795082742d232ea642ae43f2588fd0294afa28731d21383c5fbd1ceb96aea36ef8fd4650f21b823cdefd0c0731e4041717abeab19ae1d59951d
 MISC metadata.xml 218 BLAKE2B a4171bcdd2464513ecc42102fe4b99a29e63146928db17e679dbc71bf248912ee585be783f633541e6031335029bf7c4a8edc3636c9a626a30a57547bc315440 SHA512 f65587e3686d21a5546379b88cc6a58ab53bd6fa512bc63cab7e02f5162bb876fb91f843a86fee5f1a7813abde579b61a38d6f8a9e363473eeb5e6c90691c681
diff --git a/dev-haskell/language-c/language-c-0.4.7.ebuild b/dev-haskell/language-c/language-c-0.4.7.ebuild
deleted file mode 100644
index f1d684f79539..000000000000
--- a/dev-haskell/language-c/language-c-0.4.7.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.4.4.9999
-#hackport: flags: +separatesyb,+usebytestrings,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.6
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=separatesyb \
-		--flag=splitbase \
-		--flag=usebytestrings
-}
diff --git a/dev-haskell/language-c/language-c-0.7.1.ebuild b/dev-haskell/language-c/language-c-0.7.1.ebuild
deleted file mode 100644
index edfde92bc028..000000000000
--- a/dev-haskell/language-c/language-c-0.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-#hackport: flags: -allwarnings,+usebytestrings
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allwarnings \
-		--flag=usebytestrings
-}
diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
index f2368c4f9811..140007c865b1 100644
--- a/dev-haskell/linear/Manifest
+++ b/dev-haskell/linear/Manifest
@@ -1,5 +1,3 @@
-DIST linear-1.21.3.tar.gz 54001 BLAKE2B debc60d15256947f9134f5debff4b07b206aa5d1aac3e63fb5ae239b881987369b5d2766a658dcdc5225a978f4b464b65c76a0fbb00312b650d7c13bf818e25b SHA512 0fc979f1e2cad5d24ea9385469d8b230f53976e9405b762dfe2d2cafb40239d7785e2ef5ad0dd1b482718e05023ba1e79fad0ce3e6886c1510c76f27a2a5ff02
-DIST linear-1.21.5.tar.gz 51148 BLAKE2B 4ef1bd13d732d14fca2f699f354b158a30926279b15bce606949b715077112085600b66120a20d25ac2d76ccc263ae8cc54d906078246bf259f2160a227f2f50 SHA512 544bffe2252158e368e7d5d93e90c15d571b8545ddf20b01c8d50563c9e940dc4298ed7a1c10e0365758407442bcb66d00d0deb099debe4dee992ef0fec8e270
-EBUILD linear-1.21.3.ebuild 2283 BLAKE2B 7b6043349f58a2d2706363d21e710df110dc36c7cb8ca7dc74970a7dd4faaadc982e17e3d0c2bc75aff264e7266ee62595019d556f30151fc80a792c498e9e1e SHA512 4c0aa82e96d3eee06aea29d4226c0e2034719308d65dd5c53f7894fef8ee3bbf35bd0d1925b8b3940e9a582d097c98d6d4ea59ff9e7a0141f10ceb3e6f99ec74
-EBUILD linear-1.21.5.ebuild 2234 BLAKE2B 95c82da42543780d1ce68cd0c4918d81f9543651cb66ac2d31c7ed362f577393de2c052faa04a291086c69b1e6dfaf5087b16edadf39486434ff3455caf81c58 SHA512 65e0573153b50f3b9c1e8b353c0478d56344cba28c4cd64ff51ec245e36ca77328a63ddb91961bb63ed3703ac338ff6c1e5a68d3ec8998937fc46d0702b9c23f
-MISC metadata.xml 609 BLAKE2B 362c46476254faf491b44c1754e89d438367ea271fedc6878400365e5a52048076c7fc022f1d19ec0c60a1e1ffa137807d168e423e2ed4c9661b7c2343c7c0ef SHA512 cffcd05bf7f74251cccae17b7eb5a6692998e6e997ed29c8721ba90bcfd14379bfbfdf08af8680b049e0c093dc8c54ec4f149ad0409befeed1a9b16356a2603a
+DIST linear-1.21.10.tar.gz 49906 BLAKE2B 7c05ad41b0343637d2fe7ec4002740555d858865c3ebd4df3cfb036a3290688f4d216385866f6ba3135cb5f500d6065264278e353bc990825b2b201f2aa53cee SHA512 e9e0217fdd916ae0cacd54ae38edede2e8a428df8edd5f7b04973fd2db287f1788c95dabc185bcc10bdcda893717905ae477b8813c99bd12b1274ada605c598a
+EBUILD linear-1.21.10.ebuild 2152 BLAKE2B a7aae047ad52e411d0319fc441de80abad91c4b358e1cfdc3e71bd1460665e34f0484ae9fb70f19076b335817759fdf487dd456624f0ddfefd933429f9f7c487 SHA512 339389b02acce77e77e4507c109f57a17e9ee56bfffd7eb9544e442688a73a519a47db18ac74d02c8797da50feca656e70652113f65ffa1134013192a87b8615
+MISC metadata.xml 328 BLAKE2B 2e4c9507a0a15a1a5ffec529fb9f26b3899ca1502f89ff18ead762f71e5e9b62482270c31ce410987cb4c53496febf8cb7ac0a66c902c9822489b128575c22c0 SHA512 7360952e1e7e381697e52ebc910cefee2b289fe62fb749baa7f73c6f2f9da011b892f7cc8355e150df4b2d1b3ac2ef1d4bdd9a939306c39c1d18524607fdc95b
diff --git a/dev-haskell/linear/linear-1.21.5.ebuild b/dev-haskell/linear/linear-1.21.10.ebuild
index 9ede3e1ad189..e7d7a86ed188 100644
--- a/dev-haskell/linear/linear-1.21.5.ebuild
+++ b/dev-haskell/linear/linear-1.21.10.ebuild
@@ -1,17 +1,16 @@
-# 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.2.1.9999
 #hackport: flags: +template-haskell,-herbie
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite rebuild-after-doc-workaround"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Linear Algebra"
 HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -21,18 +20,18 @@ RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[pr
 	>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
 	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
 	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
 	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
 	>=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-6:=[profile?]
 	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
-	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
+	>=dev-haskell/reflection-2:=[profile?] <dev-haskell/reflection-3:=[profile?]
 	>=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
 	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5.0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
 	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.14:=[profile?]
 	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
diff --git a/dev-haskell/linear/linear-1.21.3.ebuild b/dev-haskell/linear/linear-1.21.3.ebuild
deleted file mode 100644
index 033a163d5e5a..000000000000
--- a/dev-haskell/linear/linear-1.21.3.ebuild
+++ /dev/null
@@ -1,53 +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: -herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite rebuild-after-doc-workaround"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
-	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
-	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-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.18
-		>=dev-haskell/hunit-1.2.5
-		>=dev-haskell/simple-reflect-0.3.1
-		>=dev-haskell/test-framework-0.8
-		>=dev-haskell/test-framework-hunit-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-herbie \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/linear/metadata.xml b/dev-haskell/linear/metadata.xml
index 2fe2fec7c8e0..f22a217a0223 100644
--- a/dev-haskell/linear/metadata.xml
+++ b/dev-haskell/linear/metadata.xml
@@ -5,14 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="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.
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ekmett/linear</remote-id>
 	</upstream>
diff --git a/dev-haskell/lua/Manifest b/dev-haskell/lua/Manifest
index b0507777e702..f49346fad6cf 100644
--- a/dev-haskell/lua/Manifest
+++ b/dev-haskell/lua/Manifest
@@ -1,5 +1,3 @@
-DIST lua-2.1.0.tar.gz 212562 BLAKE2B 916eb056d5e920492821c21fb7a51e2f6cde7d5b17462378baa3fc00f22d4a1ac0435e2671fb3d7d722a972beed5d267c587790e0fa9d066ac3a5af3fd988954 SHA512 1360e163915e14381e457727e0d04abc089fef95b6c14331b355330ec35458d5ddf899f843ce61dffe23b86ceffd0d203fd66f2edb4cc8ce11f00278842e1a94
 DIST lua-2.2.0.tar.gz 260005 BLAKE2B ec79108a72a6060fc82b94aac1e61c51aea0d570bac37add749654d903fec5b62c5caa82932606e9778431c80c68fceb11b5eba9d6c45c183a8f249934d26c55 SHA512 d19f54c9424773557f7ef7929be84dfcb7624d8a617d3383a771fe1ba7d6d5cd724c8fcd40475cde443e02e0cf3164a8869c0d67c90cf04b3b09ef6d876aa727
-EBUILD lua-2.1.0.ebuild 1043 BLAKE2B 2011e4c60ff598acfa868e5eb97be2c81f6f33db31541867cfb22b818a5e0bfa2140ab917766750384f8d50cf424c86db58b8b0078983e78a62b6f0f56da5dc6 SHA512 12b533fdc05e7bef0cf792e3d41c814eed2193086f69b7e1f485708fe25db0aeb00cfef2297a0263a30c161f9a3d91e830386017e70111361ba57b36e5e076ad
 EBUILD lua-2.2.0.ebuild 974 BLAKE2B 0d05aaa0abfd7c13d93b3f2a0fb889e09cbbaacd9f7955b5a7b01955df04079b4c2a5186be9c6b6dffdc1819e63bcc9133e8d99f94b4cf941594ce107f98740f SHA512 b9626c98c475d29723965c65284574eeeb8fd75877e0055c6acd9520730a0b3270b824a5a406f75fd7160cf9c8c45c8f3edebb02d189d96aad12ba35a9e7171c
-MISC metadata.xml 1491 BLAKE2B 605ec3b0e830245db62d758c108a1682f03a2a1f7bd3b510f0d156358625c9d2630cae51d6c0c219fd23281318c6af3f80dd04a976c6707febe618bb6ea52374 SHA512 6e4a093059bf30dee3a3c563045b97afa7aefbe4391d336e77e4194879a8590cfd84b2cee286f543b2d919852312a927a628439113e86a4e57efd27f7e18d36f
+MISC metadata.xml 394 BLAKE2B 03b806ac3be3a2c1630ddfb5b026667fca12a939940ebc1f0ec647615797b267d5058dee981dff1111e0a75b62a15872b37971259bc6331376dd59dea092f213 SHA512 25ee72444ebe8941c34453a677663b89ac635bcdd4bfba1b7a3c203bc852defbf4410c20193d7bad6a929c041e4e1cc5d3a28b325f6af4a3de6743747b8c8f18
diff --git a/dev-haskell/lua/lua-2.1.0.ebuild b/dev-haskell/lua/lua-2.1.0.ebuild
deleted file mode 100644
index e3d79624aa13..000000000000
--- a/dev-haskell/lua/lua-2.1.0.ebuild
+++ /dev/null
@@ -1,39 +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.1.1.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua_32bits,+pkgconfig,+system-lua
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua, an embeddable scripting language"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+allow-unsafe-gc apicheck +export-dynamic +hardcode-reg-keys lua-32bits"
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
-	dev-lang/lua:5.3
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( >=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-hunit-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allow-unsafe-gc \
-		--flag=-apicheck \
-		--flag=-export-dynamic \
-		$(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
-		--flag=-lua_32bits \
-		--flag=pkg-config \
-		--flag=system-lua
-}
diff --git a/dev-haskell/lua/metadata.xml b/dev-haskell/lua/metadata.xml
index d3429e60dd25..e48f482bf8de 100644
--- a/dev-haskell/lua/metadata.xml
+++ b/dev-haskell/lua/metadata.xml
@@ -6,25 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="allow-unsafe-gc">Allow optimizations which make Lua&#39;s garbage collection
-potentially unsafe; enabling this should be safe if
-there are no callbacks into Haskell during Lua garbage
-collection cycles. The flag should be *disabled* if Lua
-objects can have Haskell finalizers, i.e., @__gc@
-metamethods that call Haskell function.</flag>
-		<flag name="apicheck">Compile Lua with -DLUA_USE_APICHECK.</flag>
-		<flag name="export-dynamic">Add all symbols to dynamic symbol table; disabling this
-will make it possible to create fully static binaries,
-but renders loading of dynamic C libraries impossible.</flag>
-		<flag name="hardcode-reg-keys">Don&#39;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.</flag>
-		<flag name="lua-32bits">Compile Lua with -DLUA_32BITS</flag>
 		<flag name="system-lua">Use @pkg-config@ to discover library and include paths.
 Setting this flag implies `pkg-config`.</flag>
 	</use>
diff --git a/dev-haskell/memory/Manifest b/dev-haskell/memory/Manifest
index 10fd3a34f83b..c89bf8cba809 100644
--- a/dev-haskell/memory/Manifest
+++ b/dev-haskell/memory/Manifest
@@ -1,5 +1,4 @@
 DIST memory-0.15.0.tar.gz 42299 BLAKE2B fd4cebe132ebc824e88907325d6106ab62d01942f5055481f0ff85248ba1a84211e768e49409b02f45ff224a4149338abb771b1dcad38c31175c340e35063fad SHA512 49aabf5fdaddae597df6d8f30a3e07c4d6d70fcc7b9146452a4ad4e81858786041676bc780e2b048fd683cc7c0d799d4579596c14fae940ea57954e9a7ee9129
 DIST memory-81.patch 4543 BLAKE2B 451af2f23cd975403604f40129c5112f1f1e2856ec90c34058cfc6c97b5f84069b6379dd49d9167ad6e25365035470a0c20d76d4d441f26c6ac283b7999cfa44 SHA512 663672478660b0c693ebf41cbbb1ea123857b4f9c10560c4b0faeafea2cab49291daa99eac623a2c0b8541bcff3285a8837f407a61bf3e83084170c63d111a4e
 EBUILD memory-0.15.0-r1.ebuild 1034 BLAKE2B a0e169620c574ab0616ee39fa3b8630d97a527405b0e03a0dfe842491bf6e4272ae580b5bd926f76ff1eb7c19d3c957f06c8d6816a2146658866a2ab6575066f SHA512 e8e91bcc46ce84d0e1919329742834844ab2fb4c35440f94ffda658537b3f72022ff2b3e456be49e997889286d2168e8a6105c49f399e309373d4935a79f6ab1
-EBUILD memory-0.15.0.ebuild 888 BLAKE2B 86388424694233df889f61bc8e1031aa0a1bc4c3445b12bffa33f72c6c239a1c07bdbe721b6fc0168e4d433572dd74a89955cc6fc37653b7f26266d7c1d42d1d SHA512 1fadd74283b38a15c7e18602cb8e45dd1c43d0abcedf3df46a7d6d9b9d60ca9095b9c946c89176ee9ad86f15d8d53775d9cb9ba7dfbf469e5277430dc9df18af
 MISC metadata.xml 682 BLAKE2B d1da45b67e401ac5f74eb3ae402b1c7f8feda6ea0ebb6124e00abfa72d73ceb1cac9b1dfca5953a50bde7e2af6dca07a8c5419521f0ace29141f1730fb517150 SHA512 fe24518ba47cb42f6c066d49c7dc053b3acf0df2bc8d66994fcd8857388053478836d9991fad14f13b8744e50f336545dcf4297fd1d10908cefdaa338cdad56f
diff --git a/dev-haskell/memory/memory-0.15.0.ebuild b/dev-haskell/memory/memory-0.15.0.ebuild
deleted file mode 100644
index b7a87029607e..000000000000
--- a/dev-haskell/memory/memory-0.15.0.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.1.9999
-#hackport: flags: +support_foundation,+support_deepseq,+support_bytestring,+support_basement
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abstraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/foundation )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=support_basement \
-		--flag=support_bytestring \
-		--flag=support_deepseq \
-		--flag=support_foundation
-}
diff --git a/dev-haskell/netlink/Manifest b/dev-haskell/netlink/Manifest
index ed29fed45321..73bd7755c244 100644
--- a/dev-haskell/netlink/Manifest
+++ b/dev-haskell/netlink/Manifest
@@ -1,3 +1,3 @@
 DIST netlink-1.1.1.0.tar.gz 49444 BLAKE2B 620cf5a4b52f86d9410534d5ed0f4ede40961e976e811c0e2f07c46c95b1ceb1452b9b19cdf4f9da9dfd60166fc7899550b060569dea956feadd6c1293c20f6e SHA512 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3
-EBUILD netlink-1.1.1.0.ebuild 841 BLAKE2B bf59198f6e824461d9f09607c9f4f8f80dac6a8bf72dc3a3d061def823954782c4202d394d14c9b111b8c6bce541c4b15e5def98fcf4b282a79916a1113bdf6a SHA512 1dfb465ae9717647463227d82a63ab5b8726497515f52a34b4af75549a19fa2cfaac586eeb7c642c9fe98ea32383e43d0ed5efbb3ff0ab1b506c7b47d4a3291a
-MISC metadata.xml 340 BLAKE2B d6f1ac0b18faadbfc1a89dd93a24122dff89f4c021a4dcccaf26da63de4ec521ec7a6cfd7c3e94f541e0335ce81ef94d356da5c08fb986a597ad4d189c02784f SHA512 e2c13d7322a28ee5abf8f067ec127c403aa333ecf497b88a342dd9a4f2ea62ee2d56d29c519af4dab6d49380cf1fedee519336b30c3931205363c55ab883d46c
+EBUILD netlink-1.1.1.0-r1.ebuild 747 BLAKE2B 87105c59e490c85d39060ca1ca7c3b10ed95deb9e046f013a73497d132b6e73e6670e7a87a18c29b0b6e2671b9242d1cec2dc84aeab63b773e8dd399d790083c SHA512 15ef4f5e39aeb2409c426f883b406eacb42495e904fefcb77a95b811f7230fa9b2bfd011ec6126919142eacb7debfaf08d67874e15785546b06351821bab9659
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/netlink/metadata.xml b/dev-haskell/netlink/metadata.xml
index 9159af396554..937381521944 100644
--- a/dev-haskell/netlink/metadata.xml
+++ b/dev-haskell/netlink/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="generators">build the generator scripts for constants</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/netlink/netlink-1.1.1.0.ebuild b/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
index a67eebc1a617..244a08082b1b 100644
--- a/dev-haskell/netlink/netlink-1.1.1.0.ebuild
+++ b/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # ebuild generated by hackport 0.5.6
-
+#hackport: flags: -generators
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
@@ -14,15 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="generators"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
 	>=dev-haskell/monad-loops-0.3:=[profile?]
 	dev-haskell/pretty-hex:=[profile?]
 	>=dev-lang/ghc-7.6.1:=
-	generators? ( <dev-haskell/language-c-0.7:=[profile?]
-			dev-haskell/regex-pcre:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
@@ -30,5 +27,5 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag generators generators)
+		--flag=-generators
 }
diff --git a/dev-haskell/network-uri/Manifest b/dev-haskell/network-uri/Manifest
index af519dd00642..21de00d88a78 100644
--- a/dev-haskell/network-uri/Manifest
+++ b/dev-haskell/network-uri/Manifest
@@ -1,7 +1,3 @@
-DIST network-uri-2.5.0.0.tar.gz 1665 BLAKE2B 7f4c1090cf22f83b69b2cc222001f607f6bc0ff9a98a9d20438da8cdea751cded6ffd2b39f05561724cb87f194a15028240bb44c06d24d539dc6c42ac4b25f86 SHA512 9bc738e6de09a3dfd1b929c6f9c557abedef239034e886ca65d15a1ffc423dc72ce8b09f0f374ebd701b237600b65d031d5bc75f5ea937291328f4a1d01e6061
-DIST network-uri-2.6.3.0.tar.gz 31997 BLAKE2B 305a32a14eb32bb723ade1b20665e1f37a14111a7725bfcba99bd59120e5ac08c0f30c7fa32692a64f5a0bd4b26292e93bb079b89aa043c3fa0188316d0908f8 SHA512 15091367e4543de1e2af0d81973b8e456e2c5f5295dcd7a91b91f46c2e07a6a655c6ab4c0837ce7566b21b43bca3569c1b27bb7f437572b09d00e678c7b512f0
 DIST network-uri-2.6.4.1.tar.gz 32373 BLAKE2B cceeb533cae70b4b3e2a4caa2a2f3722949698bcc6c2c454787195ec33050c0a3f6ff9f2d60d5d965eb13043b22759525298a1840ac7046e765bc40b3ae960c7 SHA512 8e5b01fd11197ac36de9b804d37256662f904f2b94a997a2e262439bb1706d1c460db368e935bf3971fd1581162abbc07439a0bae391e1e616264bd00fe7104e
-EBUILD network-uri-2.5.0.0.ebuild 530 BLAKE2B e7f5817c3605c1085d876e9dc123fcb35bca94e1a0dadb1dc9e298e12c73f64e1d8c516ae10797fc75fac82f725ecf6cb98c7a9601aae2fbd67581ef540e7ea1 SHA512 561d46399bf7107443e05ba92d4fd0275193a85094b52296267e0133f020b83a395329d6aed2c5831da1ef9321c7c915e99b97408231917055cf674d493b14ad
-EBUILD network-uri-2.6.3.0.ebuild 744 BLAKE2B dfdd04ea6c8ede85e6e614417b0f083b90b9fd9adf14bba10438544f82bba2da275d84fafe50e4e8718399752e2eefe2f2e9959767673b44bdd105ce604a8c1a SHA512 17b3dfdf28d05b09abba010b97eec6c40e5b34accdbc99c6626a2ecd0e39c2beb94df6dc291e8163735cdce1be6313da8a3d9c181f73286ae6569f47ee14e5f9
 EBUILD network-uri-2.6.4.1.ebuild 954 BLAKE2B aacd837c628446c5c42178d64ba44bc1161468309b52129a4b1f63f645bf3c56541ef56dc8984da0507efae45e062ac96ff1dcb957b8bbbe1bfc088b83c13113 SHA512 8b895e785557e44aeedfff2d61b4c4052860c3e6c0ea54e62586e984e975308593a3aa877627984f0cc359a63a76900354ec609ab3653995d8ee6e4c1e1d3315
 MISC metadata.xml 1146 BLAKE2B 55a3f986450ac1243528c54fa93d8a08cd61bf0ecddabc02bbc8b513e24b21c19a974e98750b2c042d3428be188a8a4320c00179e0c1f58fd90ad49594de83ff SHA512 72dcf18e90127bef4c4dffea4744f82e2e141599c87eb5798e810f874e7ff1cd3087b0564fba014897c6cca2482096c0b546498585fadfd4cb4f727220324cc0
diff --git a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
deleted file mode 100644
index 5c57b210fa22..000000000000
--- a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
+++ /dev/null
@@ -1,24 +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.3.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-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.10
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild b/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
deleted file mode 100644
index a542da827e19..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
+++ /dev/null
@@ -1,27 +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": circular depend
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-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 # circular depend: network-uri[test]->criterion->js-flot->http->network-uri
-
-RDEPEND=">=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/nonce/Manifest b/dev-haskell/nonce/Manifest
index 18792bd046f2..c6ec084f0fa4 100644
--- a/dev-haskell/nonce/Manifest
+++ b/dev-haskell/nonce/Manifest
@@ -1,4 +1,3 @@
 DIST nonce-1.0.7.tar.gz 2956 BLAKE2B 1b03b7b51c27f44ad9ec095865efb20fa19ef3b60b536970d28e9dc10db870b49600fe9454f804cafdd480b3e5054d5bcc22039d323019b0ac46fda2cb8ba69b SHA512 89fb70578c8f52c652cdb4c1e6243529701bc21685862d7bbc750e2000424a029a8b164bde6c422a38e61944a15a8b788aa4aa70212bca9f12b5eaae801d8db0
 EBUILD nonce-1.0.7-r1.ebuild 966 BLAKE2B 465fe4226e421ccc3a8263fea51c45a845d6616ebee39f8a4be11e1983333cf687d359b578dfd7ae169c50ed653021f1e90af03d1b437e3335896b88f3277467 SHA512 ae996cf7e8c21c500724a1c73361383b85ab831360f88b20165585ea6a0b1bb924dcfed5c6f6198922ace74d574776101f4eaad1890aa62cad689aa9746a55af
-EBUILD nonce-1.0.7.ebuild 897 BLAKE2B 7631e20c6014b32fb326951ad0f13b5719cfcf19098bc65c3b8f8525159461d0f06ffb157c2cbd34fb8e927cfb6e9eb7a56e9f26147e77c1b538acede4521129 SHA512 5c9d25095b18aec39c14ac9e5930f055263807fbdbcadcee2618440108b979cb866427c79e91594e7ebd79e5d31b2bc59f4d9182c6ba096523eeead38c408c2a
 MISC metadata.xml 807 BLAKE2B d50ca3055aad959b7b0c338482b775e4ea2d86b1c88a5b1dd88a303e14a105064c50857b1b37d8771815a9232efdbd2cedcbf025f54664bc85d967db7eccc841 SHA512 82e1d75447852625b8ee21713a08948c33b467e27d007f0c6904e804aff4406e0996b978e705efa6e04603e1f3fd4013b4de8505c2f647b519ad3d4f723ef718
diff --git a/dev-haskell/nonce/nonce-1.0.7.ebuild b/dev-haskell/nonce/nonce-1.0.7.ebuild
deleted file mode 100644
index 153271b53d81..000000000000
--- a/dev-haskell/nonce/nonce-1.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate cryptographic nonces"
-HOMEPAGE="https://github.com/prowdsponsor/nonce"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/entropy-0.3.7:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	dev-haskell/unliftio:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'entropy           >= 0.3.7 && < 0.4.2' 'entropy           >= 0.3.7'
-}
diff --git a/dev-haskell/parallel-io/Manifest b/dev-haskell/parallel-io/Manifest
index 9e80898e7008..410c84b39e2d 100644
--- a/dev-haskell/parallel-io/Manifest
+++ b/dev-haskell/parallel-io/Manifest
@@ -1,3 +1,3 @@
-DIST parallel-io-0.3.3.tar.gz 9435 BLAKE2B 97d3e1343a20748173d9bc15e1bd84cde4e66f4e8bc916a18550c9f5e9c7a97a06861ab83db6ed3c7975da0142e287da0c6dc1c6483d9f78544564516181e650 SHA512 4d2ddb9ad4b3b362e431774495fa7e4cc4476768257f2915f3a6e64c1872a5bcf880d71e1f678997a23fbf9cfa22bc2b38df9f2866897d3cbb6d35e65eb542db
-EBUILD parallel-io-0.3.3-r3.ebuild 943 BLAKE2B 89941b0d107d81bb3c3a2e826316a89d3b149556e19f44daacf01a12f42251d1e6313394efd51897e91503d46915418fd02231aac87a09cccbdeb3b21f7b9967 SHA512 85acd36e28cfde17778a3f38033a3a5cfc72c7e98a8bf6efe516c322fbc8b801abfa832b957bb738d4ccb4fec9acfba64bbf11163a64da148398c6b850a08bb6
+DIST parallel-io-0.3.5.tar.gz 9422 BLAKE2B 55fbcf6aa8aa2742b53cd549917edde83a1399255be35cc4c023b4a150913699e13398bcd900f4c6971ec550b3b3f030e0d2d6e974baf21ad4fc92266d3cfd73 SHA512 5a77f66c32603a8d15d10508de6f8e7e7f3523927217974350d79ea2639b0eb3bde08fc7cd3a6b14226c67e7637271f5aaddfcbd07d163764e44df0babedd570
+EBUILD parallel-io-0.3.5.ebuild 856 BLAKE2B 8f4bf7f237c7f05580d19816d8b2b192bc2b88b5dc2d06c65edf0dbbe684f305e9f726442f1483afe739ffa89b271f142c5fa24416d807dafc7e10d690b0acc6 SHA512 737131eae5c610d86c7b36da70c660387415abd22a75a792a16e303a7361336548727c4307c9447ef2fd4f5c4fcb5aa3a3f8ec39666e2a82bdcabd85556b8a55
 MISC metadata.xml 900 BLAKE2B 716eb7c7053c5a547cce784d002eb660b41fb068c85a0eab88dd2913c5f0c865c7badc01bd323dee7f31473faebbf9489c51a0f62d094b67dc8440f8ad2c3b24 SHA512 d747f4c09f0eda7cf18cb0664fc40e6da3023de854e2041cc5cc2dc0f80681fd96432916f2f46840385ac8972de720543a79bede1d7f44f577d009c464161394
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild
deleted file mode 100644
index 960d1f046d6a..000000000000
--- a/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators for executing IO actions in parallel on a thread pool"
-HOMEPAGE="http://batterseapower.github.com/parallel-io"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#hackport: flags: -test -fuzz -benchmark
-
-RDEPEND=">dev-haskell/extensible-exceptions-0.1.0.1:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	# Hackage metadata revision -r1.
-	cabal_chdeps \
-		'random >= 1.0 && < 1.1' 'random >= 1.0 && < 1.2'
-
-	# Hackage metadata revision -r2.
-	cabal_chdeps \
-		'containers >= 0.2 && < 0.6' 'containers >= 0.2 && < 0.7'
-
-	default
-}
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild
new file mode 100644
index 000000000000..398ac7e2ae14
--- /dev/null
+++ b/dev-haskell/parallel-io/parallel-io-0.3.5.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: -tests,-fuzz,-benchmark
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Combinators for executing IO actions in parallel on a thread pool"
+HOMEPAGE="https://batterseapower.github.com/parallel-io"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">dev-haskell/extensible-exceptions-0.1.0.1:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-benchmark \
+		--flag=-fuzz \
+		--flag=-tests
+}
diff --git a/dev-haskell/pretty-show/Manifest b/dev-haskell/pretty-show/Manifest
index 1a81f766b84b..c2766f748ec8 100644
--- a/dev-haskell/pretty-show/Manifest
+++ b/dev-haskell/pretty-show/Manifest
@@ -1,5 +1,3 @@
 DIST pretty-show-1.10.tar.gz 42233 BLAKE2B 55a84a5224b61560f0cf527c103393e590d107c1a08ffc76fc9ad1070f60acedeea97630f9a30a04c620604e9912aa22629705c3297785f73a7c00666b197325 SHA512 90ecf41790246c85ee7c738de2bb1a23a56a0a1d547cee627cb0a5f6c2691adfc73851ca0ebc928f3584912bc2b1148b115db03eea271e67f55d6a1466db8711
-DIST pretty-show-1.9.5.tar.gz 42378 BLAKE2B 3d8fb41c00aa95049b88c75f0b2c107b6000d837e3761c74bc888b561fcd36b1da21c502cbf8e905b601eda3ed5c2a242a710945cf5aee5e2c4413581ba3788e SHA512 7bf382ad3531227588a82d7bcff3a795df0c425b27d7f4448a94fd617fbc8a4fb6087eb859480fe4702771bf560a353a3a3d5079cd6576c620d5258686c41193
 EBUILD pretty-show-1.10.ebuild 719 BLAKE2B fc869e86143f075c6e7479c910b41e2fd15b288ebc7c959d36224ccd738eb5d2cd12a6c854e0fe7f8ff428f9931a6a9de916b6fe69d1682768aded9aff14cec7 SHA512 33dbe0b1a764b91541796e8ce8158f1d17ee33f673cbb8d1c89ad975d2e72e7b47172e2f24a273de2630b5b6ed5a1921c624f44e5025a83d70228edff40e700a
-EBUILD pretty-show-1.9.5.ebuild 711 BLAKE2B b81e1a71d5614b545b1e638c74744e509f6b98268c426f1fbfd17fe582dc1060461fc538563e228c424654c10449404814b94876ad8a18b38b80dc8b9ed0629f SHA512 b65641095e2b037ee98c9870a3054efa2fffd1c8f9b659a5364cb3d6135ca3b9c8c445666621592a63a67a262d37a5b9d31facb2091849fb2bdd8b22b5514f07
 MISC metadata.xml 618 BLAKE2B 656a1e52521df2dddb5d5721c7110e5b459fd77eacfb1aa26c33d8c5d511ee202f5b015e25c44fb4f37c93035675c918cbb5c3200d2353c3232f85ce1f320ed6 SHA512 7e8b1338e13c60c5407c91e9642049795d6c5059bd96093d3a443e3899fda8bf5e9f99086e5a67f879dfb956ca5358d2f29c2f1edf635b6b38178b52e14c2d9f
diff --git a/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild b/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
deleted file mode 100644
index 11370d8d5e0c..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
+++ /dev/null
@@ -1,27 +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"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="https://wiki.github.com/yav/pretty-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
diff --git a/dev-haskell/prettyprinter-ansi-terminal/Manifest b/dev-haskell/prettyprinter-ansi-terminal/Manifest
index 74edfe9f5001..db38ee1c98cc 100644
--- a/dev-haskell/prettyprinter-ansi-terminal/Manifest
+++ b/dev-haskell/prettyprinter-ansi-terminal/Manifest
@@ -1,5 +1,3 @@
-DIST prettyprinter-ansi-terminal-1.1.1.2.tar.gz 6378 BLAKE2B 5c8c4a224bb2832f31ce8a52b8cdc35ee84b3e288a38f507f7bec22beb5fa2877c6ea178a60bcf189bca75be1afa35903582614f0a209f4d6f5d8072b3683bda SHA512 b2ac6c76ce6570b285370c9b1a466272aa5a3ba86a9f1de996392d750d212ff62a743e9c3c28f7de7951c9b270d64c97cb695166b65d642751942d682ff1a71b
 DIST prettyprinter-ansi-terminal-1.1.2.tar.gz 8836 BLAKE2B f1220169d02db0927468ba7af922e2631c5a18780edd786d37e0c273043cb3c1c653f70af70ca963a093cf7936284c73f6131d94f8ffaef1f60125e6ab574846 SHA512 6f3f077f3f171b6a2c1ca811d267f5311328cd3538ace0c174dd87960fd2617a6543e4bfe239f231ef68c6cce87ce563d0f2068631c084a1faa56a3e051f3fae
-EBUILD prettyprinter-ansi-terminal-1.1.1.2.ebuild 785 BLAKE2B 9c1bee9bca4d9919375eaac1780a3976d20484b2f43cbbff838020c5e9e8c58194a86ff81a2fa77df5be93cbcc0a5bddb12fb6b15c6dd1e133001bcc621483e1 SHA512 1111cf84bb5d3d26fcc58b417b7e3236a2b35d7d8bed3d21c713b3c4cc3d8373f4939feafee885775d1470c3389d34d17b1e9ea0b74afc9fe2f7dbea7e426d9e
 EBUILD prettyprinter-ansi-terminal-1.1.2.ebuild 751 BLAKE2B fe22559918a9b95a4ca7d1bde9c4924638f699bd659d3c260611776e00e9c705471ca10468613b1dc5156707db9e0be6cb7cfe0a5c258e9578e51875d2cd0cc3 SHA512 90b985c384def8a2489477e3fefa313b2d2d0abc4507c5eb9cbbb80a88777600a2ab4c397122e56e3f07ddafd74e9077aa3a5ff8a5126c941952a46d7f5f4213
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild
deleted file mode 100644
index c327439b8d7b..000000000000
--- a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.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=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ANSI terminal backend for the \"prettyprinter\" package"
-HOMEPAGE="https://github.com/quchen/prettyprinter"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
-	>=dev-haskell/prettyprinter-1.1.1:=[profile?]
-	>=dev-haskell/semigroups-0.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/doctest-0.9 )
-"
diff --git a/dev-haskell/prettyprinter/Manifest b/dev-haskell/prettyprinter/Manifest
index ab512f726875..9544c572a44d 100644
--- a/dev-haskell/prettyprinter/Manifest
+++ b/dev-haskell/prettyprinter/Manifest
@@ -1,5 +1,3 @@
-DIST prettyprinter-1.6.1.tar.gz 52818 BLAKE2B 171667a7483802a6e55f599af89831ac4e13931f4ce203313ab5126c975963de13c39dba124d81cef29bbeb1a98f1f2001dd9beb02b00dfe1d34160dd8167d30 SHA512 4623cec5c2034f08bce57320d9cedce4c893977868e2c98191c060d6442c2c19c946a07dc8dc2a31dd03c726f392dfff6509ca837d9c75974637e7ffc5099496
 DIST prettyprinter-1.7.0.tar.gz 55569 BLAKE2B fbcdad5485f8139c71f5e34a438adbe59822ef1eb77ae55f9f86228c934e7c751947dcae0900250ea2cfd8638493352759b40c68d91d6b4887289cc475c08163 SHA512 4f1b756b3284a0319bb73229e8445f6d92c3d3d12a879f651df5624389bd6c449b2d9bc440dbf70d8752a6ba574d0539f91950d4bafbe7f9d3fd79d0d30ec95d
-EBUILD prettyprinter-1.6.1.ebuild 982 BLAKE2B 48729ff71b6eeaccbaea42902e4754595648d998ab5f0b4f2a4de9db2f852d912542f9cba4348ba1143826f3ce9337c6544744c7fefdfedc5aee4dedbe45f4f5 SHA512 3e4fc91797c3be3af1970b03b3cfc432658d9309ff74a377431c72668d0d3f762c875d0959b1670c9bfbf5e0fc5beebffa5908e3dfbf7a6901e05670fcc29689
 EBUILD prettyprinter-1.7.0.ebuild 992 BLAKE2B 6f8e5cc24a0a95a94ba4bfc53281f9c6bc40a58dbac10d068a471084c823510f1227759fef893888e7aa7cd30c43e518467d18cabb2d08b19a2456aacafe62e0 SHA512 51f6b5d183b292ff298d9ee92dcc870450f770827912b68b16665c6bbc0f5f4e410a8e5d07bfc1ff13a1cdc6280fb506dd050a831e94ffb7fe94c92f766e4b81
 MISC metadata.xml 387 BLAKE2B 09d59cb262957770e5341ca5affc7212ef21337a494cfcf53240678a072a9b1519599e87b163635c3081f31c3633bedba48585bf40019197518a6441064e68a8 SHA512 ba2b3cf61763bd8162acf895f4711f3e0cf9f78211bda8039ba6f21e4bfb330a18a051bb3944aa020aa34278bab7a9e19cbf6dae9ca06e36a2511300a6a07fe1
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
deleted file mode 100644
index 41a7db096c72..000000000000
--- a/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
+++ /dev/null
@@ -1,33 +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="A modern, easy to use, well-documented, extensible pretty-printer"
-HOMEPAGE="https://github.com/quchen/prettyprinter"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/semigroups-0.16.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/pgp-wordlist-0.1
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/random/Manifest b/dev-haskell/random/Manifest
index f980e03f2b0c..012691786ff7 100644
--- a/dev-haskell/random/Manifest
+++ b/dev-haskell/random/Manifest
@@ -1,5 +1,3 @@
-DIST random-1.1.tar.gz 10870 BLAKE2B e26794bf5dd05b39bdd92afb55abde54d35ff4f7116753ff8b901c8cc18ea71a73fbcb5fc7c1c4a2d35f33ebcf1a3dbbdc0018cb2f8fb1978c35960b95e90606 SHA512 7f128b1c88adfe7ee6405578d3c999bb77e9e3c21e16f82a5197c0ad1d6731851e99e08d8169c6a8b1068ad8a1614c1c0ef8c04c1958337a6e325f1de0c718a3
 DIST random-1.2.1.tar.gz 47143 BLAKE2B 861a216b063aa893a9de645cca231fb1a1914609ea4dd8ec222b35db6ee9cc60760a613896e979f731d3e1a55ea792a294d380313e78549c6effc21b77d57564 SHA512 b130a90981de53b4fc3e7cf660224268d24bcceb9498d33827d9f43dc705c9a724c23999c4cf0222127f4c69daebf0d049d963abbea0a860135d661f9cc55731
-EBUILD random-1.1.ebuild 601 BLAKE2B 98e96738197ec9555a46b7f802a7f5d211215c6c97351f04a98ac37014a2b31fc016b432f6f9604d6b521ca290e3bf77a735d8f9c8896303c52039b52881ef35 SHA512 93106c8af80af195a69b1b9370bbb549767a0afaafcca8a29f0d1ffc775ebf238da6919d299e2362b0cd60642fa4ad6c9d49d0c19784c929c167db6922f3a2bd
 EBUILD random-1.2.1.ebuild 889 BLAKE2B d0ffc025d0a21416dfc01d8f67c039fb1e1e29f547ef12bbd0ab332dd9c4d34c4dabd3cd3c8888d29119c125396228d9a6bbaaa73156e2a45d1fd9fff4da5503 SHA512 bbe648e6094e80d70cdac62e846f1d5bbd168686cc7119936c93d99b6985e8b37b7459fbc39f4f69f38b8e21b72453359a4b9fb2769de5031f422aabf33f21a1
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/random/random-1.1.ebuild b/dev-haskell/random/random-1.1.ebuild
deleted file mode 100644
index 3bafae5494bf..000000000000
--- a/dev-haskell/random/random-1.1.ebuild
+++ /dev/null
@@ -1,24 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="random number library"
-HOMEPAGE="https://hackage.haskell.org/package/random"
-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 ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/regex-base/Manifest b/dev-haskell/regex-base/Manifest
index 1e31951cc5d7..f1c40f97a5b5 100644
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -1,5 +1,3 @@
-DIST regex-base-0.94.0.0.tar.gz 9679 BLAKE2B c998f856c51e3d3abfdc389ea6f8451198f6c6f2d0b3b56c79704febb53f9a3d54c7ed57ddabd10f97c465e1f591cd7f06a4b9c8aaebc6e67fd2741d26fc69b2 SHA512 4e7120e1a2b63fd3e4e15cefc540e82ab0949f51e19f495d4cf4edbe8428ffdf2f114df3504f66049fbb790d5310c59daaf0ed3a71c5acccfe205dccc4567045
 DIST regex-base-0.94.0.1.tar.gz 10095 BLAKE2B 89dd1bf850c072ba8b0283e363415f82bd47557590161e6a65c3a570ff01042b63f85361b4910bba50e8ddbc64887ebf249d8e9b1d60f954d03dad1f29965b93 SHA512 2a1f088532c4488e4dea417222b8723436fbffcf8a8a3596d66c5fd4941250e97c0271c23025244ef3f4ba5295cff82ad8b49a6776d9410210efa7f199bc8b7e
-EBUILD regex-base-0.94.0.0.ebuild 893 BLAKE2B 8fffd279206595d44ed6f38712d1db3a17484b419b7018adf7d21620acb336d66367700a648a73bce4b755a40c1e795d4a2675872a95ce5ff34a817d2cbdc71b SHA512 5a95d3f0a57afe9602905061d13c2a81889e856de167a8f10c265fb677e49d15cc128ce1d5080b34862c5409e658708775ae216fcbcd32901ce527aae1bbc8e5
 EBUILD regex-base-0.94.0.1.ebuild 745 BLAKE2B 51f330572631368982d9c1a27aa8276b39fc642a44b179b91b6b2b6faa5a226f695b2a5dc4c6809e529a62160bface113b375f8444efbdad68cf41c886012adb SHA512 33f4a7ffda37749efa0b888aafa47f2a86cb025eeb95504c3a69e0ad0f8c84abbafe11e9fb4d10bc6aba48f4f6779321065e2b8ab1ce05876bcda557f9367527
 MISC metadata.xml 308 BLAKE2B 0a9963e4eecbb0644fe45a944e127eec6ba5594aae29ecf22f83ab8723fedeeec3e7b46cf3c2cb008b2f262898c52bf6dd6403390c3fbb397fa25d31e39abe81 SHA512 d1ff415536abae9d9fad3c5129e8efef94dd5989395b8f8016c913fee07d1e7243eacfb3170b37848a68818f4e50629aa9cc64fee67570140eca8ecee79a6fd8
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
deleted file mode 100644
index e4d7ed28a87b..000000000000
--- a/dev-haskell/regex-base/regex-base-0.94.0.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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
-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 ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
-}
diff --git a/dev-haskell/retry/Manifest b/dev-haskell/retry/Manifest
index c97819e411a5..bc0fa27962bc 100644
--- a/dev-haskell/retry/Manifest
+++ b/dev-haskell/retry/Manifest
@@ -1,5 +1,3 @@
-DIST retry-0.8.1.1.tar.gz 15800 BLAKE2B fa01f4e6df405d1f71bcb8c7cad6ba9b166222527c70b687feef7b6577446bf790681a189675995bfba3bb362257130bd74119e35893f4497a4f9f57fb37491d SHA512 6907d04314b10fbcbb6680608bbd5926ab56f5916fc032339d5793f2813983d5db3f40d4fc25f8e0befcb3649e753aec737a7ef3cf98fe05252a3a8c1bd546a1
 DIST retry-0.9.0.0.tar.gz 15863 BLAKE2B 2ebe8e71b700f0bedf19a43e08171f98219009dc9ff4f6069ada64945128839f5321c9a2f0602a976431cedbb0c77a56b01805005b8cb4c746b4d4d875b90921 SHA512 89c6ab55a5b0050f7132566d0c9d6ddbbdb927d21c5fcf8fe959fb04228398bc87aa9b51752a881f8a581e6030ac7d21d344dc2c3fea192b0330519e94b33269
-EBUILD retry-0.8.1.1.ebuild 918 BLAKE2B 15f2eefa330484756b9d726644aeba8963e3acb5ac4559fbd9feea0b4a92042d54ae73679e7a7374bcd27b12560e49f0d03d4ef41d4203eb7fe80a5f340faa80 SHA512 413ded44107072ce5bf9dd2f834421b30c55b5c6e1d1c01bc422133b4e73accb69a4d469c57bd2c23804daf02be3b76d8c1a9afd29a4c34bfe957689ab0c0b33
 EBUILD retry-0.9.0.0.ebuild 914 BLAKE2B 9267b0c823844b366014b11d788bb989c8ad0a86d53ea0e3cfcba99999562a4c59898f8d4d586fada828507a919d42e0db2be90d29156b838c88b392e2c3c48b SHA512 829c15a02994a0b16911c74cdd79ae3b05122e33604976d354b9bc9eda88b98f7a82d5ec73410f5399750dc4b9849bc74eb195dcec28547375cca033ee93aebb
 MISC metadata.xml 829 BLAKE2B 464baf16285940b17bb1143166372707eba2efcc002b65a33564b01d764b7ebbb9d67cfd7a71de6663caec9aa149ab955c3f4fe3fc176e21f8d3bd35e8586ac2 SHA512 7c55133e489f0d00fea27b40b0670abf42ea33622dd8efa646dd3cb98d7449d437ccbe9b810925ce26d1f0901d38f4ddebc462692fe421097c12ea172ec26dd6
diff --git a/dev-haskell/retry/retry-0.8.1.1.ebuild b/dev-haskell/retry/retry-0.8.1.1.ebuild
deleted file mode 100644
index e6991bfb0f39..000000000000
--- a/dev-haskell/retry/retry-0.8.1.1.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
-#hackport: flags: -lib-Werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Retry combinators for monadic actions that may fail"
-HOMEPAGE="https://github.com/Soostone/retry"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/random-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hedgehog
-		>=dev-haskell/hunit-1.2.5.2
-		dev-haskell/mtl
-		dev-haskell/stm
-		dev-haskell/tasty
-		dev-haskell/tasty-hedgehog
-		dev-haskell/tasty-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-Werror
-}
diff --git a/dev-haskell/rfc5051/Manifest b/dev-haskell/rfc5051/Manifest
index 37a6e0fd75fc..b21b1371a34b 100644
--- a/dev-haskell/rfc5051/Manifest
+++ b/dev-haskell/rfc5051/Manifest
@@ -1,5 +1,3 @@
-DIST rfc5051-0.1.0.4.tar.gz 218105 BLAKE2B 456ab3fe7d1cffebaeaef0aea1b0867ef69729076af9317cdf8f0f802800552a5a1e6ce27e6684eee94457acc925ad9d7c750864b6098b687af576b5aa74d772 SHA512 5a8a3f3ccb846986242152c8c30a0069466072f2b3fb449565b7fb95615c7909be04a320b9215d313d8b8e442a01959ffead0d5076bc61ee7f33f5ff1d9dd67b
 DIST rfc5051-0.2.tar.gz 285338 BLAKE2B a54f411a00c8f961f9691e2a75e85530f314518f31477f0c43cde23b75b4de3d3cfff0ce41794901e7803ffffcaaf4ec410e4f9eafd512e08667c3919b60390e SHA512 93222535d9c94ac947d9760c8d856ec150b17b93342999f6594a048905c791b08220e656f26c95702bec3c1e835b537635395d1dae6f3607fd8a8a767b24a23f
-EBUILD rfc5051-0.1.0.4.ebuild 653 BLAKE2B b1b1abb215cff368edf800e9cdd893b3b267e458ab9aeaf7433618f6010aa3c7161dd485b65e40c3f4c6092f05ff6fe3b8a88e1028d9b227a3fe71f1f3287177 SHA512 a0b61c0e55f3a226ac15ff5119fcd38446a73fa1c1b10096d5c2612b34e912ffc50c414e07a11a64b65a414554a1948552dd077b225c0644a29b35bf16abbd70
 EBUILD rfc5051-0.2.ebuild 587 BLAKE2B 07d758d56ced3279bcf901b2f8b4ff9057301d7d5c59be72dfdf1632bc1771515a1d43ff1a7a6f24a95f72c8b33755dcf26b8204ee25e2645b558cdeaf536e84 SHA512 a59b06872d96eb6fe633c7b3d66320ada6c2bd1b5ef9dbab1ddbda68de84ffa3573b8114a781a62b22a4628dc9ca47b01a6117733c6ce47e7633480605b1b12b
-MISC metadata.xml 1088 BLAKE2B 773c18aae2b5505f411121a9667373eeffa59fc0086a28492ea02824b802e374eea67038f4454643b999629bd6d50f8a01e59e34065f824859ecc767a5367b50 SHA512 497a2a5063aa6303c89d8a1a890f30fd357746e39a92f889183ac15a56b76f7268e7bb0df3d6954f5b9ad68f27b1c593aba2074b0cc446904ac15e051a021535
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/rfc5051/metadata.xml b/dev-haskell/rfc5051/metadata.xml
index 895f26e1d410..937381521944 100644
--- a/dev-haskell/rfc5051/metadata.xml
+++ b/dev-haskell/rfc5051/metadata.xml
@@ -5,23 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="mkunicodedata">build codes generator itself</flag>
-	</use>
-	<longdescription>
-		This library implements @i;unicode-casemap@,
-		the simple, non locale-sensitive unicode collation
-		algorithm described in RFC 5051 (&lt;http://www.rfc-editor.org/rfc/rfc5051.txt&gt;).
-		Proper unicode collation can be done using text-icu, but that is a big
-		dependency that depends on a large C library, and rfc5051 might be better
-		for some purposes.
-		
-		Here is a list of strings sorted by the Prelude's @sort@ function:
-		
-		@Abe Oeb abe ab&amp;#233; oeb &amp;#193;be &amp;#196;be &amp;#212;eb &amp;#225;be &amp;#228;be &amp;#244;eb@
-		
-		Here is the same list sorted by @sortBy compareUnicode@:
-		
-		@Abe abe ab&amp;#233; &amp;#193;be &amp;#225;be &amp;#196;be &amp;#228;be Oeb oeb &amp;#212;eb &amp;#244;eb@
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild b/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild
deleted file mode 100644
index 62d9e8871b7f..000000000000
--- a/dev-haskell/rfc5051/rfc5051-0.1.0.4.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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple unicode collation as per RFC5051"
-HOMEPAGE="https://hackage.haskell.org/package/rfc5051"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mkunicodedata"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mkunicodedata mkunicodedata)
-}
diff --git a/dev-haskell/skylighting-core/Manifest b/dev-haskell/skylighting-core/Manifest
index 3c5f678e5fc6..64a8f570ebe2 100644
--- a/dev-haskell/skylighting-core/Manifest
+++ b/dev-haskell/skylighting-core/Manifest
@@ -1,7 +1,3 @@
-DIST skylighting-core-0.10.5.tar.gz 711899 BLAKE2B 5f147c010a462c1ac8ac48c0b6c5502f91dd9e62a6e3e10d822aefcc81768e6b3d9cd34ac933d352ce14ea4d21e81e7e4b413373cfe616fb5a30f72416532d30 SHA512 cde536276f6c9bbae78cafa33016629ba2b78bcba317c88af3dac7cd384ce3028bc5733a644cac72e84810751faada2db51abe3a8c717b8db32a3f625fb9d7ba
 DIST skylighting-core-0.12.3.1.tar.gz 782536 BLAKE2B 21d908bd6f3584f7b4de91f5b61f06e9e0dffdeeb4f725f73520ae6bdfbdb482995a3453ba44db212e95585f8268aeb8535fb896f78707ab49c362675e605046 SHA512 85d005dc4fa6bf968f29a1721d669a310261052c68dbe889dc053400de751a8cda3a99a9aa7d19b3921fb81ea482637fd650140776d90207b876e639a736ef19
-DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
-EBUILD skylighting-core-0.10.5-r1.ebuild 1395 BLAKE2B 32186a064bb3ab4f1c493620f1fdcca09507be279d2fedbd738f5eeef6d42ae1972d115a26e9959a2b2d3935523d49bfd579d59fce19287e4ffbf76b185590e5 SHA512 c607fb980f5158def7f31d8543dfc0b38c744cfe89e8a967e04d81d62a24dc515fed9ccf84a85a6eb10254e55bdd05dfa01e0c5e88f62fc4d9ae72cd3f1fd2f7
 EBUILD skylighting-core-0.12.3.1.ebuild 1325 BLAKE2B ed849640e57bb46479f86a1b3604601bbd2bc796c7a017f41092180971cfd75e6ff97a9f50084af5dcfb3e3d0e42a56b37132bd771f3720641f0fc09bfa1f1af SHA512 681171557389773157062329c0221a7e59b28cde4011381f4549b6ab0e2f9afa876af10842bf56184b825bfe08773a254da87cde217a6993fd130fcfc8e4e4c7
-EBUILD skylighting-core-0.8.5-r1.ebuild 1413 BLAKE2B 5908594ceade985753b4074785be807bbf63b3892e3e7a94a155dacc89eda8c3bb84c5f93ee789c92c3111359de798723a3a9e63340deafe2ae69ce5c85844ac SHA512 85f5573aa98612544f01e838012a5185294d48564f37d742d2d24def1947c81aa5324bd0311b3f5336806fb8c8da1ac18c7ac3b615c8aab20a3f79a852c39b20
 MISC metadata.xml 857 BLAKE2B 4ca8ef30cb72a35fcb9c2005289b7450085c5128d1ae5ddbc55eb525e4a053887981f927667954f6a11bba28b597f2a47cb3f4fbd281e1eedea17dd0a3b6e9a2 SHA512 1d1738f6c98adfb33355939067c0b1786c7065d5f8c29a244f6c4ab18ee1539f97ac47d8d1a779ef0b5de5a11d871574fcdf069998e719b62893d147ce652b9c
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.10.5-r1.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.10.5-r1.ebuild
deleted file mode 100644
index 72fb1c369e7f..000000000000
--- a/dev-haskell/skylighting-core/skylighting-core-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,51 +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: +system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
-	>=dev-haskell/ansi-terminal-0.7:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/colour-2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-	dev-libs/libpcre:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( dev-haskell/diff
-		dev-haskell/pretty-show
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		--flag=system-pcre
-}
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.8.5-r1.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.8.5-r1.ebuild
deleted file mode 100644
index f7663f71cac0..000000000000
--- a/dev-haskell/skylighting-core/skylighting-core-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,54 +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: +system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
-	>=dev-haskell/ansi-terminal-0.7:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/colour-2.0:=[profile?]
-	dev-haskell/hxt:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-pcre:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	dev-libs/libpcre:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/diff
-		dev-haskell/hunit
-		dev-haskell/pretty-show
-		dev-haskell/quickcheck
-		dev-haskell/random
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		--flag=system-pcre
-}
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
index ae03824cf6bf..e038281be6b5 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -1,7 +1,3 @@
-DIST skylighting-0.10.5.tar.gz 647857 BLAKE2B fb10b9aa65598176113cc4e1c62b25b267f37c2a7a45decc819f8ac5972a653a2c4c16ded4ce155e7ddc8ac87108b969096daa4a7b68cf4d02a5579650c1575a SHA512 fc4fa852e12c6ac16db0de14744f9b079d0c0b0012edbdd2a9737efb7dbe2e36358b4ce713246e6cde4477b865f469e9eb3e1c2536c0a9acff39baa1de3d2d0a
 DIST skylighting-0.12.3.1.tar.gz 1218260 BLAKE2B 78f26d3477a6327a8e3c99f31ffe3c1d1b57c86730c06f715d8b2db9d267526bf3d0605639679fc38e4faff06e81edc3d2c9d85e7ce3c557b73f47ae8e81b999 SHA512 3eb93400612992d5aed828ebe0c1b76dbfbd7ec9cd0d0d667b524df51968997ffd429bfdbecbaa32a6108903872e119614b16f8aedf00eaf6d9a7b79ccb06c58
-DIST skylighting-0.8.5.tar.gz 621391 BLAKE2B f17c1e729b2f669950ffec8a84bd9018acbd407f1c8c05bcbe65d77986ce72cdf55b0e967ce4070cd72e5a12fe469ee55cc3782401cc15f19da213a5fa92d592 SHA512 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f
-EBUILD skylighting-0.10.5-r1.ebuild 917 BLAKE2B 54ca95483b4a3a0931a6f19985b012fc15ffdc96b22bc337c4a81ea0cb81adfdeb9f010f6d8fd2da557be84aa47c0f13729424aa33ef1e06eaf66ee85b9e5e4a SHA512 6c9008eed04fb6ed973d46df386209d990e8da021fad1e022931611db8b43c6ae2b1f29937a6c9ebf405fa0398ea02a1dd22b5a512fd5e40d3bdd96a54181c1d
 EBUILD skylighting-0.12.3.1.ebuild 876 BLAKE2B 4ee1da2ac67cf87bbc6042efbb1434d130cdb028ce8088db0066f6eba23dff9187a509ea1b10f251f7d09035dcb76d01d051e936017f78ac8b8f9be5602fa7d7 SHA512 151a33d4a610ad87d97400645633e09a19bd86ddd47efb058f749efeb98a49309e2289e0cfa0660099abb3b27e060c19d32d1e2776f58fc6ccc498a2e316cae2
-EBUILD skylighting-0.8.5-r1.ebuild 918 BLAKE2B fc7cbc7027fc74d06f65cdc5c17e76200197f9f6065877262650a960413f461af8f9bdf0db123f773ab6d7266623b5e9c047e963863c067679d21eec9f4b7c2b SHA512 f4663a0acf9e6b5364ba10163b6e394dc7feb28363cbfa69e93febf9488692c95c1b3e668bd0469dc48c93f5ccef0b9fd3457eca6b001bd799b0fd400bae7f2e
 MISC metadata.xml 825 BLAKE2B b862bc0c5008560c8891833b873e74ef8d492992004dd96113e518064b348bd9e152ba36d557cfdd1951251b43498312e8973506748d9880c4c71b12b0af9b41 SHA512 abab3be7afa35a67923015eeab7c21b419a1a299c6c728a7ea226c648dc5611e50f332cb3d5f061bcec3a0b25dffd97dfa708707e690f0fcce6b5757df7cb6df
diff --git a/dev-haskell/skylighting/skylighting-0.10.5-r1.ebuild b/dev-haskell/skylighting/skylighting-0.10.5-r1.ebuild
deleted file mode 100644
index 364760e68655..000000000000
--- a/dev-haskell/skylighting/skylighting-0.10.5-r1.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.9999
-#hackport: flags: -bootstrap,+system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND="~dev-haskell/skylighting-core-0.10.5:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-	dev-libs/libpcre:=
-	executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
-			dev-haskell/pretty-show:=[profile?]
-			dev-haskell/text:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap \
-		$(cabal_flag executable executable) \
-		--flag=system-pcre
-}
diff --git a/dev-haskell/skylighting/skylighting-0.8.5-r1.ebuild b/dev-haskell/skylighting/skylighting-0.8.5-r1.ebuild
deleted file mode 100644
index d14871ce7ca1..000000000000
--- a/dev-haskell/skylighting/skylighting-0.8.5-r1.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.4.9999
-#hackport: flags: -bootstrap,+system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND="~dev-haskell/skylighting-core-0.8.5:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	dev-libs/libpcre:=
-	executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
-			dev-haskell/pretty-show:=[profile?]
-			dev-haskell/text:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap \
-		$(cabal_flag executable executable) \
-		--flag=system-pcre
-}
diff --git a/dev-haskell/sop-core/Manifest b/dev-haskell/sop-core/Manifest
index 52eeec6468b1..1f3737a51d6d 100644
--- a/dev-haskell/sop-core/Manifest
+++ b/dev-haskell/sop-core/Manifest
@@ -1,5 +1,3 @@
-DIST sop-core-0.5.0.1.tar.gz 28666 BLAKE2B 66e40ecddf994165a37c7aa6d6d06cff3a114b15ca380fadef135df6fd19e3aa31c8602b2e58fa794ce4dce0e10fe8fce17e8d9e1f06dd30f0610aec7e1f32d9 SHA512 2866e7c1a29a5585dabdbd6399e5df4003f21dd94d7b9a1b93681c53e1106af528cfd24dab0b918b36d73d0b05db6525201ea3213ab90575c242557ac41d80bd
 DIST sop-core-0.5.0.2.tar.gz 28505 BLAKE2B ec478dd47a6eae08a3b3a462c179fd867e592910dfac1b2d20a5a2f27f565fab15611a3b5a041b89c9284f8499fbafdb75ab1ce63dc7880afd76dbb78e11fc88 SHA512 bf71bc1823c567bc82c3a5a3166cbb4f4826149d66ec0871d11706512ce823b40ce6ce210cc5ba763a423a8d643b1819237e9b7f0950e901d445e05ccd78597b
-EBUILD sop-core-0.5.0.1.ebuild 534 BLAKE2B ae56938d666e86ddff787dd0ea8d6641f3e23deeaf2e3135cc9eec0874e661ef9b9ae85542aa16e0116288a532961e80f3df3329fdbb6ad86c1716ba5d803be8 SHA512 14512597f0384555c1c373a3eb7e716fdcfb90fa31ae7f349592a5025ffba1926dc40349a9b5a43175c6054c56a2e460259a81309ce4a2d0593be95206f71d86
 EBUILD sop-core-0.5.0.2.ebuild 651 BLAKE2B 8d5c0551146b3c8f79367281aaff5fbb53fe70bb5a818c2eba82b239b77edfba1e6cf824916dfb53400e476999435f8c5dd0a08d6c870d01576238bb027aaea7 SHA512 da9f75bc7d364bb99343de10876b796688faf685fed5acbdda5edd04eae6104dacb9cb35840babffb10a5d5b5c976faefd8ca09c233d228ea022c4b6644b1793
 MISC metadata.xml 823 BLAKE2B ef6ad4f3341032f16cb8809569eedb20ad3ccf3b6cda7dcfa6d5cba2c4ff5e93dbd78a36911b4cdb5a230da187e2aeed2f79a26efca837aa1feb907c6332b926 SHA512 2595d587ca977c77769b26415d69e250b2924328317407b50bd9ba1e879bb75e2ef6345ca44cebc86c17fdaf7a3b347e411ded729aaf7a5255df9a2ed4ae90d1
diff --git a/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild b/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
deleted file mode 100644
index bc5901a41bb9..000000000000
--- a/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
+++ /dev/null
@@ -1,24 +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"
-inherit haskell-cabal
-
-DESCRIPTION="True Sums of Products"
-HOMEPAGE="https://hackage.haskell.org/package/sop-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/splitmix/Manifest b/dev-haskell/splitmix/Manifest
index 9094f357dae1..ac16381d231e 100644
--- a/dev-haskell/splitmix/Manifest
+++ b/dev-haskell/splitmix/Manifest
@@ -1,5 +1,3 @@
-DIST splitmix-0.0.4.tar.gz 13821 BLAKE2B 15c2f3b783b98deccf31e2501ba6c67788047ad3bf5c29fbba965c1163506d0055e94bc02894f17df088e67921447893f42a85f5eece7828625d75c177837f43 SHA512 9b8c137067497b94a460d024e1f7c3269e27536f505649face85748a0aaea273d32893a806d9ecf551bd29532ed820004ed2dde47e1099afc3c31519ea5cdbac
 DIST splitmix-0.1.0.3.tar.gz 20754 BLAKE2B b9eecbdc2f05361aaa852afd8f6b0c6ca220b2d09e0a0d598796636ace0f995c39defb6d84c6c3ed1bba2e3822ef1bf48f2f34d5ac4406031c4ae5b6cf6d0824 SHA512 22a3f0759e1c1150aabde01a77b48087509dfc7ff9614e97e5e06af73f533170993ff2e18101d940e7ddba81b8d6e496795be3851fccfa07b75e9d922f325064
-EBUILD splitmix-0.0.4.ebuild 934 BLAKE2B f3782b73fa15b5995421acc439f1bb709893658f3cc29822e876c0d2235f8726bb2854acaec8f81a45251552cdf01af86b47720a0ae7742518609fae1bdda4a9 SHA512 ec30b081c2614e1d153fd84e3e2815a541f81d0e90eb82f6bf6215821d2d116d480593494e43495b5b8c02cfbaeb0c1419943f392bd3f98ecc1f76c603e116b1
 EBUILD splitmix-0.1.0.3.ebuild 1545 BLAKE2B 9111920a5ca6879e2c7ea2559476df546710eb3fc2df9bbefc9bf144bc1d9a157fbe028440934639e69029bf02831ce93dd87c7feb7bc96071a6a6575fac800d SHA512 778cf219b60f5a6f44b1107af7117d1831cc3feea2e546eea24bbba6256e96e3dd8f079b26f48075eca56ce1e7b3f3c4fbb49481b9fabb00d5401ca294eacf95
-MISC metadata.xml 1577 BLAKE2B 7c84e56eafc26b4f076a1e3c47f536ed7727f02ce89fe90107a60c811793af0566458686eccd026c83673ae4f956e9489c1e1fc0081bb8a48c96f48b7209b878 SHA512 4d0b5ddaf0cb80d5351840a37f588e38a3b9a8075e77260dccbc33e2645b5406c88322db9ceff02973f0ae0b222367396334b63f00c48c75f61d89441ae06ad5
+MISC metadata.xml 1528 BLAKE2B 08a690b31d8d4195c1724c3c0e46bb2c7710ed2d0f2d4a6fe05760e91b752c1d807520cd4583a384e8878c6002d8afb8936b336f7afd24cb63ec4c99ea35ba81 SHA512 252e87230502f687093b7637d15964f10fa34261ca53a2b17f05a1668aa27ef42f5bacb896a5b0426165f2c0ab692a89b4dca9df448b85af98e94c2872cb8d5c
diff --git a/dev-haskell/splitmix/metadata.xml b/dev-haskell/splitmix/metadata.xml
index e03ae875fc0c..80f38d62e4f5 100644
--- a/dev-haskell/splitmix/metadata.xml
+++ b/dev-haskell/splitmix/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="optimised-mixer">Use JavaScript for mix32</flag>
-		<flag name="random">Providen RandomGen SMGen instance</flag>
 	</use>
 	<longdescription>
 		Pure Haskell implementation of SplitMix described in
@@ -15,7 +14,7 @@
 		Guy L. Steele, Jr., Doug Lea, and Christine H. Flood. 2014.
 		Fast splittable pseudorandom number generators. In Proceedings
 		of the 2014 ACM International Conference on Object Oriented
-		Programming Systems Languages &amp; Applications (OOPSLA '14). ACM,
+		Programming Systems Languages &amp; Applications (OOPSLA &#39;14). ACM,
 		New York, NY, USA, 453-472. DOI:
 		&lt;https://doi.org/10.1145/2660193.2660195&gt;
 		
@@ -25,7 +24,7 @@
 		
 		/SplitMix/ is tested with two standard statistical test suites (DieHarder and
 		TestU01, this implementation only using the former) and it appears to be
-		adequate for "everyday" use, such as Monte Carlo algorithms and randomized
+		adequate for &quot;everyday&quot; use, such as Monte Carlo algorithms and randomized
 		data structures where speed is important.
 		
 		In particular, it __should not be used for cryptographic or security applications__,
diff --git a/dev-haskell/splitmix/splitmix-0.0.4.ebuild b/dev-haskell/splitmix/splitmix-0.0.4.ebuild
deleted file mode 100644
index c658af591847..000000000000
--- a/dev-haskell/splitmix/splitmix-0.0.4.ebuild
+++ /dev/null
@@ -1,33 +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" # circular deps: test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast Splittable PRNG"
-HOMEPAGE="https://hackage.haskell.org/package/splitmix"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimised-mixer +random"
-
-RESTRICT=test # circular deps: dev-haskell/splitmix[test]->dev-haskell/base-compat-batteries->dev-haskell/quickcheck->dev-haskell/splitmix
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	random? ( >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag optimised-mixer optimised-mixer) \
-		$(cabal_flag random random)
-}
diff --git a/dev-haskell/statevar/Manifest b/dev-haskell/statevar/Manifest
index 56992018af4a..cf4795f42a6b 100644
--- a/dev-haskell/statevar/Manifest
+++ b/dev-haskell/statevar/Manifest
@@ -1,5 +1,3 @@
-DIST StateVar-1.1.1.1.tar.gz 4762 BLAKE2B 17148fe888eaf0fafd73812cd9ca1c1eb6b61c3a555fff63608bdff14845320c433a49ec6680dd756c65dadacb9673ffefb74eabf0d38fd2393d9c601624210d SHA512 4b4d24dee812dafce1b5d08a6a7034edd005f2128012276cb8f43a413597a1303000ab625b3458a287840ea1d331d0659fbfde81bbf83933156870f107c31610
 DIST StateVar-1.2.1.tar.gz 5055 BLAKE2B 45a9e509deec9988debdf906bfcb3f3fcd04fbd42326ea5eb74b697fa761d2d4a696c84deb0d5634aac0a4d57af3ef56cf612b343afb53f00c2eec4b96d53801 SHA512 867e38b309a0cbb5a3aac1183b6388aab6e546cda799b0668f3e9534556df4b73558295a706b2859c1edb20e89dac7bf8c4f04f839d40ede2c36a2ae7eab6259
-EBUILD statevar-1.1.1.1.ebuild 668 BLAKE2B b4cca3d50b7cc258ca7ff00f6a070c640e6f104e6df9165095fa58ab6d7975197e3781e00e51fac630d3f856db5fbf2dbee088009990422c3bc732d023aa468f SHA512 03c451fb56429533fcc3aa1e0a73d706b0a751de53395ff0b6e75f1d19c60b42c6080c8d151debff8714bba832f40b290f80957b3c33fa8feb6ffeeb21172a13
 EBUILD statevar-1.2.1.ebuild 675 BLAKE2B aadd936da8cd5e145e5bbef88773624c5f04fe05b9bd167eb74a217042a9cf34f6ad15cb63835dca818d2da52bb5fca013c3ee564793a8f139c0a488def8a93c SHA512 eedaefb5465d406fa5eb19c23a726fb19bc8dcf0fceb4229ae2b2f891fb58bfb4f51358e0c94b506b71a6565306dcf6ab1d9b9136da026864b500bc2c4f6d5d1
 MISC metadata.xml 500 BLAKE2B a7aac207aa7734f02f88d0e8a63ebf93370ada58b2491889fb558d6d57420d100ea7dff339a334136b8cb26e3ae488228e0ca85efbe3d7adfa22bdb9c4576e72 SHA512 304162635045f7432270fc232e97619f4b6182a1529ee7770cdfc4cf463c1fe84f1c87c722d8d0bd455267f9af17e45a0bdd5e66d2facd8442956035c9e0ed24
diff --git a/dev-haskell/statevar/statevar-1.1.1.1.ebuild b/dev-haskell/statevar/statevar-1.1.1.1.ebuild
deleted file mode 100644
index ab994a0282bc..000000000000
--- a/dev-haskell/statevar/statevar-1.1.1.1.ebuild
+++ /dev/null
@@ -1,30 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-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/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/strict/Manifest b/dev-haskell/strict/Manifest
index 7348b625c10c..accc9dfc3806 100644
--- a/dev-haskell/strict/Manifest
+++ b/dev-haskell/strict/Manifest
@@ -1,6 +1,4 @@
-DIST strict-0.3.2.tar.gz 3948 BLAKE2B f882834fdd7b6df5c1f7c56e93f895380ff291096feb73b627ba26c7d6f41555ef6a135d7d5fdac19f28c48869f9987bd510530300f968482538c79fe1842286 SHA512 ca27ee2b557669c409c0417b2005ceb612ad95040fd4a798535cdbc83b8b7a51a36bb66bc2e7bff04b5b965313894a51910a274d67a891530ed119c831bcd686
 DIST strict-0.4.0.1.cabal 4187 BLAKE2B 23e7e19b4688a29ee88ee126b7b8d6a7b0176e49bb1ede058690c5ede987f414461a9335a6d5f2f82fc3db46e7c2a62c1773fa6933edd52ed5f09352a2744357 SHA512 f9c98f54d281905ba6f35df31344a4d210a091def005f076f8f613397dc2fb662199f85159a8b513ff1cb28fcc2ccce31449cb51c3cff476232bb43642587621
 DIST strict-0.4.0.1.tar.gz 12488 BLAKE2B f652ffa4778d2ed50917730848d469f4a6a3ed2ba0973ccc929891c59b7edecf6492cce807eb5bbc3188f4d21799193e43f3fb34b6230f4da1860d31315b153f SHA512 e0c37396fa507ad4d03e46ce4a02ec5bacbd7add75ca551433671871d3e7dde0eb0c620182904d1bdeb7b80e1b311a70f36030cbeae63d8776059150fef30235
-EBUILD strict-0.3.2-r1.ebuild 531 BLAKE2B 7b74345c615627dd2596f31e00b6e5e7d02a04685f0dd78ef71c7536560474d0edca1a8273c51d0f7e964318e4849c61deabdf77b13340a9160e8ec904b33128 SHA512 ae5dff2de74cf7c098fbc48072c6016d43198d54ecad62d2bf7d8b9ec8bd99933aed252f35fc28cc0f76ca88a9670cdac667df4b1d48e59066f2652e01988a3b
 EBUILD strict-0.4.0.1.ebuild 1253 BLAKE2B 968af96e9f6475f7f6a579bf47af96acc9823ab86eefddf5947b6a2b25531a6a8008436cfd0f6376fd93ff837444c99f63bbe71c50dc0b75e87ed748f6373504 SHA512 68619a52fe6f05f5025a565abd0b33471f65e0fe24ba2bbb95260648f85cdd6b69ceafe4aaa83154fda53ed3853d90e101d27c35a54f7997f8a3048d92af9029
 MISC metadata.xml 435 BLAKE2B 9455002a549644c963161d161616aafd6c5fcf3ae0741826e105afc11063b16b120021f77dd6df26a5ff5ae668cbd50b29bdc2e4d3b81bd0dba1a93d31597d01 SHA512 8d1e997fd3772bbefd98f614f7b22871300ecbd0d20097f39fe7b7adb773dc0caa2bb6b0e5731ec8023c23432fcb0ff010511af4e0edcfe44b6ec560e6421454
diff --git a/dev-haskell/strict/strict-0.3.2-r1.ebuild b/dev-haskell/strict/strict-0.3.2-r1.ebuild
deleted file mode 100644
index 44d222694651..000000000000
--- a/dev-haskell/strict/strict-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,24 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Strict data types and String IO"
-HOMEPAGE="https://github.com/haskellari/strict"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/syb/Manifest b/dev-haskell/syb/Manifest
index c3b9566cd00a..dd8b09696d92 100644
--- a/dev-haskell/syb/Manifest
+++ b/dev-haskell/syb/Manifest
@@ -1,5 +1,3 @@
-DIST syb-0.7.1.tar.gz 39594 BLAKE2B c7304aac08dde400d26bb296b2f9d5c5d148949d8d5469daadd83110d63f1c3865c21fc187494f5fc11f21708717d917f26fee1bca611d2ea4c998dc0fdfa62a SHA512 63a3138f7f824a9bc611b9d025d4e7adc2da8d420d260b66d56190db683a0afac58e4794e94b13d4aa7b423d949e55a1ed0220c99d368973117b5056fd0f4e65
 DIST syb-0.7.2.1.tar.gz 39768 BLAKE2B 347070741b2ad623fb4e1bfa349ddea475c2c846119d5418ad67dc2d8441a7cfdb4d4557efa2fa9ffa229ae83a1e6a8175423259695417a238c34a128b6fcf71 SHA512 6c356af3cc72f29c362b2859292a96b8107dd3241cff79d717f361e517edf478295f477c0f426fb8d0ae0952cd5c7521114cf1cac1f3faf2b0c96d3b8a335e69
-EBUILD syb-0.7.1.ebuild 599 BLAKE2B 0899294f60d3d62e13ebc5d353e25bc23ba486ffbf71111b6827cb060523864d89948c710bd5666f1331b7ca8a8424add23f461f950443139da131963c0ec58a SHA512 fff8b100de793fdae342397939a390f0bcca596bf6b89e9a44f81102ea45708fcfca2a1f746532267a604729f17bebbb5a09c912ae978fd606d7c7e792043e34
 EBUILD syb-0.7.2.1.ebuild 634 BLAKE2B fa53ddfafe764abdc8c54deb16729f5693bc5daffba90f99700db1eee518960b492e24ff3612684b6887ba4a7e22824153721caae13cc3fa24c267139303ad17 SHA512 d1502f4c275cbc158c50212b6083f1601d7673805b16c43824d4e87c8d1c159da79326ead9c24a2696cb193f458db4fb587c9004b45e541f469f2be01ef19bf0
 MISC metadata.xml 618 BLAKE2B 5b4d7058af02f7ad7ea3f371bc818c1337856aba00e9e1e384fa446229f2f20cacd9cd766b28e5db62e27cca85302524427de7ef80131df0f993d53828da21e5 SHA512 5291e2f9c6fb41ac042c9faa5097eff17848fa57dbc7f1639be42a5203b715044be5415413884993dd2af595a208461c0409e07aeff56166f63e9fef9e8ad2c3
diff --git a/dev-haskell/syb/syb-0.7.1.ebuild b/dev-haskell/syb/syb-0.7.1.ebuild
deleted file mode 100644
index 38f3f4c8007e..000000000000
--- a/dev-haskell/syb/syb-0.7.1.ebuild
+++ /dev/null
@@ -1,26 +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="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl )
-"
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
index 447fa9f305ca..1c5df4ae982a 100644
--- a/dev-haskell/tagged/Manifest
+++ b/dev-haskell/tagged/Manifest
@@ -1,5 +1,3 @@
 DIST tagged-0.8.6.1.tar.gz 9842 BLAKE2B 6069ea3705dadfec7bc59d81cd9c425e01ad02131e9b6ce4657ad2b59d61a8dc8a420e518ed083a0d8d6b7171e5c233f3a9d96b15045b738c97d4f86fa3887b3 SHA512 289be845821aada538caf3fd0fc85b8ed115c657dc5beb0408816e43cf72153881ad305a982effa572a46e5b1842d2772af44313674cb0a252db8aeb6953f345
-DIST tagged-0.8.6.tar.gz 11759 BLAKE2B 6461a8489d782c1d5d49454a662c64a2cd3108ca7c0fcbe598cb8f11c7792736a61855d3c830234e31d8de900b2a191d7529557711d4724c51d38a88a7948637 SHA512 8cec49ea6f54ba84109ec6068cce209321bfa4662d5acdf75e4019087e2890e3056bf13a237cb5caf3fec597b05b710ebbfb74e06b736b7fb2f87941defeb814
 EBUILD tagged-0.8.6.1.ebuild 898 BLAKE2B 75caf73ce7a7648dde79f7cd6e241ea8541b4b72b7379f11f2aba8e626ba3bdcbb7e60228a7ea336a8efaafb8f3140ae207c2ea7ae06907e389a17199b7a2644 SHA512 6c9ee17246c967726b0f56f991358e3472da74d76f34b9c98681d490fc30362ff3b4c41672799afc5af6b9e0c79ae47cccf3e075b48eb3f13990ee811d759efe
-EBUILD tagged-0.8.6.ebuild 998 BLAKE2B 7e7d0b30f3395ab635939b6cbd00effdc3c29b42cab69b4c65642937e1e607c015c69372dfe161a4ce40189642825541a1d4f413dddcf3b863da8741190840a4 SHA512 ada1b1a123849d5a5f9a9a1ef6aad0685e2f206297e49cd232f49389979058e305f2cf24d149ba0622b21268d7b0fba9a2323ff6f67a517e892cabedd204484e
 MISC metadata.xml 328 BLAKE2B c84a2a6711103a1941f52cef135d716d2a4c467b831b5f9e7d86f7ad36775a6d59aadc62c53ba8c66ed4347daf4be4ffc99fb65133024414dd13911133ee27e8 SHA512 5ff5102dc3e727c8af922e78f5578b2e986c276dd485142a94192d460ba173dbfb849f5a06933a3773fcfe6c3ff64aa3288a592f51beab8edae99612c58c3a4c
diff --git a/dev-haskell/tagged/tagged-0.8.6.ebuild b/dev-haskell/tagged/tagged-0.8.6.ebuild
deleted file mode 100644
index 780f35eefe27..000000000000
--- a/dev-haskell/tagged/tagged-0.8.6.ebuild
+++ /dev/null
@@ -1,40 +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.9999
-#hackport: flags: +deepseq,+transformers
-
-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="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
-HOMEPAGE="https://github.com/ekmett/tagged"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'template-haskell >= 2.8 && < 2.15' 'template-haskell >= 2.8'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=deepseq \
-		--flag=transformers
-}
diff --git a/dev-haskell/tasty-hedgehog/Manifest b/dev-haskell/tasty-hedgehog/Manifest
index 397db1ae3ed2..b447b179c3ad 100644
--- a/dev-haskell/tasty-hedgehog/Manifest
+++ b/dev-haskell/tasty-hedgehog/Manifest
@@ -1,5 +1,3 @@
-DIST tasty-hedgehog-1.0.0.2.tar.gz 4387 BLAKE2B 3681115e233a1ff73b026caf18862825dfe1b94bcab1f4f48fd8aee619b1e263eab412ec0820cdf0929cd2d5a66bb6beb19be0a39ba59183c540316ec1e5cd4d SHA512 56ac4db27b97bc6902633ec398bdbae28f6121d818a29fde62ddea4a4619af0fe7b058b55479414a627119a0014f2c84d6b795c86e9e36d21fd25bf1033a9c4b
 DIST tasty-hedgehog-1.1.0.0.tar.gz 4610 BLAKE2B c0cd4e99531d8425381e2aebb62a407674226bfe205874a0a512bc65383e237a4bbfdf6be4d65b30893212e09dcf68d42f11e89b349c6db535a359fa845e18aa SHA512 48dda3dda14241f8d8dc77acf61a0fe77887c835ae9de6182c9fe580bb79e98f2480a14c282ff49b1438ffab197812262529e90dcec2af3785713f218490bce2
-EBUILD tasty-hedgehog-1.0.0.2-r1.ebuild 1093 BLAKE2B a0c32725fb564d2e84ec59791c9ed5acbdd67806e8faeb17d2e79ff8e6cfa643b4c7a8e1c576a04e69f1cc90dc49004f6949ff27f50d7938a6889aeda5e273e4 SHA512 d8014a02bf694a8515aabb48033fddbf7262a8d98163fc91a3732b389c26085e230e23e00a5a8e2049fe2938e041d93829bf54fca9c5b896184ee13ee9506cc3
 EBUILD tasty-hedgehog-1.1.0.0.ebuild 972 BLAKE2B fb1df0b65b4d364a98d7ded207ba06426b4eaaa67f469f1757475e0fdb2ba586d663e0def349ab9f677e5e9db000de39db5ddbab8863100d27bbe90f4d6d09b1 SHA512 64aecbde65aac7eea756ca05dfdc16da28fe299a0f39d39893de18ab1842f5f9a8686184a98ec830c6d8dea1d5ddb811f0bafbb10110bc732d1474a09937173b
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.ebuild
deleted file mode 100644
index 00d5c2279d89..000000000000
--- a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.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.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Integration for tasty and hedgehog"
-HOMEPAGE="https://github.com/qfpl/tasty-hedgehog"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[profile?]
-	>=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.13 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.8 && <4.14' 'base >= 4.8' \
-		'tasty-expected-failure >= 0.11 && < 0.12' 'tasty-expected-failure >= 0.11' \
-		'hedgehog >= 1.0.2 && < 1.0.3' 'hedgehog >= 1.0.2'
-}
diff --git a/dev-haskell/tasty-hunit/Manifest b/dev-haskell/tasty-hunit/Manifest
index 00295334633c..9081e4fa7d21 100644
--- a/dev-haskell/tasty-hunit/Manifest
+++ b/dev-haskell/tasty-hunit/Manifest
@@ -1,5 +1,3 @@
-DIST tasty-hunit-0.10.0.2.tar.gz 7403 BLAKE2B 04813c3d35635ee296e28e19d76136f59e3d196a8e6a9c4410f6a7ee20996178f4c10aacdf985a73b989914099a86b1b1ab930e21584e714150e041b401e3179 SHA512 82f70cd7813affeb756de89842a77070e688169eb35a386fbc4db36b65d8c960bca7b923294918e10b65281d3265820f9592398550af8af92027960d48562fd0
 DIST tasty-hunit-0.10.0.3.tar.gz 7885 BLAKE2B a8e8af2b1fcf575646620ccb4d822e6cbf688372dacf0686a7c3760ad693f2a7d88f280ef9e43eb9cd757f89d2771368adf567a9390b1a35f9b1db5aae7c5d81 SHA512 29adbf499b8079c12c756e031c3bebffa1c312cf623ff77d4fb2e85d3462ac6e71aa8a13c3e161ef04ad5bbf910c3bb5f4b62bc3825a030b690a90eea812b85a
-EBUILD tasty-hunit-0.10.0.2.ebuild 622 BLAKE2B cd080acf26a00324f75843b52ac295d7f7531afcfb976a803b4513fb62c80263f89dc39c79ddbb46abbc367096e23afb782614c9dd74a06d3cbe413a967e85da SHA512 a38e8814495411797ed6135b16f836764757fde5a8e3b92606920fbd646051b85ba1a2111278a7096e443e99608dd699d871845db7a2af431bbcfb17e12982e6
 EBUILD tasty-hunit-0.10.0.3.ebuild 629 BLAKE2B 1a5506eb3272095f0ad549b00d10ef1799301adfbff3b22981444093b1380320c595b7a1ff601bbce5321624ad6380bd7b3402cfc0a792c826aac6a0dad7bb44 SHA512 a2df911ea6f445f85f703aec6c1ccfd98b1ecb1c33205f464094b7dd693210ade8df719e146ff10bfd629ec4366d23338571e694156819bac71d8b1bec7c93e3
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
deleted file mode 100644
index fc1555ed3146..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
+++ /dev/null
@@ -1,26 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="https://github.com/UnkindPartition/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/call-stack:=[profile?]
-	>=dev-haskell/tasty-1.2.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty/Manifest b/dev-haskell/tasty/Manifest
index 1b197760d643..cd1ca2bd0c3f 100644
--- a/dev-haskell/tasty/Manifest
+++ b/dev-haskell/tasty/Manifest
@@ -1,5 +1,3 @@
-DIST tasty-1.2.3.tar.gz 49148 BLAKE2B 8de7436bca740e55a6592e833326b03f001823c74c8678ae5d38c2c836249a9af08321df6245573e5d060a25e9512c1f601a62978f2b3f22ee846d3cef72a829 SHA512 3922fc19c3ed74b1a39f8e6dc5fe243a955ab55d2e9d08d68b0932dfa0d16cb1efbc73bb2d793c1226d56986141494ce0490c9af70e7e612d07da64d5e2ee472
 DIST tasty-1.4.2.3.tar.gz 58549 BLAKE2B 7e806ef62a455a9bd71782800e0a53b327963ea12e7dff7bc508560457dc84c6b94aa8a8b67524b3ea8b7629d5d78bd63a56790e9bbdb356393f306b271b97a8 SHA512 c5f03406e4a7b0c8ff98de285cc778a7751c535d62bb69da962f78ad4eadaf76a74d3bd2c81b1c7553b5de4a527be964c568a8311929a0dce44389c3fcaf521e
-EBUILD tasty-1.2.3.ebuild 993 BLAKE2B 8bd6d789ac539541abc21532fe275fd1b224ec080b20565979341ecd606797cc1b7c60c51938aa5e8fff6e86a276562a8863545f1db0ff9de36c1003e6d35ac4 SHA512 d64756f454e0ff1b55000a014c6a7b2e5b221617f6a3d8a0a21cbe79b4ad0fa4145717d91e69ac36c3f9137d52c5a3c4dc6aeeef72b3426e3a9847ab66d0594e
 EBUILD tasty-1.4.2.3.ebuild 955 BLAKE2B 09ce131858030e2e593cf6928f0e4d18e73e128e0665af40bf8749de28aa4f4900526c706f6caff922620c487e1d6fec3b0d5bf426e6d6817152d7c11f955983 SHA512 36fc21296a34c44523d48e355ab517889f74abfdb52ae2003ffede8ecdb39c131d6b2bea5f33812fef0437a525b7321bceb7d28a663739d188463054e878d5ca
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/tasty/tasty-1.2.3.ebuild b/dev-haskell/tasty/tasty-1.2.3.ebuild
deleted file mode 100644
index bfe4addf2901..000000000000
--- a/dev-haskell/tasty/tasty-1.2.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: clock
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.9:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/mtl-2.1.3.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	dev-haskell/wcwidth:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/clock-0.4.4.0:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=clock
-}
diff --git a/dev-haskell/test-framework-quickcheck2/Manifest b/dev-haskell/test-framework-quickcheck2/Manifest
index deafd8b81b8d..ea49663ae3f0 100644
--- a/dev-haskell/test-framework-quickcheck2/Manifest
+++ b/dev-haskell/test-framework-quickcheck2/Manifest
@@ -1,4 +1,3 @@
 DIST test-framework-quickcheck2-0.3.0.5.tar.gz 3844 BLAKE2B 1c7ace7b85200d3ce1bcf6a48dc10d912c4cfa255eaf100b37d018128a4e014703cf378b2fee74355c1731d9062c68b164da96f6f672a10af460d41ed2b2d2ca SHA512 58c6177d52829ba1ea1858a11101e5b21ae4e4543f8f829779f62208ad16083b41e9f3b2275392693698ef3d46912096c368d90db0d67ff136af4fa73d5e1d43
-EBUILD test-framework-quickcheck2-0.3.0.5-r1.ebuild 1082 BLAKE2B 8c7b3e91f866e2eaf6b94b50ee398444290d80226586ab7edb1c3597d41d30411e9dc25aa06454a2e39109f6b1f94f52d071d7efc0fc116e4d529d1ae94cab67 SHA512 22b550a1697dd662242610481c1599fb9df95517c0c8d2bc1435c24df2c29a17b2f1dfd08d62ba66f0583bf46676a8160413858b35dff9d4ac5409b42b6e38c3
 EBUILD test-framework-quickcheck2-0.3.0.5-r2.ebuild 1165 BLAKE2B db1cf92b3151cea8de5cadbc76e8f97c86e23d9e5ae53f35828511f579cc1d457f635569d52a2f849f39e8cc8769d05ec1f23d17adee65374c781d05075c36ba SHA512 71c9e1db65132d33e134e75e3a2d64a1fd1750253f19da4b02bcf36a3f61856a08d6d9a9cd84f1963ebd541081aa3e51df6c3f1851e8952383356bbe01a4bd19
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
deleted file mode 100644
index 17814ed154f8..000000000000
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
+++ /dev/null
@@ -1,41 +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.5.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck2 support for the test-framework package"
-HOMEPAGE="http://haskell.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
-	>=dev-haskell/quickcheck-2.4:2=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck            >= 2.4    && < 2.13' 'QuickCheck            >= 2.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/test-framework/Manifest b/dev-haskell/test-framework/Manifest
index 8d41107d5b71..ac6a78d232bf 100644
--- a/dev-haskell/test-framework/Manifest
+++ b/dev-haskell/test-framework/Manifest
@@ -1,4 +1,3 @@
 DIST test-framework-0.8.2.0.tar.gz 21317 BLAKE2B 80065ad3d87188a8310e93b9caaaca73c3176e150b254fe29dd3e08d38f7a7066119b132f6c747a35a87a13764d115fe83b131a023667a3919c0f1c0963c770a SHA512 d8e7ea274819a1b49b9f938df527d22c808f456d25b84f03173ed57dddd39c230fb037a57ce90c38f571801ee38e86bed6826df1c93f184e4a803c72ce5f41e4
-EBUILD test-framework-0.8.2.0-r2.ebuild 1727 BLAKE2B 8c6a015f85bdf78f4ca1c73c7a94a3e57c2b4d422c784efb8db8cbfe2479e48339fb183554ecf4e82852af396ebdffbef1e915dc718350fbbdc3db6a90fa7ebc SHA512 8ab07824a70dc730d2a1b325c7cc9111b861ef8f6e322db87c46857c92e9237446a8398a99368ec6f29daf9a55b49bbfc723a15565ff3ca18bcb3647fd66bc76
 EBUILD test-framework-0.8.2.0-r3.ebuild 1798 BLAKE2B 33d5e86b6b8cb4738196783242438c657c97e7146d63b48cf79d7d22f1022ed24bd4efd749cef8c548cbc85e9ff8434ce9b056547c26751bb59d6841ddec89a4 SHA512 64239434d64960aec84c9bc712f361bfe3e12a64f1ae95e1532f721fb5cab4b8652dab107620a2d2b1286621e9a5f509e513ab3ed6687ab1aa9037f1baeb5367
 MISC metadata.xml 619 BLAKE2B 5dda0deed2ea136a6b18221ddc28243559d72b47f554da14099cc1ab7a4df7eeb779cf88e169d7858c06e353b11d2aeb7721a35202f619d24c9c35639914f449 SHA512 b079a7931fbdad02490f0e12a81322a936e751480368f9389405c30740ac447a0d7ea542be38c2c2465d33fd97099075deba8d3a24f48b6bde60cbf2f6f05234
diff --git a/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild b/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
deleted file mode 100644
index 6b272d908245..000000000000
--- a/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
+++ /dev/null
@@ -1,48 +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.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: missing modules
-inherit haskell-cabal
-
-DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
-HOMEPAGE="http://haskell.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test" # tests are missing
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/base-orphans-0.1:=[profile?]
-	>=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-posix-0.72:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?]
-	>=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'ansi-terminal  >= 0.4.0  && < 0.9' 'ansi-terminal  >= 0.4.0' \
-		'base-orphans   >= 0.1    && < 0.5' 'base-orphans   >= 0.1' \
-		'containers     >= 0.1    && < 0.6' 'containers     >= 0.1' \
-		'semigroups     >= 0.18   && < 0.19' 'semigroups     >= 0.18' \
-		'QuickCheck     >= 2.3 && < 2.10' 'QuickCheck     >= 2.3' \
-		'regex-posix    >= 0.72   && < 0.96' 'regex-posix    >= 0.72' \
-		'time           >= 1.1.2  && < 1.9' 'time           >= 1.1.2'
-}
diff --git a/dev-haskell/text-icu/Manifest b/dev-haskell/text-icu/Manifest
index 19be5244d0e9..2fba2f8bda0c 100644
--- a/dev-haskell/text-icu/Manifest
+++ b/dev-haskell/text-icu/Manifest
@@ -1,6 +1,3 @@
-AUX text-icu-0.7.0.1-icu.patch 394 BLAKE2B 712015502f7692141388cf7d0c8d5650d6a44f5ab246a2ba50a2baa26660d1938aa10d595263244e6974487f2419b52bf713c4527026bc4f7ed2b1a97faa8ee8 SHA512 ecd63935a4f5343fdfbe5be3d319b3db29ed21acd6f7d444ee6dad022fe6da37db975697650fcf1aa48e17c0ba48b608afd6bade06f4cdbf80b56e20480f54d0
-DIST text-icu-0.7.0.1.tar.gz 45533 BLAKE2B 1eda34ad7a8bcaa26814cb4fdb864e67531aca5dc80ece9a71dd770022ec7729e7e2960729c707ab9b5d4e8ad3b112e50572d26a2f2a573ffd6f3c914a0b5545 SHA512 54551ce0d629bffcca32fc855bfcdf2e24282359ce3a32578a98de4f4ad15378fa7df98c59d73323549a2ac873b10a10202bda02f5be83fbe1ab945aac5e50a9
 DIST text-icu-0.7.1.0.tar.gz 52490 BLAKE2B fb66502b0a18d8d2a0f1dcb2240e9c939b04b157acac31b62fbe65a6d5edd6244a4713d712e6b78dc54451b52d3e78d9cd8bc803e7bddb319fa8ed016c162123 SHA512 807a1385b7601edcfa6142a8e107df1b3c2820974218e2bafadb8a42eda3b68a0a16d222d75120b422e5ca9f4cd4f52f39d2b7938a541692ed4d633d5750089a
-EBUILD text-icu-0.7.0.1.ebuild 796 BLAKE2B 7d7b522979e3885a2fa26542a3960fb81efb26d6307e8194baff4eb2dc5f508028f05ea93bac2757c67687898d93967fde9a33db132a33cccd49ca47e9793868 SHA512 475a11988c466aee1ef23163fb3c304d6c4ea40226f1d0f62b39d135b11677840162885fad86e93101bb00938a936b7bf59fa709349f0ae2bf07935c9963926e
 EBUILD text-icu-0.7.1.0.ebuild 963 BLAKE2B ade88e28981430d7cf66f9c51985f395452d470668781f002b0b56fa9613fa1b30a6eee5e60a157a690fbbe9734c53782fe88ef033719e94ee963f4846ded230 SHA512 99c0f79be20fbecbc34ccd70e44d37c2455c4ab6654a142ba9b05c6bd89bb087f4bdfc5cd03800a37ccedd91d38308106f38e321664729bf1960bdf1e58e1bbe
 MISC metadata.xml 1376 BLAKE2B f8eac75846f100d7c4ce35babeeca51e675183f9b3b51a36e7843285605f8b74ca348ca65ac0cd0e44c9c50ad938b692b0f2c4739dcf71900315fec818e126db SHA512 9df90d53144c31dce7b15ed8bd798eb5fe1b222a179c46a6d9ea1e5044114e1e6f23c9e04285e790e9c3bc7828577dc7886d9ce2a2cd327176f0bfa52197e9a5
diff --git a/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch b/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch
deleted file mode 100644
index 5a29309e7c45..000000000000
--- a/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-icu-68 disable TRUE/FALSE by default.
---- a/cbits/text_icu.c
-+++ b/cbits/text_icu.c
-@@ -305,7 +305,7 @@ int32_t __hs_u_strFoldCase(UChar *dest, int32_t destCapacity,
- 
- int32_t __hs_u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2)
- {
--    return u_strCompareIter(iter1, iter2, TRUE);
-+    return u_strCompareIter(iter1, iter2, true);
- }
- 
- UBlockCode __hs_ublock_getCode(UChar32 c)
diff --git a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
deleted file mode 100644
index b6a0e16ce943..000000000000
--- a/dev-haskell/text-icu/text-icu-0.7.0.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=7
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken: test-suite
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ICU library"
-HOMEPAGE="https://github.com/haskell/text-icu"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # QuickCheck occasionally finds counterexamples
-# and fails to build: Duplicate instance declarations: instance NFData Ordering
-
-PATCHES=("${FILESDIR}"/${PN}-0.7.0.1-icu.patch)
-
-RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/icu:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/th-reify-many/Manifest b/dev-haskell/th-reify-many/Manifest
index 8ca7667777e3..863763dfdab1 100644
--- a/dev-haskell/th-reify-many/Manifest
+++ b/dev-haskell/th-reify-many/Manifest
@@ -1,3 +1,3 @@
-DIST th-reify-many-0.1.9.tar.gz 5693 BLAKE2B c70b758a843b3d76982d89564a9cfe5fdc55d97ff05f3622e86b5160e06be22dd8fb870978b8da093ea5642bc1879ff7f5900fca4ff1cffe5f078ac8ec347155 SHA512 6d6f3cb939c172869e88a14ee800aa7760e090df55e0105f41ddc501c0a4bb60d59a66fafd890475fc3074a4fb25d7583570e2cfe32ce69f43c8db9663b0f110
-EBUILD th-reify-many-0.1.9.ebuild 662 BLAKE2B 3d143ab39d6a16a9017fe9b701520461a5c58df01172783104c0d599f6bb60a4c0ea81fd21baa51822d69505c9325298835fc754d5e2fd3bea9ddf11cfbdc099 SHA512 0c4e24f0b7c6e945a9bcf341581678f46559d4bdd3fe74c346ce4296fab6bb644d5ca2ef324c0ad77315369261fcfcec6f9275864719e907ba4e5944ec4e8439
+DIST th-reify-many-0.1.10.tar.gz 5825 BLAKE2B c3ff8235c04e2dd8507d3381ae45fba7e84a1117ba1feaa78856c6313ae80d957a60f23d22c0b1eac2e315c16db4b8e12fa1dfaf4665d8207ad759a3a55258dd SHA512 9c5b64e791a0649d7e05a471cfc1b6e84e50c90a3711ffd7304c2bd8af9623ba3c026e68fb36bc0497f9f67e18ad2d76902d96fa98220399e8feaac2b09d51be
+EBUILD th-reify-many-0.1.10.ebuild 569 BLAKE2B f8b02944899cacc96c5d7edf2e2d97c08b6450e71f8c0be5d9d406d88ec1020b4365775d45d05fde78b7508e1b4af468284f5397a4687f0282e8ac7d30d6e5dc SHA512 0ab097a4452568f05872e18ec0f31a730fffaada8ab4fd618b2b7b231c65873c6aafdef4d9bfe89d6cfffa5f28cf97cc6ee38dd401842961df5ec49757ae7926
 MISC metadata.xml 641 BLAKE2B 50d1f9882a9ffb13ba8b431ea9af156868280032a5587aa4ee57e5c9b96659829d0a7c256495eff04f017b347a60fbf50c019a323826ef9308e224d33ba96d01 SHA512 37d77ae57dfc291833cce6892faecae6f6fc13fcc27b46ed6c80f383cd71247f50cd4bfe1c2c2a0e4eba7bc21d6dd5f96cbd5eed9f100506459caf6495f56e4d
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.10.ebuild
index c1bfcb59111e..8ba1fd64479f 100644
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
+++ b/dev-haskell/th-reify-many/th-reify-many-0.1.10.ebuild
@@ -1,27 +1,24 @@
-# Copyright 1999-2019 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.9999
+# ebuild generated by hackport 0.7.2.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Recurseively reify template haskell datatype info"
 HOMEPAGE="https://github.com/mgsloan/th-reify-many"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
+RDEPEND="dev-haskell/safe:=[profile?]
 	dev-haskell/th-expand-syns:=[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
 "
diff --git a/dev-haskell/unicode-transforms/Manifest b/dev-haskell/unicode-transforms/Manifest
index 874885b0d1eb..aa178787128a 100644
--- a/dev-haskell/unicode-transforms/Manifest
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -1,4 +1,3 @@
 DIST unicode-transforms-0.3.7.1.tar.gz 717790 BLAKE2B aabdd2496ad686d203aa0d8f9c4d043e35c448b1cb83546858e487a6f0e6f05f2cd6467be8c0bedf1bac7fc0d45a711b7faa438c433b5a144ad2e7c3dc20df97 SHA512 a4e39b943bcea6c86ebb8df7253a39ecf2a7bf5a083d0cf2ee1e5720af4afe47111330a787353a5728793d02739448debae2fd73fe6ba2d0eb94cbbb4bfef30f
 EBUILD unicode-transforms-0.3.7.1-r1.ebuild 1101 BLAKE2B e3b60ad1b952bb50cd136901c988af3e9c315b7a03626806aaad130d7776ec1b26c6d2f43ad518e9d54825320c4782f0f4931706c0ad48a3de45fcc8dda24d43 SHA512 e6024bd210ad2ffbf7c902d5cf72ad77c3ec76aca77c161fe737f9046010228a3743f55362a5d637bb898b2bedc66dca2c40f94ba1fb5bddaeaea4b8217edecf
-EBUILD unicode-transforms-0.3.7.1.ebuild 1002 BLAKE2B 50192af814687df1671c0e553640c8406451e055e83a822c4ede9de4e50c054c503689b185c5f63a39d3a33d8ec3108e9ed1dec69430fc7a0a0f686551ebd143 SHA512 fe2ec4763486965f877254a1e3212c4d1447a9a4ccfcc8672a93d7900655b604d03472c45d73f71b12807d4720735edd431264c296850ac29fd0cdb2f3b38df3
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1.ebuild
deleted file mode 100644
index 0d7f1350cb9a..000000000000
--- a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.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.9999
-#hackport: flags: -dev,-has-icu,-has-llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode normalization"
-HOMEPAGE="https://github.com/composewell/unicode-transforms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-	test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
-		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15
-		>=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev \
-		--flag=-has-icu \
-		--flag=-has-llvm
-}
diff --git a/dev-haskell/uniplate/Manifest b/dev-haskell/uniplate/Manifest
index ff189ab570fc..93457155e228 100644
--- a/dev-haskell/uniplate/Manifest
+++ b/dev-haskell/uniplate/Manifest
@@ -1,5 +1,3 @@
-DIST uniplate-1.6.12.tar.gz 30055 BLAKE2B 557c3eeb14c0b292d4e0325a711babec39a76829822aee07e38ee49f7a4c3f82e72e6231c00fad1c7831864a7df4a9e12b3e913b60fe0e227d651d39c73300af SHA512 049b07e8a57db7e44d91fc9c8dcfb5c49b78a692a730061763cb8bcc4fbc3ed1065bd7a4c337e3d344693df882a0718b6d3bb6a6ea1e7d520a36d252d7038b07
 DIST uniplate-1.6.13.tar.gz 29787 BLAKE2B 345b5c523469ccc4d98ebdf7498fbdfe9ae183af46c4cc1e1fcdc0782d6dd31d40f53e5ee04d652beb048c62c0d0241d6336eefd87cbfc10d4c0d7bb647b29ad SHA512 8cab820d40b318c7483319de4174bdbd3637e1c93f42bc6b796c6a8a1fa93331c0a2ff3b7c77f6a2ec0509fb48bb922ef732c7d79e8e6bcf7987bde949459310
-EBUILD uniplate-1.6.12.ebuild 850 BLAKE2B 63fd1b5c1e47faa5cc0d15fa8fad4c8a378f375003f5e74a7b0d367b2700625269086ebf39987dad1a6d4a293198bc7a78ef69f871bd1d97e11084422b853bf2 SHA512 ae7c73c75a8fdcbbdf51523548f3a3f2dfb6d9af8b8e9ad5c088840af63872f6be97a241b85eea50eda25eb465e0aec271f0f4bd43872ca41581018bddbdb7ab
 EBUILD uniplate-1.6.13.ebuild 860 BLAKE2B 990fb1fe90811f396577a3432d723aa37c36fdcb55516c855b5aa052d55433585cd31dcba2bf0caee268aec58240c8aaa2bc7758df076b33b166ea5dafc99c3d SHA512 c381acdff6e91668ae0ddb292eb57424fb733ff07a83ed3dc72a32a04bae91029f4c31ddb6741eaf308a0c0edf1d5d7d262bd83a4c71aa6080bbb8c0f442b70b
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/uniplate/uniplate-1.6.12.ebuild b/dev-haskell/uniplate/uniplate-1.6.12.ebuild
deleted file mode 100644
index fd0d4337b90d..000000000000
--- a/dev-haskell/uniplate/uniplate-1.6.12.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.6.9999
-#hackport: flags: +separate_syb,+typeable_fingerprint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Help writing simple, concise and fast generic operations"
-HOMEPAGE="http://community.haskell.org/~ndm/uniplate/"
-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/syb:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=separate_syb \
-		--flag=typeable_fingerprint
-}
diff --git a/dev-haskell/wreq/Manifest b/dev-haskell/wreq/Manifest
index 8dbbb330f97c..0c54f223b7ce 100644
--- a/dev-haskell/wreq/Manifest
+++ b/dev-haskell/wreq/Manifest
@@ -1,3 +1,3 @@
 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
+EBUILD wreq-0.5.3.3-r1.ebuild 1930 BLAKE2B 8ba295cf78935d47bf9acb3bbe1bdcc43d05bb65a47e31424a5dbee8490adc4676cb820d313dfc0a3b92455e850a8b2863dbc21bb708a9facd64932382b231ac SHA512 250c84c7408cbefa63e96144c318612f32830c3b73a68e86b200bce4a6ccc361e6a35c00678e02b34168097d4ba6a772fc095084f22796e9089cfb76d02c4c9e
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/wreq/metadata.xml b/dev-haskell/wreq/metadata.xml
index 4bbbdcaa2edb..937381521944 100644
--- a/dev-haskell/wreq/metadata.xml
+++ b/dev-haskell/wreq/metadata.xml
@@ -5,35 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		
-		A web client library that is designed for ease of use.
-		
-		Tutorial: &lt;http://www.serpentine.com/wreq/tutorial.html&gt;
-		
-		Features include:
-		
-		* Simple but powerful `lens`-based API
-		
-		* A solid test suite, and built on reliable libraries like
-		http-client and lens
-		
-		* Session handling includes connection keep-alive and pooling, and
-		cookie persistence
-		
-		* Automatic response body decompression
-		
-		* Powerful multipart form and file upload handling
-		
-		* Support for JSON requests and responses, including navigation of
-		schema-less responses
-		
-		* Basic and OAuth2 bearer authentication
-		
-		* Early TLS support via the tls package
-	</longdescription>
-	<use>
-		<flag name="aws">Enable AWS tests</flag>
-		<flag name="httpbin">Install client</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/wreq/wreq-0.5.3.3-r1.ebuild b/dev-haskell/wreq/wreq-0.5.3.3-r1.ebuild
new file mode 100644
index 000000000000..4ddf3edcde72
--- /dev/null
+++ b/dev-haskell/wreq/wreq-0.5.3.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: -developer,-doctest,-aws,-httpbin
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An easy-to-use HTTP client library"
+HOMEPAGE="https://www.serpentine.com/wreq"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT=test # requires network
+
+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/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/time-locale-compat:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	>=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1"
+# 	test? ( >=dev-haskell/aeson-pretty-0.8.0
+# 		dev-haskell/base64-bytestring
+# 		dev-haskell/hunit
+# 		dev-haskell/network-info
+# 		>=dev-haskell/quickcheck-2.7
+# 		>=dev-haskell/snap-core-1.0.0.0
+# 		>=dev-haskell/snap-server-0.9.4.4
+# 		dev-haskell/temporary
+# 		dev-haskell/test-framework
+# 		dev-haskell/test-framework-hunit
+# 		dev-haskell/test-framework-quickcheck2
+# 		dev-haskell/unix-compat
+# 		dev-haskell/uuid
+# 		dev-haskell/vector
+# 		dev-haskell/doctest )
+# "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-aws \
+		--flag=-developer \
+		--flag=-doctest \
+		--flag=-httpbin
+}
diff --git a/dev-haskell/wreq/wreq-0.5.3.3.ebuild b/dev-haskell/wreq/wreq-0.5.3.3.ebuild
deleted file mode 100644
index 0c9018f69297..000000000000
--- a/dev-haskell/wreq/wreq-0.5.3.3.ebuild
+++ /dev/null
@@ -1,76 +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.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/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="aws httpbin"
-
-RESTRICT=test # needs network
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=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 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag aws aws) \
-		--flag=-developer \
-		--flag=doctest \
-		$(cabal_flag httpbin httpbin)
-}
diff --git a/dev-haskell/yesod-auth/Manifest b/dev-haskell/yesod-auth/Manifest
index 55ba2a33f030..a33ee819f575 100644
--- a/dev-haskell/yesod-auth/Manifest
+++ b/dev-haskell/yesod-auth/Manifest
@@ -1,5 +1,3 @@
 DIST yesod-auth-1.6.10.3.tar.gz 53373 BLAKE2B 7bde89851609099b6a8760d218706f37dd22c48ac750fc0f1bfbdd1db5c253ce5c7868eee94459320033712a27decfa59e4c158024daaf622c3d21e72e209ca3 SHA512 82b490db8424d6e340c4c19b9760e07c78a7906540dada160afd8f3de43f6767f04968753b0c218f0c53c8ddf4ff0ed33f458a770100edd8ab6c7582016662a2
-DIST yesod-auth-1.6.9.tar.gz 52717 BLAKE2B 0b84d830effe84ecf5f4a5bdbaed31eb746b7af32ba39c753e0c40cf9d4a1bb4efb4fc7b4a25620acd69853ae878ff0c0937a1cd9c68c2ce06dba4d0b90ff67f SHA512 071f5c3b01f70d4cf7f9516d97bdf352a6fc20f9191c6a46bccacf84f7e245e8076ff1881fa6e64c3929d300a0361b5ed1bf67c670544e2c2eca07b8aa3e24c0
 EBUILD yesod-auth-1.6.10.3.ebuild 2007 BLAKE2B 1fcf43f0b00bc866e2728106a103af3654bfafb122ee0697b3ab3c0c55b21914ea3edec7b9fda1eee2d9943b8d4f1f7b8c871add3666d0c4b7b257dc02fe79c4 SHA512 22e4a1b2b059130c4420630ff06c13a8b209bd35861a5b92f8ca57dee237da53ec607060f3aed340a7f4f8d088e2f0f4f0687331baaa834ebfe978ef17786646
-EBUILD yesod-auth-1.6.9.ebuild 2070 BLAKE2B cf36741ec2f59bbaa8d941d308d18fadb436074669830c8f2d721e865648bf88d139deafa6bbe7c27cc4a3c828d06989db2ed35d15781548f98414e35cf058a4 SHA512 55291e17a2af70cd93423aa2decf32d81efa3719604da3ee0988b3ba93e4919dfff563ee0a208cd108b44ec62f49d36b256bb421695405de36b15b6cc36b02ef
-MISC metadata.xml 344 BLAKE2B 1a3e85980b14b49df9b8c094078e8144a7ce3f58bc0036a30c28ac1c5dcdab4e83cdd3882e14f4117a1014241a06c808492d07176ef27de3df67a06226d05e85 SHA512 ec502407a2596307752907631c38e075f54640e6ae9722409c589d52c60d19dffb9a59bdbe5918465252a114ba1cb0ee6225e8c5b558e4e921073585c57bef07
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/yesod-auth/metadata.xml b/dev-haskell/yesod-auth/metadata.xml
index 8071ed182364..937381521944 100644
--- a/dev-haskell/yesod-auth/metadata.xml
+++ b/dev-haskell/yesod-auth/metadata.xml
@@ -5,7 +5,4 @@
 		<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>
 </pkgmetadata>
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
deleted file mode 100644
index 82f6215423ad..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
+++ /dev/null
@@ -1,61 +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"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3.4:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	>=dev-haskell/http-client-0.5:=[profile?]
-	dev-haskell/http-client-tls:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unliftio:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[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.7:=[profile?]
-	>=dev-haskell/yesod-persistent-1.6:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index c3dcaa561aec..fd5157147bf4 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,5 +1,3 @@
-DIST zlib-0.6.2.2.tar.gz 148178 BLAKE2B 8de5626a20f4ee2ea0dada54bdddc2340e3c3eba225ac5421a99bee9056aa6aecfd74f609745c4bc238e5cee056e6e463f0851ef7a6d5b0ec3312026f677d912 SHA512 3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea
 DIST zlib-0.6.2.3.tar.gz 149186 BLAKE2B 5665c6a076c0efdb6074ca72e3723ddeb4a7d851abf06450ccb8a4ee6179c3e45be63c3c620d02787b088a6c18723ba2d5a77c525d59dc4ab9bbe1770e79517b SHA512 535fc711af639967c032791c6a0c09680ac186c706e02a28cfabd9b2dcddc84a6ee5f6007e2ed67c1dc19dd6d561cb821d8840dba7386b63cc002418c4d5040a
-EBUILD zlib-0.6.2.2.ebuild 1099 BLAKE2B 3a861ecc21cf9fee1abdf10d6cf9286edcb311d6c9298b275e79d4447d68c8a6f061ed1602c47064d5de263da533769428972e510f71297d263abfb9e7e65c4f SHA512 6da795f3b91902d54d0f459174da7df8f4586896f046714a7c320c53c98307399c49946f43ba228dc3b21d30a9f9daecbd0eb4908922612e9320b34f22950694
 EBUILD zlib-0.6.2.3.ebuild 1109 BLAKE2B 7259de38d007c2aa2215a838061300e6e1d9227873cb6c998d46a15a625599ae530a97c7fa7113c6382cd643e691e9a0c065127adf047c8819450cd08400f8da SHA512 35fb086c67f6b41c23c3701b12bfd6c7c5c554176d81d32e1fbccc91e406cc61f0fbfddcbd00762acee215865a529b3c46153ca7bcdb6eca72d9f796ac96d428
 MISC metadata.xml 1132 BLAKE2B b3ab09f748345f59b3e1ac432b2687c51a2bfbc17293ea2d0452d1eb514a5ab5a126b280f408abee6f7d181c7eebb147851f5dc1616d2c1a89ebc53913303feb SHA512 cac18fb27f5c7f76cdcd184a57c7fb69a0bef932733b7b78f0f742475234b6695c4e5667638995c1690ab08de6c23da38b9f620137e27bc4666de843096946d0
diff --git a/dev-haskell/zlib/zlib-0.6.2.2.ebuild b/dev-haskell/zlib/zlib-0.6.2.2.ebuild
deleted file mode 100644
index 9a74ff0657ef..000000000000
--- a/dev-haskell/zlib/zlib-0.6.2.2.ebuild
+++ /dev/null
@@ -1,38 +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.9999
-#hackport: flags: +pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="https://hackage.haskell.org/package/zlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos"
-IUSE="bundled-c-zlib non-blocking-ffi"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	virtual/pkgconfig
-	test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bundled-c-zlib bundled-c-zlib) \
-		$(cabal_flag non-blocking-ffi non-blocking-ffi) \
-		--flag=pkg-config
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5deba081ed33..018c6bbad84e 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 972beb3261c8..0d0d797d3bf9 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -20,7 +20,7 @@ DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8df
 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
 DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
 EBUILD spidermonkey-1.8.5-r10.ebuild 3998 BLAKE2B c54b791025b3416f96068a20e8f5526d15223aa4f5d4b5dedc5451ea711f5376d26ff9823226a7617dc53e4beece4ef48dc608a5f6fd02c03221e46c69be3add SHA512 8a33566ef0d15caf811d79d17862ccaaa708c9c6a4171bfc3889bc3f3268e6bcfc61090ebff1014b5369f469c0b9e516a340ab32930888a07cce1ac95faf6fb3
-EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4032 BLAKE2B 396632dfadc26ad8dd04e59b3948aef8872ba8d20eec27c5f0f8abb58091cec7ac160418d433cd547b7fa94cf04f702c69b2fd2a2af0fbae103d23c4773ca25b SHA512 4362077743a90149bb31f14f388c442346d289c182ae1d7c7035332ca81666c1656fe4ed25c197c183d131b07f82411c7f8d235854ae034ed72ab0e5261885d5
+EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4080 BLAKE2B 7269a944ab109fa27ee80016d44c4c71d91c0f230fbea9704ba468bff06d62c2740af3cce4ce7c39179dca6be7c74b3eb62b877e7f7db2c7a6e7314e0361401c SHA512 971cbfaad2aabaf43b6f528bc67f5bb207bf53bc4d9bd19d8d21948ad6e055a8f3aa0f059028db13c95740fef3ebc9257a1ab2813131180dfb5c7b2306b66e2b
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
 EBUILD spidermonkey-78.15.0.ebuild 13041 BLAKE2B aef027a6499b02cc44e1fc1eda7d60b74542590513147ff47978786f14ac8afbf636f8ebb86fcbd0ac0d6f30130d5ff679df7342215bf0126c21db343591c905 SHA512 bcce7f25a9791a0bafcb1f9ecbca883a96dd677ab6c184370f791b1463c3eba6bf57be17e5f1bbcb6b52814600ffe18d3d0d7453eeb18f1cd96087925b2aca02
 EBUILD spidermonkey-91.11.0.ebuild 15073 BLAKE2B 95e0ee862be50ad1d6543ee4466a40ea73715bb7dc5b9e101c613cc9dff72d88c6448d0eaabad578492596c4ce3f25c9eeebf40b795e7603d6b6b822f6ffab36 SHA512 7ca5e1cee8c04039663cdea7462bfdf7b51b461e56fa25b4c06ddb638b85188bdfc5992c383b3a19fdf9593ffde82dbbf841dd6dddeb1a74116e4949cc9d41e7
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
index cc7d2687a38f..ef5e64bc7a31 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 WANT_AUTOCONF="2.1"
-inherit autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5
+inherit autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5 flag-o-matic
 
 MY_PN="mozjs"
 MY_P="${MY_PN}-${PV/_rc/.rc}"
@@ -54,6 +54,8 @@ src_prepare() {
 
 	eapply_user
 
+	append-atomic-flags # bug 688574
+
 	cd "${S}/js/src" || die
 	eautoconf old-configure.in
 	eautoconf
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 212a1095af05..420de750e01a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index e8b1450073e0..5e2928a03d85 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,11 +1,9 @@
 AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
 DIST scipy-1.9.0.tar.gz 42016757 BLAKE2B ca25b3ad44091230c5ecdfa832b382a1f5449565aa460b169a886505e7583399d316fe48f420d45b9993e6522d46fbbd6405e08fcfb8dc02ed5febb2e09749e7 SHA512 03d38f3298e2ca2dcc376acb09593f47a007f2b166508b91cd6f3e3cc417fa3579084aaa806365afee8679b473340b0eba86b36def957da45be404c4b6607675
-DIST scipy-1.9.0rc3.tar.gz 42021439 BLAKE2B 148c5a2517ef18015123503837d921a24258996047b4c5df22a279febc98d0633bb8b6bd9c7b886db9458583e8a5c15886b6349e2095a0ed7d60a7c976d24145 SHA512 1e4f0eb3fc5d8cdc24c2e4f7ea8400f5db039d4a2bb7a7d7c4869392fbdca6836d4dfb0a1ead2452b177fe49a60aa7ef86d7d6aee596e001e870df79a5cbce04
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
-EBUILD scipy-1.9.0.ebuild 1924 BLAKE2B 0c837cf2f3a852f62525a84c67314d428db2bd983de168d8a2c300c9e6b71648809031db7e3038bf7c9b0f5c991db49577529cffb61ce2538139f50b654667be SHA512 e98214c1731dd1d97432f50a04ed0f5e73a3ed65a0a358eb163f51ab2b2e9e5904c6ff3367d8bfe6463e708bc59864fa1daca4b3bf97a67d4ea75e1e81e7a7d7
-EBUILD scipy-1.9.0_rc3.ebuild 1796 BLAKE2B 41ec3dc03509ee1f73cd9366eb0b39e24874b145d5463840af6c376159399174ae668f99794fa7f6da467549cfe12a513d03a76f5fb64c95e87815cd87a807fe SHA512 32e4d7b4b3e3e1e1a47ad081b458953f743f5d7dc630795a61f48e18511dcdba77921f682d9bb17a000e323eac164940b92d34f44a99c219a6170b08d6f7d614
-EBUILD scipy-1.9.9999.ebuild 1924 BLAKE2B 0c837cf2f3a852f62525a84c67314d428db2bd983de168d8a2c300c9e6b71648809031db7e3038bf7c9b0f5c991db49577529cffb61ce2538139f50b654667be SHA512 e98214c1731dd1d97432f50a04ed0f5e73a3ed65a0a358eb163f51ab2b2e9e5904c6ff3367d8bfe6463e708bc59864fa1daca4b3bf97a67d4ea75e1e81e7a7d7
+EBUILD scipy-1.9.0-r1.ebuild 2151 BLAKE2B 33e84704a4f8c5a80819f1d5b5cfdd5ab55e5258997b4e69af487ebadd0ba5282bc881fd80799571682b181f65e972bc3c4e0ab9c52364921456ca2ee9dd91a5 SHA512 b116cdaa9929e2813392eab0351072e62f7a77448f0e2816d51830e2819ba07e07f4cea5cb2bcdb3db251e95efb06885dad126b92cd9727d219755c53bd055fc
+EBUILD scipy-1.9.9999.ebuild 2151 BLAKE2B 33e84704a4f8c5a80819f1d5b5cfdd5ab55e5258997b4e69af487ebadd0ba5282bc881fd80799571682b181f65e972bc3c4e0ab9c52364921456ca2ee9dd91a5 SHA512 b116cdaa9929e2813392eab0351072e62f7a77448f0e2816d51830e2819ba07e07f4cea5cb2bcdb3db251e95efb06885dad126b92cd9727d219755c53bd055fc
 MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/scipy-1.9.0.ebuild b/dev-python/scipy/scipy-1.9.0-r1.ebuild
index ccb8c752ed10..888ff2073ebb 100644
--- a/dev-python/scipy/scipy-1.9.0.ebuild
+++ b/dev-python/scipy/scipy-1.9.0-r1.ebuild
@@ -44,16 +44,20 @@ fi
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-IUSE="doc +sparse"
+IUSE="doc"
 
+# umfpack is technically optional but it's preferred to have it available.
 DEPEND="
 	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
+	sci-libs/arpack:=
+	sci-libs/umfpack
 	virtual/cblas
 	>=virtual/lapack-3.8
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
 # TODO: restore pythran optionality?
 BDEPEND="
 	dev-lang/swig
@@ -82,3 +86,11 @@ python_test() {
 
 	epytest -n "$(makeopts_jobs)" --pyargs scipy
 }
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/scipy/scipy-1.9.0_rc3.ebuild b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
deleted file mode 100644
index 577f837b091c..000000000000
--- a/dev-python/scipy/scipy-1.9.0_rc3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit fortran-2 distutils-r1 multiprocessing
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="
-	https://scipy.org/
-	https://github.com/scipy/scipy/
-	https://pypi.org/project/scipy/
-"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	# Need submodules, so git for now.
-	EGIT_REPO_URI="https://github.com/scipy/scipy"
-	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
-	EGIT_SUBMODULES=( '*' )
-else
-	# Upstream is often behind with doc updates
-	DOC_PV=1.8.1
-	MY_PV=${PV/_rc/rc}
-	MY_P=${PN}-${MY_PV}
-
-	SRC_URI="
-		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-		doc? (
-			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
-		)"
-	S="${WORKDIR}"/${MY_P}
-
-	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 -hppa"
-	fi
-fi
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc +sparse"
-
-DEPEND="
-	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	>=virtual/lapack-3.8
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-# TODO: restore pythran optionality?
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	dev-python/pythran[${PYTHON_USEDEP}]
-	>=dev-util/meson-0.62.2
-	dev-util/patchelf
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${T}" || die
-
-	epytest -n "$(makeopts_jobs)" --pyargs scipy
-}
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
index ccb8c752ed10..888ff2073ebb 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -44,16 +44,20 @@ fi
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-IUSE="doc +sparse"
+IUSE="doc"
 
+# umfpack is technically optional but it's preferred to have it available.
 DEPEND="
 	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
+	sci-libs/arpack:=
+	sci-libs/umfpack
 	virtual/cblas
 	>=virtual/lapack-3.8
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
 # TODO: restore pythran optionality?
 BDEPEND="
 	dev-lang/swig
@@ -82,3 +86,11 @@ python_test() {
 
 	epytest -n "$(makeopts_jobs)" --pyargs scipy
 }
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1f82df458d56..529bc5be6802 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index d8b5a5a86b9f..7b3ef894886b 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -10,6 +10,6 @@ DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a3
 EBUILD valgrind-3.16.1.ebuild 3703 BLAKE2B 311cbc2ba147e6bde2c6e8352eed928361be75f96c84086870b45decf3675107a2fdae7ae48bca5ddbc1ea5dbbd29bdb886b15f514bbb40d7eaf65772e46f5f3 SHA512 9f87ff366eb7e51d697527350c8135778537b8d2a09ceddc38e96b830f07eed040ade236bb204637e625b336f12508ed36240d0f8818aaa2e60a64e136947ead
 EBUILD valgrind-3.17.0.ebuild 3749 BLAKE2B 6d2fa93b2b3beee059041ea84c24ce99b96379907b707745d90799db4a4e5d034cd34cbaf22c8ef1a61be0c5d4f47877e71ea40080e36f58e5310153a46d0e86 SHA512 c892f4b885b12b9acd73e1a7c1af38256c72329d322ba9f1d1a9d4e815c1eea03e5754376be404a752735c84a1ec8213b0fcf2b010d222967ef71c409d7aea0c
 EBUILD valgrind-3.18.1.ebuild 3703 BLAKE2B 8cebf6e55574abde88bb9cb173c35ccb283b1b7c4d62664d26137478f5174b6ca7c366100e09540357caa27d4a221d8e3b5225aaa019fd6b1c7cfe6928932569 SHA512 eba7ba77309a201722ccb4b1e30e1ab7f41a3b90344e4003c64e34cc3e7d71adcba2efe829b31622e9fc2258a49ecda0e84a1b48bd245e8b795518b31d868cac
-EBUILD valgrind-3.19.0.ebuild 3898 BLAKE2B cbb6e58e0cdde2a4f3b1c41064edf3b3d57bce3f26fa5afe0feb4f5f0502e10e8602caf02ab50defdf41c824394aa46215d62d139019024b399880ede4691e97 SHA512 afc2ab6fb54ad2377e0887a7be05e39a2e43dd4184d1a785135688219a6c91bb3e8ee434e31053536c48ab038ca4e2aefb25268193f935f49bee67fcf3d04af0
-EBUILD valgrind-9999.ebuild 3898 BLAKE2B cbb6e58e0cdde2a4f3b1c41064edf3b3d57bce3f26fa5afe0feb4f5f0502e10e8602caf02ab50defdf41c824394aa46215d62d139019024b399880ede4691e97 SHA512 afc2ab6fb54ad2377e0887a7be05e39a2e43dd4184d1a785135688219a6c91bb3e8ee434e31053536c48ab038ca4e2aefb25268193f935f49bee67fcf3d04af0
+EBUILD valgrind-3.19.0.ebuild 3963 BLAKE2B 171a86036b4835c00abe79c87fc3f7428b0a279af914b407aaf01584ecad09bf7d71b01bdc0d328623ce0999400e2380e504c33040abe4c075dccba2f3353464 SHA512 d199730f365cfa927f448eafe19f46f45efc9e07c68e2a9b5c4cb1b5e7e9ba9b30ae289d205d4fac1e8bd76e1b2fd689db8eb0d3cacb0728d23b73e9130cb553
+EBUILD valgrind-9999.ebuild 3963 BLAKE2B 171a86036b4835c00abe79c87fc3f7428b0a279af914b407aaf01584ecad09bf7d71b01bdc0d328623ce0999400e2380e504c33040abe4c075dccba2f3353464 SHA512 d199730f365cfa927f448eafe19f46f45efc9e07c68e2a9b5c4cb1b5e7e9ba9b30ae289d205d4fac1e8bd76e1b2fd689db8eb0d3cacb0728d23b73e9130cb553
 MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
index 11beb6636e97..7e7417e90831 100644
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.19.0.ebuild
@@ -71,12 +71,14 @@ src_configure() {
 	# -fstack-protector-strong See -fstack-protector (bug #620402)
 	# -m64 -mx32			for multilib-portage, bug #398825
 	# -ggdb3                segmentation fault on startup
+	# -flto*                fails to build, bug #858509
 	filter-flags -fomit-frame-pointer
 	filter-flags -fstack-protector
 	filter-flags -fstack-protector-all
 	filter-flags -fstack-protector-strong
 	filter-flags -m64 -mx32
 	replace-flags -ggdb3 -ggdb2
+	filter-lto
 
 	if use amd64 || use ppc64; then
 		! has_multilib_profile && myconf+=("--enable-only64bit")
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 11beb6636e97..7e7417e90831 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -71,12 +71,14 @@ src_configure() {
 	# -fstack-protector-strong See -fstack-protector (bug #620402)
 	# -m64 -mx32			for multilib-portage, bug #398825
 	# -ggdb3                segmentation fault on startup
+	# -flto*                fails to build, bug #858509
 	filter-flags -fomit-frame-pointer
 	filter-flags -fstack-protector
 	filter-flags -fstack-protector-all
 	filter-flags -fstack-protector-strong
 	filter-flags -m64 -mx32
 	replace-flags -ggdb3 -ggdb2
+	filter-lto
 
 	if use amd64 || use ppc64; then
 		! has_multilib_profile && myconf+=("--enable-only64bit")
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e6e160403e17..101434fd9ec0 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 1eda2778a5a1..ed2c01399843 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,6 +1,5 @@
-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-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
+EBUILD git-annex-10.20220624.ebuild 4199 BLAKE2B c200a4e283f89f83a4a16efee76644fa5f95983870a4b17aa8051b3839a03a5d5dd7fee641b2bfc65061cb320d8c3f954f335963ec61f93e88eb76551af5016c SHA512 b4a6dd64dbbf31fc2c4480110d34a6a361c753b1e8c1b708e0e88af553732381468fb1392ebc944e31ffc1d8b650f158b2779551cfe804673c9af17560013f48
+MISC metadata.xml 784 BLAKE2B 36b0c9b201205f4e3b614e7fbfed0f3e1261728cf5a5b74a2a7c9003b1c1f1e9228aa2cd4f32bdb3993cddd55d74db5c19a1d7a808dd8f60677fb251abb33701 SHA512 d0c948899a2199fc5234cdf8106544019d26d0445e5abcb66719cb67ec702c017517ab69dbbb16947ae7604ed235dfe00d7b7987a8eb395ece001d713a07b530
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
deleted file mode 100644
index 977e5931f5f4..000000000000
--- a/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
index 3104cec95ee0..875ff88f915e 100644
--- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp"
 
+REQUIRED_USE="webapp? ( assistant )"
+
 RDEPEND="dev-haskell/aeson:=
 	>=dev-haskell/ansi-terminal-0.9:=
 	dev-haskell/async:=
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 82dde5fc9a30..1f73976ae199 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 "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/eclass/Manifest.gz b/eclass/Manifest.gz
index 1adb5632fef7..f260517c04fb 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index bf509d8ff0f8..cd4495767e58 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -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
 
 # @ECLASS: chromium-2.eclass
@@ -122,7 +122,7 @@ chromium_pkg_die() {
 	fi
 
 	# Prevent user problems like bug #348235.
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+	if is-flagq '-g?(gdb)?([1-9])'; then
 		ewarn
 		ewarn "You have enabled debug info (i.e. -g or -ggdb in your CFLAGS/CXXFLAGS)."
 		ewarn "This produces very large build files causes the linker to consume large"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d4007968ac8a..a1093e0fb603 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1910,9 +1910,9 @@ toolchain_src_test() {
 		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
+		# 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
 }
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c8a2e5b5a268..4e51c1efdac9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 0521d50ec084..869fb570573f 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,7 +1,5 @@
-AUX pulseaudio-16.0-fix-pactl-volume-command.patch 1992 BLAKE2B 5e7a822a77f1219a7c8aaeb194ca076e19b73e8b37c38c40e2c31326ba175a1afe1abab3771775b7a8b4734cfa0132ed6cd997c980a259ec854c5fff2ab66251 SHA512 551d61186327c5a085bc6f6e3734d3c06d1dfde5b2888c873e5c7373c1092685e397e724a5b6fb188962beda662be6978a03a3511218466b314afb16ada0d260
 DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
-EBUILD libpulse-16.0-r1.ebuild 5735 BLAKE2B 9cde48b54a8fbf46523c849b06cb7bd7b4d6802fec17c88a863ac69ae4bc7c918f1d58c976c229d2cec80cbf2c19e9b9f447cfb43f9e6b816c7007bc3c16a762 SHA512 45df9f35e826b99b7d0a430e227693e21fbc09d212751999d94fd8fffd55cd56583d1b339dd08f6e089166ac798999e1acd3d54481ce386593324df1f3ef4410
 EBUILD libpulse-16.0.ebuild 5666 BLAKE2B 54aebcba30972a1bdfebde9be49f695a19122d3b95bd1285435a0f787800ca03086692ae94dccf855b36ecf7deeec8e24f1fcf7fc12040fd11d2e25507674c50 SHA512 8cb2bf0bb4e0cf81bc820c6da95a0743b79aa3379b6955e093ba07aa22e5d27e40634d0b1228dc931b7fb0268a5bdf438c6b2d860e1f1525ee3568e2d78c4137
-EBUILD libpulse-16.1.ebuild 5808 BLAKE2B eaa9dc19737b26a43fa832529c25dc674cd8ea8de2c9de1e36162d2d876c280e407766416bdfb3026678f45c24fc41601e94ad361b649462bfe7c0aca099f96b SHA512 51cafddf0724f360b91d1ff17850bd00ebfad90b934f309133b2718d1cbfa4f8bab443ff3de317e9f812c01a33808c5a688c883b61bff8b874956a29ba98244d
+EBUILD libpulse-16.1.ebuild 5804 BLAKE2B 2c69fe06ddb0e0ae3a826b400f200027ec469f66ead67d5aa6223ecfc6a1a4efd4672dbd42227591365a4565cf097ef5a2c91f06d49bd502496968fcaeb64b2f SHA512 23f70f1ab55ad22c463301cb4f1a9cb76b3fd2651c37716c3f7a8d49424d3ea58d930524805c7047d9c6c01b1db9b4c65ac0882dd6a3778db7f649837a301f2f
 MISC metadata.xml 925 BLAKE2B 00eb044359e5cbbaa5fdd085a76be9582c1142dc7334ebcfca531975961bbe35bd4d7a3b1f06e760126b0422614103480c1199128a908567dbe477af017f5ae7 SHA512 9c244a9725fa5acf9d1c3e869cd794d0d70dbe29126af877ea5918adf12c9ebfe87576c074db8126d168368ca93bb0e5577912780eb467377ef58d4cf44895bb
diff --git a/media-libs/libpulse/files/pulseaudio-16.0-fix-pactl-volume-command.patch b/media-libs/libpulse/files/pulseaudio-16.0-fix-pactl-volume-command.patch
deleted file mode 100644
index 469aaa345102..000000000000
--- a/media-libs/libpulse/files/pulseaudio-16.0-fix-pactl-volume-command.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/05c06afa58e30b7958e96766d1e917099c8a4041
-
-From 05c06afa58e30b7958e96766d1e917099c8a4041 Mon Sep 17 00:00:00 2001
-From: Sean Greenslade <sean@seangreenslade.com>
-Date: Sat, 4 Jun 2022 00:24:49 -0700
-Subject: [PATCH] pactl: fix parsing of percentages with decimal points
-
-The logic for detecting which type of volume was given incorrectly interpreted
-any value with a decimal as a VOL_LINEAR. It also could set multiple flags,
-which would put the flags variable into an indeterminate state. Additionally,
-the flags stack variable was uninitialized which could also lead to an
-indeterminate flag state.
-
-Percentages are now prioritized over all other types, and only one type flag
-can be set.
----
- src/utils/pactl.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/utils/pactl.c b/src/utils/pactl.c
-index 35163f277..2761ebaaf 100644
---- a/src/utils/pactl.c
-+++ b/src/utils/pactl.c
-@@ -2527,16 +2527,16 @@ static int parse_volume(const char *vol_spec, pa_volume_t *vol, enum volume_flag
-     vs = pa_xstrdup(vol_spec);
- 
-     *vol_flags = (pa_startswith(vs, "+") || pa_startswith(vs, "-")) ? VOL_RELATIVE : VOL_ABSOLUTE;
--    if (strchr(vs, '.'))
--        *vol_flags |= VOL_LINEAR;
-     if (pa_endswith(vs, "%")) {
-         *vol_flags |= VOL_PERCENT;
-         vs[strlen(vs)-1] = 0;
-     }
--    if (pa_endswith(vs, "db") || pa_endswith(vs, "dB")) {
-+    else if (pa_endswith(vs, "db") || pa_endswith(vs, "dB")) {
-         *vol_flags |= VOL_DECIBEL;
-         vs[strlen(vs)-2] = 0;
-     }
-+    else if (strchr(vs, '.'))
-+        *vol_flags |= VOL_LINEAR;
- 
-     atod_input = vs;
- 
-@@ -2597,7 +2597,7 @@ static int parse_volumes(char *args[], unsigned n) {
- 
-     volume.channels = n;
-     for (i = 0; i < volume.channels; i++) {
--        enum volume_flags flags;
-+        enum volume_flags flags = 0;
- 
-         if (parse_volume(args[i], &volume.values[i], &flags) < 0)
-             return -1;
--- 
-GitLab
-
diff --git a/media-libs/libpulse/libpulse-16.0-r1.ebuild b/media-libs/libpulse/libpulse-16.0-r1.ebuild
deleted file mode 100644
index a134ac58d7b4..000000000000
--- a/media-libs/libpulse/libpulse-16.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="pulseaudio-${MY_PV}"
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
-
-DESCRIPTION="Libraries for PulseAudio clients"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
-else
-	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1+"
-
-SLOT="0"
-IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X"
-RESTRICT="!test? ( test )"
-
-# NOTE: libpcre needed in some cases, bug #472228
-# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
-RDEPEND="
-	dev-libs/libatomic_ops
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	virtual/libc
-	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	selinux? ( sec-policy/selinux-pulseaudio )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-	)
-	|| (
-		elibc_glibc? ( virtual/libc )
-		dev-libs/libpcre:3
-	)
-	!<media-sound/pulseaudio-15.0-r100
-"
-
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )
-	X? ( x11-base/xorg-proto )
-"
-
-# pulseaudio ships a bundled xmltoman, which uses XML::Parser
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( NEWS README )
-
-# patches merged upstream, to be removed with 16.0 bump
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-16.0-fix-pactl-volume-command.patch
-)
-
-src_prepare() {
-	default
-
-	# disable autospawn by client
-	sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die
-
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}"/var
-
-		-Ddaemon=false
-		-Dclient=true
-		$(meson_native_use_bool doc doxygen)
-		-Dgcov=false
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_native_use_bool test tests)
-		-Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks
-		-Dstream-restore-clear-old-devices=true
-		-Drunning-from-build-tree=false
-
-		# Paths
-		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
-		-Dsystemduserunitdir=$(systemd_get_userunitdir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
-		# Optional features
-		-Dalsa=disabled
-		$(meson_feature asyncns)
-		-Davahi=disabled
-		-Dbluez5=disabled
-		-Dbluez5-gstreamer=disabled
-		-Dbluez5-native-headset=false
-		-Dbluez5-ofono-headset=false
-		$(meson_feature dbus)
-		-Delogind=disabled
-		-Dfftw=disabled
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		-Dgsettings=disabled
-		-Dgstreamer=disabled
-		$(meson_native_use_feature gtk)
-		-Dhal-compat=false
-		-Dipv6=true
-		-Djack=disabled
-		-Dlirc=disabled
-		-Dopenssl=disabled
-		-Dorc=disabled
-		-Doss-output=disabled
-		-Dsamplerate=disabled # Matches upstream
-		-Dsoxr=disabled
-		-Dspeex=disabled
-		$(meson_native_use_feature systemd)
-		-Dtcpwrap=disabled
-		-Dudev=disabled
-		$(meson_native_use_feature valgrind)
-		$(meson_feature X x11)
-
-		# Echo cancellation
-		-Dadrian-aec=false
-		-Dwebrtc-aec=disabled
-	)
-
-	if multilib_is_native_abi; then
-		# Make padsp work for non-native ABI, supposedly only possible with glibc;
-		# this is used by /usr/bin/padsp that comes from native build, thus we need
-		# this argument for native build
-		if use elibc_glibc; then
-			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	else
-		emesonargs+=( -Dman=false )
-		if ! use elibc_glibc; then
-			# Non-glibc multilib is probably non-existent but just in case:
-			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
-		fi
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Generating documentation ..."
-			meson_src_compile doxygen
-		fi
-	fi
-}
-
-multilib_src_install() {
-	# The files referenced in the DOCS array do not exist in the multilib source directory,
-	# therefore clear the variable when calling the function that will access it.
-	DOCS= meson_src_install
-
-	# Upstream installs 'pactl' if client is built, with all symlinks except for
-	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
-	# This trips QA warning, workaround:
-	# - install missing aliases in media-libs/libpulse (client build)
-	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
-	bashcomp_alias pactl pulseaudio
-	bashcomp_alias pactl pacmd
-	bashcomp_alias pactl pasuspender
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Installing documentation ..."
-			docinto html
-			dodoc -r doxygen/html/.
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	optfeature_header "PulseAudio can be enhanced by installing the following:"
-	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
diff --git a/media-libs/libpulse/libpulse-16.1.ebuild b/media-libs/libpulse/libpulse-16.1.ebuild
index f2dfe8cce294..b8b01eb10b35 100644
--- a/media-libs/libpulse/libpulse-16.1.ebuild
+++ b/media-libs/libpulse/libpulse-16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9dce072ef728..8626d9af55a3 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
index 332849afa27f..28883d7731f7 100644
--- a/media-sound/pulseaudio-ctl/Manifest
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -1,9 +1,3 @@
-DIST pulseaudio-ctl-1.67.tar.gz 6615 BLAKE2B fd760fc5475cdd9c6bbced9f4bbe0f62e793364d375f0bc24686986d42c9ddcfeddde501950c3572a4bf004cdfba36d3dc5aa1df3eed7a9730a437e74eb97b26 SHA512 5ea1cbfd87cf073de46b6fd9953a3c7b9c6969da46103dd5dfc56aa3f179b2ba36ade5db7ca47d204f0f60ac02020f1a4f2dd58bbaf010f9a99780702295418c
-DIST pulseaudio-ctl-1.68.tar.gz 6575 BLAKE2B a126730f53687b8456ed06f205e13d9380f7cadd4581430b4263dff65ebd33b22ad698cad4271402f873d9fa6c3499fd805ba02e9108723dcd60690016fcc196 SHA512 8ed4383d123d235bcde2e89a0a81fea96daa81dabb37cc9428eb3dd8e0c80fde3b9adf2b3ff911abaf6c4e5cb7cdbd74ce6817e080b3dba65d9206677ce10de5
-DIST pulseaudio-ctl-1.69.tar.gz 6577 BLAKE2B db55eec57e1204eef228ad331fd0b95bab2ee16625ca94fe4632ee713412b0686f1c1abc509f8c2ee0d1e6b08147f79ab961a4039fdadc351a88bcaedc13a9e0 SHA512 4cd80bb917b95ed96bee5005b54f50cbce6d3e341aee32c91daf301e3b4bc8fdd8b4c350b3a3951c6afa740df4565dfc5f0fdb7c858a3f2c7321c983f3fb36c2
 DIST pulseaudio-ctl-1.70.tar.gz 6513 BLAKE2B bd752c42a6ec7c205112637a11e2abae1474b2bcb43f09fa46439b1509c816e8baadd547868821f495f79acf9606bc913ee8664286f181357e264ffa3cdf60f9 SHA512 59ec5f3da3021fd79ba33d9934c6dde9eebdfcc5e7651355b69c54e13cf6525d741a68780c6dc5c871ad108a261334657f7f25306e59fc6142912e2ff2278cb7
-EBUILD pulseaudio-ctl-1.67.ebuild 688 BLAKE2B 3a49094e376b4b94d8dc000bb482c7e1f05dcf27efde4a79ad3b98cd1cc0b908dab4a9a4008f19371b8ba5834de35bfc7813cb8c60240c2983011d77332add43 SHA512 1dddd8e10477b99d15c64cff2f05401c36c6f09ecbae7216b44b1a8c8abbe977c00bd9c304d51f6521dce8a70ff87c624d6f539f9c1c1de78175b64f97b10295
-EBUILD pulseaudio-ctl-1.68.ebuild 615 BLAKE2B 7c751c3dd17cd4a51e142ec436dcea1620c5e24bd5bc87a03a4b81e8933dfa885a65bcd5275929afbac1cbfb41f28aa30ded77812b6ffc629f111c0fc715112b SHA512 66c38fb2cc349bd2ef934f6760a14669463d9985c575a7ff63a8250419d7a6e8609460dfc26e66f217f75a79535f6e66cc8bc4b2c88fea11cbc00b67e8b36b4a
-EBUILD pulseaudio-ctl-1.69.ebuild 615 BLAKE2B 5aca5a348d7b120ec3bf68b560fa9ed9d4e9e748312909c2c7dcf53cdb2273dba7753554221df1901fde969ce8849d1d42ef57566f05c2a01401abc9a6d38892 SHA512 5b7d59037fee4103d8498f3c71fce30035a8b3b5aea68486851efb816cc0adb7747722e3ecbebbc038476bcee476962a10590876f47c3224ca2f08e183daa873
 EBUILD pulseaudio-ctl-1.70-r1.ebuild 670 BLAKE2B 6dcc3111467d0e9a80d77d7e69c0a10df14cc49a8a2d8dda7472486125103ea892987891990fe4b7f9fdcc96327544ab17d5d35c6a8ec0d0b1f365a2dcb968b7 SHA512 29cc31c597a22aaf82fb661046a865497c8c00dd853179741590a5fd376cf13aec42cd9be4404abfebc607836945189bb4911e7dee83ce9f9424f8eb5f75d1a8
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild
deleted file mode 100644
index ad9ef3abe659..000000000000
--- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="CLI utility to control PulseAudio volume"
-HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
-SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
-# in both cases they should be already present if DE supports them
-RDEPEND="media-sound/pulseaudio"
-
-src_install() {
-	# install-man target compresses manpage
-	emake install-bin PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
-	doman doc/pulseaudio-ctl.1
-}
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
deleted file mode 100644
index 71ae8973b850..000000000000
--- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="CLI utility to control PulseAudio volume"
-HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
-SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
-# in both cases they should be already present if DE supports them
-RDEPEND="media-sound/pulseaudio"
-
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
-}
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild
deleted file mode 100644
index 64655c017f73..000000000000
--- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="CLI utility to control PulseAudio volume"
-HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
-SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
-# in both cases they should be already present if DE supports them
-RDEPEND="media-sound/pulseaudio"
-
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
-}
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index 88ac881b6238..37224609f392 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -1,8 +1,4 @@
 AUX enable-autospawn.conf 65 BLAKE2B 47e57076b19000ca3c57f0368e453198131c41a5a9c2d0cc8632f0a7ed4e5c992cf93e3c7651c4f3b59ceaf177d4d811bd6774676a2b005ec12259e56d99b4d2 SHA512 61f90b0d19e807a672bd39d190c1102db0b8c46284cf09d4a19b4b96d566633e56a60d21a3a1374e447e8e06496a3aef56bf5ae574337c081e7cf18842458e59
-AUX pulseaudio-16.0-fix-combine-sink-underrun-crash.patch 3707 BLAKE2B 798774fd8c290aaea996e3caee0faca591ae7ec691d485ee365b908e45e6ad596277d34d10090be9366b7bf077a51e7e9f7dbeab362853d419a96fd0ab65af07 SHA512 b604cd1e04832c617e1575bddf237abf6896b340f80c0616736d055892b42aa9665ad5bd2796869bc1eedcfc0d632aa4956fcaed4b4e89bee7eeb5ce60ad1cf1
-AUX pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch 1448 BLAKE2B 63ddbc36e3ac2ee553f6f30975886c2488e7d9889c3969b7110a75c24edc92eedf5c8c7be01130546fd67e7d71aaf7cf6b8b3842d2003b968d062fbe12b61f7b SHA512 7ff462e32e3218df28733af1abfab1f38173d48b458c0cab8b1f6aba0b7c5cd8479aaca52f0e25a1e4c71340e378c5a4b8bbd1c6613b979057d3dab035b5708f
-AUX pulseaudio-16.0-fix-pacmd-play-file-crash.patch 1625 BLAKE2B 5dbe6d24e0faf0152d6088244571c63d51392ab488e0b2ac47ad9a0a2fdb8f0c342824315b7be0916bde69af0911a6be02ad43e6369b5fcf1ad5cb3cb2fe88f6 SHA512 3cdbf444245229be7cb643c03d555cf7d7d5f8ba3bb608a72f27b660dc90413478681258d6226063c946cc783f48863994cc77709cb0f82b61a27dd01cb15305
-AUX pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch 1025 BLAKE2B 33b8aa51c966a0716fd9c15c51903e74b760bc72eaf511e9a86182155c6e9e5e6e1b8eb9af40cf7da023de25e1f74a2428d74954c230c53bc61c42e53033a9c2 SHA512 9e573806494b0e8d3aa51db205457e5c63326cb81fe5a2801b0e66b2b49c3133b30c85feafd0b58a64b5949cbc9e29e599459b76cbf5f479281ad8aa5c5bbb5e
 AUX pulseaudio-16.0-optional-module-console-kit.patch 3077 BLAKE2B 3b8abc67478f6c8848a24788bdceeb5bce868bf5214a092c3abbd39a3102679e4b390e56231de0559c8389730a2a75ba21bf4d9f9d942792589c6db66d6eb04d SHA512 bec1a747593d9130bb8cfb05b0894e467c953264879f2a856a420b07ee688640ec2279c136daa825b21e0e7e3bfc3aa1e333487a776d1c7ffb9a6d0293a0502b
 AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d06af4b298ad71d9c577dd6b3f0d9097fc95184b14193d0d55252987465ebd93bd0005849a68ce9b428d SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b
 AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54caf9297357ebee97e8ae10c54119521ecad99fbef5f1ad341128b06816f8c733faa29d9c44fa8c435008b SHA512 a11d02fd1c6672a7f022e6ef3e3ad8e3a7f2bf50257c38573db0823415c990021a7bf29b1e194d3d9c8a59464673958604086ef519313a4e3a6bd79071397f29
@@ -11,7 +7,5 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
 EBUILD pulseaudio-daemon-16.0-r1.ebuild 11997 BLAKE2B 7af693e228ee587a7ffa5120bbd788ebf9b779e7fdc9550b04b6706e200a9bf036834fd7eb7ee461b1a62a2f9ca4ac56abdab78dd3b61d78a609629fcac05e8e SHA512 fb36604ef31b93b4077bd809e4edb2697e511eecd62bb029ffb67bf2f2ed8e14fef6f61cc6356a7d5e816586efdf0d4eac121896808610952c92fd43beac9e5f
-EBUILD pulseaudio-daemon-16.0-r4.ebuild 11990 BLAKE2B 96115d8d74d47d52246a81fd965e22ef10d505f1d9276168c193269e27b7b8af53b152a8f3b7bf26ab21c053aaf0d8007568cfc7b48afc24a8c064a1524c7c91 SHA512 a6b10c7fdce24b4857be63dc00b377357927581f01ee7b5a5186036970e3ccaafa6d856f954582c42e9e56d136c6326f43268ebd772b5e5c22c23ab7bc9d9bba
-EBUILD pulseaudio-daemon-16.0-r5.ebuild 12411 BLAKE2B 1e8ed59be58201cc876f735827e32ab24141a6c0b2a677bd6c641a125ad9539138fc0b65f47b67928a281e80c0ff90a7b1a766aedadd85a033a34d18eba56db5 SHA512 2cc8cb215a11982feccec978c84d754ae7ad4f3e40e7febc5efacc4660d0e7d58a53c8b8bc4f77efb40223321c2219127fd17a52b5396efde81683dd2660f679
-EBUILD pulseaudio-daemon-16.1.ebuild 12180 BLAKE2B 3b07483a71a89f5d720cfb4a3201462f7bcab2d93a2374829280025f6579d1870a60db7e2ab368a0f36ce82128042584156f57eaeb4fffb2f37b8733d4e10da6 SHA512 f2c5bc031f011d04f57c4c98999b0f740aa2f1c1713b07530c729f2d795b17535b4cad24ae26189fe0782c7d242988774be0191a0b5571229e8a46ff400a73c5
+EBUILD pulseaudio-daemon-16.1.ebuild 12176 BLAKE2B 9191d042a854771890e77a7824365f10c84d4a3fb96d755ec19d4ee63b4074b725712ca4ee48a45453fd59ed931438bf2e88a9b835acbf15bbf5947beade2a51 SHA512 301dad95a0ce492684dddca6d1b4700e1e2dd4a9c607e26fd802cb63f2685748c68848d43aaeaed050897208ad3e83858ffab47a61f90856397fb6d60eabac0e
 MISC metadata.xml 3570 BLAKE2B 24d7b24a68f5e832708d9879769f55ec4cf146c47a41b5fa0ff33f63a5a9945736e227c6a6afa106f964fd91eb3b0ee441203c92f312ed835ef2197979b6fda9 SHA512 34aa5503ad5483eeff2f7c4713d96322dedbdd56b7d52a17ba0658aba24aef58239d5ee1943a276555c2508fd3d5e18639ec6417044adad512693fa6c673c5df
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch
deleted file mode 100644
index d66d75afdfda..000000000000
--- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ee8bfb49adddd271d8a8cafa796c6f9fa84de48a
-
-From ee8bfb49adddd271d8a8cafa796c6f9fa84de48a Mon Sep 17 00:00:00 2001
-From: Georg Chini <georg@chini.tk>
-Date: Fri, 17 Jun 2022 13:11:11 +0200
-Subject: [PATCH] combine-sink: Fix threading issue during underrun
-
-A recent commit added i->origin sink for the sink inputs of the combine sinks.
-Therefore pa_sink_process_input_underruns() treated the combine sink like
-filter sinks. pa_sink_process_input_underruns() calls itself with the
-origin sink, which is only correct for filter sinks because they run in the
-thread context of the origin sink. The combine sink however has its own
-thread context, so pa_sink_process_input_underruns() was executed in the
-wrong context.
-This patch fixes the issue by skipping the section for module-combine-sink.
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/722>
----
- src/pulsecore/sink.c | 37 +++++++++++++++++++++++--------------
- 1 file changed, 23 insertions(+), 14 deletions(-)
-
-diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
-index 3108ae765..0f0dc56fc 100644
---- a/src/pulsecore/sink.c
-+++ b/src/pulsecore/sink.c
-@@ -1016,20 +1016,29 @@ size_t pa_sink_process_input_underruns(pa_sink *s, size_t left_to_play) {
-         if (i->origin_sink) {
-             size_t filter_result, left_to_play_origin;
- 
--            /* The recursive call works in the origin sink domain ... */
--            left_to_play_origin = pa_convert_size(left_to_play, &i->sink->sample_spec, &i->origin_sink->sample_spec);
--
--            /* .. and returns the time to sleep before waking up. We need the
--             * underrun duration for comparisons, so we undo the subtraction on
--             * the return value... */
--            filter_result = left_to_play_origin - pa_sink_process_input_underruns(i->origin_sink, left_to_play_origin);
--
--            /* ... and convert it back to the master sink domain */
--            filter_result = pa_convert_size(filter_result, &i->origin_sink->sample_spec, &i->sink->sample_spec);
--
--            /* Remember the longest underrun so far */
--            if (filter_result > result)
--                result = filter_result;
-+            /* The combine sink sets i->origin sink but has a different threading model
-+             * than the filter sinks. Therefore the recursion below may not be executed
-+             * because pa_sink_process_input_underruns() was not called in the thread
-+             * context of the origin sink.
-+             * FIXME: It is unclear if some other kind of recursion would be necessary
-+             * for the combine sink. */
-+            if (!i->module || !pa_safe_streq(i->module->name, "module-combine-sink")) {
-+
-+                /* The recursive call works in the origin sink domain ... */
-+                left_to_play_origin = pa_convert_size(left_to_play, &i->sink->sample_spec, &i->origin_sink->sample_spec);
-+
-+                /* .. and returns the time to sleep before waking up. We need the
-+                 * underrun duration for comparisons, so we undo the subtraction on
-+                 * the return value... */
-+                filter_result = left_to_play_origin - pa_sink_process_input_underruns(i->origin_sink, left_to_play_origin);
-+
-+                /* ... and convert it back to the master sink domain */
-+                filter_result = pa_convert_size(filter_result, &i->origin_sink->sample_spec, &i->sink->sample_spec);
-+
-+                /* Remember the longest underrun so far */
-+                if (filter_result > result)
-+                    result = filter_result;
-+            }
-         }
- 
-         if (uf == 0) {
--- 
-GitLab
-
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch
deleted file mode 100644
index a2efaf37b381..000000000000
--- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/dd4dc5e8bce2c03631c3613dbddee1a691bdd17d
-
-From dd4dc5e8bce2c03631c3613dbddee1a691bdd17d Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Fri, 17 Jun 2022 14:36:36 +0200
-Subject: [PATCH] bluetooth/gst: Correct var type for GST_TYPE_BITMASK
-
-GST_TYPE_BITMASK is 64-bit bit mask while corresponding channel_mask in
-pulseaudio is int therefore usually 32-bit. Switch to uint64_t instead
-to match internal representation in gstreamer.
-
-Fixes pulseaudio crash on ARM 32-bit when pulseaudio is compiled with
-gstreamer and either LDAC or aptX support is available.
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/723>
----
- src/modules/bluetooth/a2dp-codec-gst.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/bluetooth/a2dp-codec-gst.c b/src/modules/bluetooth/a2dp-codec-gst.c
-index 8ef74be9c..11839c580 100644
---- a/src/modules/bluetooth/a2dp-codec-gst.c
-+++ b/src/modules/bluetooth/a2dp-codec-gst.c
-@@ -22,6 +22,7 @@
- #endif
- 
- #include <arpa/inet.h>
-+#include <stdint.h>
- 
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
-@@ -82,7 +83,7 @@ fail:
- static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) {
-     gchar *sample_format;
-     GstCaps *caps;
--    int channel_mask;
-+    uint64_t channel_mask;
- 
-     switch (ss->format) {
-         case PA_SAMPLE_S16LE:
--- 
-GitLab
-
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch
deleted file mode 100644
index f9c044dbb2be..000000000000
--- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/a8a2a31408c4acf54530d65922d235d3e590ce05
-
-From a8a2a31408c4acf54530d65922d235d3e590ce05 Mon Sep 17 00:00:00 2001
-From: Jaechul Lee <jcsing.lee@samsung.com>
-Date: Thu, 2 Jun 2022 15:07:09 +0900
-Subject: [PATCH] sound-file-stream: Fix crash when playing a file which is not
- aligned
-
-pulseaudio crash occurred when I play a file using pacmd play-file command.
-The file is not aligned with its frame size and the last rendering size
-is also not aligned. Thus, an assertion was generated at the end of the
-file as the following.
-
-memblockq.c: Assertion 'uchunk->length % bq->base == 0' failed at
-../src/pulsecore/memblockq.c:288, function pa_memblockq_push(). Aborting.
-
-When I play the file using paplay, it works good. So, I changed to
-pa_memblockq_push_align instead of pa_memblockq_push to prevent the
-assertion.
-
-Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/717>
----
- src/pulsecore/sound-file-stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pulsecore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c
-index 147aa2288..255f4b61a 100644
---- a/src/pulsecore/sound-file-stream.c
-+++ b/src/pulsecore/sound-file-stream.c
-@@ -185,7 +185,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t length, pa_memchunk *chunk
- 
-         tchunk.length = (size_t) n * fs;
- 
--        pa_memblockq_push(u->memblockq, &tchunk);
-+        pa_memblockq_push_align(u->memblockq, &tchunk);
-         pa_memblock_unref(tchunk.memblock);
-     }
- 
--- 
-GitLab
-
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
deleted file mode 100644
index 3d72b9a009c4..000000000000
--- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit d7a633df899dda8738a30df318269e28c902e815
-Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-Date:   Mon Jun 13 21:38:08 2022 +0300
-
-    rtp: Initialize SDP info struct field added for OPUS
-    
-    Turned out that pa_sdp_info::enable_opus is never initialized, which seldom
-    makes module-rtp-recv believe it will be playing OPUS-encoded stream even though
-    discovered SDP record does not indicate OPUS codec in metadata.
-    
-    Fix this by adding missing initializer.
-    
-    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/720>
-
-diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
-index 4e6a442f8..bf131a27e 100644
---- a/src/modules/rtp/sdp.c
-+++ b/src/modules/rtp/sdp.c
-@@ -129,6 +129,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
-     i->origin = i->session_name = NULL;
-     i->salen = 0;
-     i->payload = 255;
-+    i->enable_opus = false;
- 
-     if (pa_startswith(t, PA_SDP_HEADER)) {
-         t += sizeof(PA_SDP_HEADER) - 1;
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
deleted file mode 100644
index 8c47aaf30579..000000000000
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
+++ /dev/null
@@ -1,388 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="pulseaudio-${MY_PV}"
-inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
-else
-	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-
-# +alsa-plugin as discussed in bug #519530
-# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
-# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
-ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
-# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
-REQUIRED_USE="
-	?? ( elogind systemd )
-	alsa-plugin? ( alsa )
-	aptx? ( bluetooth )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ldac? ( bluetooth )
-	ofono-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-	zeroconf? ( dbus )
-"
-
-# NOTE:
-# - libpcre needed in some cases, bug #472228
-# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
-# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
-gstreamer_deps="
-	media-libs/gst-plugins-base
-	>=media-libs/gstreamer-1.14
-"
-COMMON_DEPEND="
-	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
-	dev-libs/libatomic_ops
-	>=media-libs/libsndfile-1.0.20
-	>=media-libs/speexdsp-1.2
-	|| (
-		elibc_glibc? ( virtual/libc )
-		dev-libs/libpcre:3
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	aptx? ( ${gstreamer_deps} )
-	asyncns? ( >=net-libs/libasyncns-0.1 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		media-libs/sbc
-	)
-	dev-libs/libltdl
-	sys-kernel/linux-headers
-	>=sys-libs/libcap-2.22-r2
-	dbus? ( >=sys-apps/dbus-1.4.12 )
-	elogind? ( sys-auth/elogind )
-	equalizer? (
-		sci-libs/fftw:3.0=
-	)
-	fftw? (
-		sci-libs/fftw:3.0=
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	glib? ( >=dev-libs/glib-2.28.0:2 )
-	gstreamer? (
-		${gstreamer_deps}
-		>=dev-libs/glib-2.26.0:2
-	)
-	jack? ( virtual/jack )
-	ldac? ( ${gstreamer_deps} )
-	lirc? ( app-misc/lirc )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	selinux? ( sec-policy/selinux-pulseaudio )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	valgrind? ( dev-util/valgrind )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
-	X? (
-		>=x11-libs/libxcb-1.6
-		x11-libs/libICE
-		x11-libs/libSM
-		>=x11-libs/libX11-1.4.0
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	!<media-sound/pulseaudio-15.0-r100
-"
-
-# pulseaudio ships a bundle xmltoman, which uses XML::Parser
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( >=dev-libs/check-0.9.10 )
-	X? ( x11-base/xorg-proto )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
-# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
-RDEPEND="
-	${COMMON_DEPEND}
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		acct-user/pulse
-		acct-group/audio
-		acct-group/pulse-access
-	)
-	bluetooth? (
-		ldac? ( media-plugins/gst-plugins-ldac )
-		aptx? ( media-plugins/gst-plugins-openaptx )
-	)
-"
-unset gstreamer_deps
-
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-	orc? ( >=dev-lang/orc-0.4.15 )
-	system-wide? ( dev-util/unifdef )
-"
-
-DOCS=( NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-# patches merged upstream, to be removed with 16.1 or later bump
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
-	"${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch
-)
-
-src_prepare() {
-	default
-
-	gnome2_environment_reset
-}
-
-src_configure() {
-	local enable_bluez5_gstreamer="disabled"
-	if use aptx || use ldac ; then
-		enable_bluez5_gstreamer="enabled"
-	fi
-
-	local enable_fftw="disabled"
-	if use equalizer || use fftw ; then
-		enable_fftw="enabled"
-	fi
-
-	local emesonargs=(
-		--localstatedir="${EPREFIX}"/var
-
-		-Ddaemon=true
-		-Dclient=false
-		-Ddoxygen=false
-		-Dgcov=false
-		-Dman=true
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_use test tests)
-		-Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it
-		-Dstream-restore-clear-old-devices=true
-		-Drunning-from-build-tree=false
-
-		# Paths
-		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
-		-Dsystemduserunitdir=$(systemd_get_userunitdir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
-		# Optional features
-		$(meson_feature alsa)
-		$(meson_feature asyncns)
-		$(meson_feature zeroconf avahi)
-		$(meson_feature bluetooth bluez5)
-		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
-		$(meson_use bluetooth bluez5-native-headset)
-		$(meson_use ofono-headset bluez5-ofono-headset)
-		-Dconsolekit=disabled
-		$(meson_feature dbus)
-		$(meson_feature elogind)
-		-Dfftw=${enable_fftw}
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		$(meson_feature glib gsettings) # Supposedly correct?
-		$(meson_feature gstreamer)
-		-Dgtk=disabled
-		-Dhal-compat=false
-		-Dipv6=true
-		$(meson_feature jack)
-		$(meson_feature lirc)
-		$(meson_feature ssl openssl)
-		$(meson_feature orc)
-		$(meson_feature oss oss-output)
-		-Dsamplerate=disabled # Matches upstream
-		$(meson_feature sox soxr)
-		-Dspeex=enabled
-		$(meson_feature systemd)
-		$(meson_feature tcpd tcpwrap)
-		$(meson_feature udev)
-		$(meson_feature valgrind)
-		$(meson_feature X x11)
-
-		# Echo cancellation
-		-Dadrian-aec=false # Not packaged?
-		$(meson_feature webrtc-aec)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Upstream installs 'pactl' if client is built, with all symlinks except for
-	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
-	# This trips QA warning, workaround:
-	# - install missing aliases in media-libs/libpulse (client build)
-	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
-	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
-	rm "${D}/$(get_bashcompdir)"/pacmd || die
-	rm "${D}/$(get_bashcompdir)"/pasuspender || die
-
-	if use system-wide; then
-		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
-
-			use "${1}" && echo "-D${define}" || echo "-U${define}"
-		}
-
-		unifdef -x 1 \
-			$(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}"/pulseaudio.init.d-5 \
-			> "${T}"/pulseaudio \
-			|| die
-
-		doinitd "${T}"/pulseaudio
-
-		systemd_dounit "${FILESDIR}"/pulseaudio.service
-
-		# We need /var/run/pulse, bug 442852
-		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
-	else
-		# Prevent warnings when system-wide is not used, bug 447694
-		if use dbus; then
-			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf; then
-		sed -i \
-			-e '/module-zeroconf-publish/s:^#::' \
-			"${ED}/etc/pulse/default.pa" \
-			|| die
-	fi
-
-	# Only enable autospawning pulseaudio daemon on systems without systemd
-	if ! use systemd; then
-		insinto /etc/pulse/client.conf.d
-		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	use udev && udev_reload
-
-	if use system-wide; then
-		tmpfiles_process "pulseaudio.conf"
-
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog ""
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		elog ""
-	fi
-
-	if use equalizer; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-		elog ""
-	fi
-
-	if use bluetooth; then
-		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
-		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
-		elog "native headset backend by default. This can be selectively disabled"
-		elog "via runtime configuration arguments to module-bluetooth-discover"
-		elog "in /etc/pulse/default.pa"
-		elog "To disable HFP HF append enable_native_hfp_hf=false"
-		elog "To disable HSP HS append enable_native_hsp_hs=false"
-		elog "To disable HSP AG append headset=auto or headset=ofono"
-		elog "(note this does NOT require enabling USE ofono)"
-		elog ""
-	fi
-
-	if use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-		elog ""
-	fi
-
-	if use gstreamer; then
-		elog "GStreamer-based RTP implementation modile enabled."
-		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
-		elog "and add enable_opus=1 argument to module-rtp-send"
-		elog ""
-	fi
-
-	if use systemd; then
-		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
-		elog "It's recommended to start pulseaudio via its systemd user units:"
-		elog ""
-		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "Root user can change system default configuration for all users:"
-		elog ""
-		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
-		elog ""
-		elog "  autospawn = yes"
-		elog ""
-		elog "The change from autospawn to user units will take effect after restarting."
-		elog ""
-	fi
-
-	optfeature_header "PulseAudio can be enhanced by installing the following:"
-	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
-	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	use udev && udev_reload
-}
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
deleted file mode 100644
index 66f340cd76f7..000000000000
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="pulseaudio-${MY_PV}"
-inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
-
-DESCRIPTION="Daemon component of PulseAudio (networked sound server)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
-else
-	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-
-# +alsa-plugin as discussed in bug #519530
-# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
-# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
-ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
-# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
-REQUIRED_USE="
-	?? ( elogind systemd )
-	alsa-plugin? ( alsa )
-	aptx? ( bluetooth )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ldac? ( bluetooth )
-	ofono-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-	zeroconf? ( dbus )
-"
-
-# NOTE:
-# - libpcre needed in some cases, bug #472228
-# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
-# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
-gstreamer_deps="
-	media-libs/gst-plugins-base
-	>=media-libs/gstreamer-1.14
-"
-COMMON_DEPEND="
-	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
-	dev-libs/libatomic_ops
-	>=media-libs/libsndfile-1.0.20
-	>=media-libs/speexdsp-1.2
-	|| (
-		elibc_glibc? ( virtual/libc )
-		dev-libs/libpcre:3
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	aptx? ( ${gstreamer_deps} )
-	asyncns? ( >=net-libs/libasyncns-0.1 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		media-libs/sbc
-	)
-	dev-libs/libltdl
-	sys-kernel/linux-headers
-	>=sys-libs/libcap-2.22-r2
-	dbus? ( >=sys-apps/dbus-1.4.12 )
-	elogind? ( sys-auth/elogind )
-	equalizer? (
-		sci-libs/fftw:3.0=
-	)
-	fftw? (
-		sci-libs/fftw:3.0=
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	glib? ( >=dev-libs/glib-2.28.0:2 )
-	gstreamer? (
-		${gstreamer_deps}
-		>=dev-libs/glib-2.26.0:2
-	)
-	jack? ( virtual/jack )
-	ldac? ( ${gstreamer_deps} )
-	lirc? ( app-misc/lirc )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	selinux? ( sec-policy/selinux-pulseaudio )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	valgrind? ( dev-util/valgrind )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
-	X? (
-		>=x11-libs/libxcb-1.6
-		x11-libs/libICE
-		x11-libs/libSM
-		>=x11-libs/libX11-1.4.0
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	!<media-sound/pulseaudio-15.0-r100
-"
-
-# pulseaudio ships a bundle xmltoman, which uses XML::Parser
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( >=dev-libs/check-0.9.10 )
-	X? ( x11-base/xorg-proto )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
-# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
-RDEPEND="
-	${COMMON_DEPEND}
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		acct-user/pulse
-		acct-group/audio
-		acct-group/pulse-access
-	)
-	bluetooth? (
-		ldac? ( media-plugins/gst-plugins-ldac )
-		aptx? ( media-plugins/gst-plugins-openaptx )
-	)
-"
-unset gstreamer_deps
-
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-	orc? ( >=dev-lang/orc-0.4.15 )
-	system-wide? ( dev-util/unifdef )
-"
-
-DOCS=( NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-# patches merged upstream, to be removed with 16.1 or later bump
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
-	"${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch
-	"${FILESDIR}"/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch
-	"${FILESDIR}"/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch
-	"${FILESDIR}"/pulseaudio-16.0-fix-pacmd-play-file-crash.patch
-)
-
-src_prepare() {
-	default
-
-	gnome2_environment_reset
-}
-
-src_configure() {
-	local enable_bluez5_gstreamer="disabled"
-	if use aptx || use ldac ; then
-		enable_bluez5_gstreamer="enabled"
-	fi
-
-	local enable_fftw="disabled"
-	if use equalizer || use fftw ; then
-		enable_fftw="enabled"
-	fi
-
-	local emesonargs=(
-		--localstatedir="${EPREFIX}"/var
-
-		-Ddaemon=true
-		-Dclient=false
-		-Ddoxygen=false
-		-Dgcov=false
-		-Dman=true
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_use test tests)
-		-Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it
-		-Dstream-restore-clear-old-devices=true
-		-Drunning-from-build-tree=false
-
-		# Paths
-		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
-		-Dsystemduserunitdir=$(systemd_get_userunitdir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
-		# Optional features
-		$(meson_feature alsa)
-		$(meson_feature asyncns)
-		$(meson_feature zeroconf avahi)
-		$(meson_feature bluetooth bluez5)
-		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
-		$(meson_use bluetooth bluez5-native-headset)
-		$(meson_use ofono-headset bluez5-ofono-headset)
-		-Dconsolekit=disabled
-		$(meson_feature dbus)
-		$(meson_feature elogind)
-		-Dfftw=${enable_fftw}
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		$(meson_feature glib gsettings) # Supposedly correct?
-		$(meson_feature gstreamer)
-		-Dgtk=disabled
-		-Dhal-compat=false
-		-Dipv6=true
-		$(meson_feature jack)
-		$(meson_feature lirc)
-		$(meson_feature ssl openssl)
-		$(meson_feature orc)
-		$(meson_feature oss oss-output)
-		-Dsamplerate=disabled # Matches upstream
-		$(meson_feature sox soxr)
-		-Dspeex=enabled
-		$(meson_feature systemd)
-		$(meson_feature tcpd tcpwrap)
-		$(meson_feature udev)
-		$(meson_feature valgrind)
-		$(meson_feature X x11)
-
-		# Echo cancellation
-		-Dadrian-aec=false # Not packaged?
-		$(meson_feature webrtc-aec)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Upstream installs 'pactl' if client is built, with all symlinks except for
-	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
-	# This trips QA warning, workaround:
-	# - install missing aliases in media-libs/libpulse (client build)
-	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
-	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
-	rm "${D}/$(get_bashcompdir)"/pacmd || die
-	rm "${D}/$(get_bashcompdir)"/pasuspender || die
-
-	# Daemon configuration scripts will try to load snippets from corresponding '.d' dirs.
-	# Install these dirs to silence a warning if they are missing.
-	keepdir /etc/pulse/default.pa.d
-	keepdir /etc/pulse/system.pa.d
-
-	if use system-wide; then
-		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
-
-			use "${1}" && echo "-D${define}" || echo "-U${define}"
-		}
-
-		unifdef -x 1 \
-			$(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}"/pulseaudio.init.d-5 \
-			> "${T}"/pulseaudio \
-			|| die
-
-		doinitd "${T}"/pulseaudio
-
-		systemd_dounit "${FILESDIR}"/pulseaudio.service
-
-		# We need /var/run/pulse, bug 442852
-		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
-	else
-		# Prevent warnings when system-wide is not used, bug 447694
-		if use dbus; then
-			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf; then
-		sed -i \
-			-e '/module-zeroconf-publish/s:^#::' \
-			"${ED}/etc/pulse/default.pa" \
-			|| die
-	fi
-
-	# Only enable autospawning pulseaudio daemon on systems without systemd
-	if ! use systemd; then
-		insinto /etc/pulse/client.conf.d
-		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	use udev && udev_reload
-
-	if use system-wide; then
-		tmpfiles_process "pulseaudio.conf"
-
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog ""
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		elog ""
-	fi
-
-	if use equalizer; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-		elog ""
-	fi
-
-	if use bluetooth; then
-		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
-		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
-		elog "native headset backend by default. This can be selectively disabled"
-		elog "via runtime configuration arguments to module-bluetooth-discover"
-		elog "in /etc/pulse/default.pa"
-		elog "To disable HFP HF append enable_native_hfp_hf=false"
-		elog "To disable HSP HS append enable_native_hsp_hs=false"
-		elog "To disable HSP AG append headset=auto or headset=ofono"
-		elog "(note this does NOT require enabling USE ofono)"
-		elog ""
-	fi
-
-	if use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-		elog ""
-	fi
-
-	if use gstreamer; then
-		elog "GStreamer-based RTP implementation modile enabled."
-		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
-		elog "and add enable_opus=1 argument to module-rtp-send"
-		elog ""
-	fi
-
-	if use systemd; then
-		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
-		elog "It's recommended to start pulseaudio via its systemd user units:"
-		elog ""
-		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "Root user can change system default configuration for all users:"
-		elog ""
-		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
-		elog ""
-		elog "  autospawn = yes"
-		elog ""
-		elog "The change from autospawn to user units will take effect after restarting."
-		elog ""
-	fi
-
-	optfeature_header "PulseAudio can be enhanced by installing the following:"
-	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
-	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	use udev && udev_reload
-}
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
index 34f4f0f82566..706fa7f66af7 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index 72c095872ac6..228f1b757ea1 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,6 +1,4 @@
-DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
 EBUILD pulseaudio-modules-bt-1.4-r4.ebuild 2370 BLAKE2B 6e877c3ec88ef1aca75e39ec91318d8ca0d7ebf940e09648d81d1e4c6ac0435646747c556b4291041e446280697a0d33be64238e3eef5f0ba336590e758bde49 SHA512 a028f1c06200aa1f4a79ddca859e425fa093d865be2ec263f8af1e95fa20fd18bab932d7a2fda81f12e8b1040f262bee3eaffc4065c64018b657337a62044762
-EBUILD pulseaudio-modules-bt-1.4.ebuild 2209 BLAKE2B 3a7000e9dbfd49674f25bbb5715406f59c20c54df7077f9e4ba51835c9df3ea62540297cad6b79f5de233e1efc802d925d4947f9ae9c9be1f13ab254a1d33656 SHA512 17a6ba15fd737067031d65ce0bdc2d776260f62f2327f900fbce0b21248980f8ac78884c8c9bc07d766514544191003bc2be91308e11ec1f80921d5b309f4b6e
 MISC metadata.xml 767 BLAKE2B 7787505018f779a109f761f1ad5d73bc19654491d1a9adb900fb97cb023abcb76753f964d9c39eb9a98924391bd8a08e916c652b21e942dda31c84e8e16dce01 SHA512 2b12af8d5dda44c9cb5f58685f49c65a865f29e9f1506f5d5e5c4cce6629b19e49774e71c7b078c877ed053ee5c6530d219cf9fbe1c2a8c9a4e4628c497d5848
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
deleted file mode 100644
index b1b9841188e7..000000000000
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake readme.gentoo-r1
-
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
-HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
-
-PULSE_VER="13.0"
-SRC_URI="
-	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
-
-DEPEND="
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/sbc
-	ldac? ( media-libs/libldac )
-	>=net-wireless/bluez-5
-	>=sys-apps/dbus-1.0.0
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	( >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth(-)] <media-sound/pulseaudio-15.99.1 )
-"
-# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-DISABLE_AUTOFORMATTING="no"
-DOC_CONTENTS="
-After getting media-sound/pulseaudio merged without its bluetooth
-support (to not collide with this) you may have removed the loading
-of bluetooth modules in default.pa config file, leading to failure
-to use your bluetooth device (see
-https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
-Please ensure you have this lines present in your /etc/pulse/default.pa
-file:
-
-.ifexists module-bluetooth-policy.so
-load-module module-bluetooth-policy
-.endif
-
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# pulseaudio headers needed to build
-	rmdir pa/ || die
-	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
-		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
-		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
-		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index c4dbb4e4ca55..6307172476a2 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,17 +1,3 @@
-AUX pulseaudio-11.1-disable-flat-volumes.patch 1992 BLAKE2B 1ffbaf129d57abc7c02f430bdd59a76384456d7ef020e9765bc0541327279dcf7d005d87fe989fd0c89b2767564f99af87ece8c374e1d67c5d1cae1695f0819c SHA512 603f60ef38aeba83038fe5dc9e5f6a82e42d10a7f057f158b489dd04857c3bc8203b728d9df6736314ee3002648390cd564fdce347f2e6791e901a47041dd1fc
-AUX pulseaudio-13.0-clang.patch 765 BLAKE2B a5759d9b92a6b1c95adc70a1d8f3952046de987a00f7994719acc4e6357b3d81d3abb587d811e38cc70c9fed16504080222f3b61167b67c76273fe5147bb569c SHA512 59bcfaa2a13453536eb1c5b0fbbf457ae798047ce5287a8035980bee832ee0cedf4c997d36ef52e87bfd1fb1c3b7e611906f54cd116038b17d678995c2c1f017
-AUX pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch 1660 BLAKE2B 4a71414a1b93585d1fa9727372779872963177c0148a38a85474cd636d665efc926934ff2b581037b31f82ad051c538c4fedbd32698d975ca29432d32d0fcdfa SHA512 b41fac13fe67d5c6e315e89e7c9b2b4ba7f8e4036f75960b4e67b853930743b0af1c8602e7cfb95fc15fb4ee83cbc5d6141e48f597d5e2cb2789bc8d9a8eb992
-AUX pulseaudio-14.99.2-require-bluez-dependency.patch 3799 BLAKE2B 31f17051b214a449bf957e60a3816f709441a90bf084a9f00e35f5532e038d1199ab319b3d4975b4dc6a2d0182ebbd745824560951fe878f8537fe85e658ef22 SHA512 911d99bcc565d1869e4a13fa53965e346e634e7f3c155169dd2ee57b006cee63e31e3a3127d3ed157c37350a150606f8816cd0f66a01a98f7f34d3c70d0b1980
-AUX pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch 1045 BLAKE2B f654fb6fefff1eb289b133ca83313ec2c0ba77f63d86134d7ec31616f238b66553ab8817614946bfc5fb0a807edc055f837091ee028fe5f9fc2496e89fefbe6d SHA512 b8ca56b37fd120bd7ba83f7fac32d7908a426588cca9b286189783cb464fb09ca34ef8dc367cc1470b042b5c3a210de3cff3e07a7c93fd7a85c01fbf5ffb56f0
-AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d06af4b298ad71d9c577dd6b3f0d9097fc95184b14193d0d55252987465ebd93bd0005849a68ce9b428d SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b
-AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7254455b9ff19128c2fc69f176368976d835503554eb60a80a8f4b53797cf46ba11b55c82bc742bf03551f SHA512 d0e1519fc97208c2d42c7d9d8f2e7d4658e741e8063102713da361748b6deaeae475619a65b3d3d1893c107a4511e17d4245264b5430190087f1823899c0f64b
-AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
-AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
-DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
-EBUILD pulseaudio-13.0-r1.ebuild 11420 BLAKE2B 9dbe3d7ca0e295c016925e23369ec3b499dfa2d48c67289936c4211c07a72512251efc2e61688571ed5a0b6406a85f78efecaa8f5385283ea40d1659ceb54a86 SHA512 d5a27a4a1382dbaf0df03f72c020ed35ca221f98e3231cbd8a210656fd45a355091c7fdf1754e20ab63a97eeafedffa49b6a307a7bf0ce410a5cfaff998989c8
-EBUILD pulseaudio-15.0-r2.ebuild 11169 BLAKE2B 87e797d697ecdf882c30da4bb573322dab4c2a24c92f18738c93cfad16cf9405d1a3745db130e2774758b459e131b06f66b5d794eb0fc40d760ef8b2bee16710 SHA512 d751359d6305ceb29957a325aa77b4a1b4206f5d86ed98346df1e9f272f06fb43867e5154ab65b8911d36816d74d7238970ceb06b792ea3e08ef5ef63fa5b663
-EBUILD pulseaudio-15.0-r3.ebuild 11216 BLAKE2B b6b81a19e36106b2faff1607539af5c11a612c1a9f686f2d76b1d3a22873fddec171821ffedb3224dab2e1737fe87019460869f9059f800627a0b842ac1792ed SHA512 eadd4841cda27faa7c86b31e3cb2d658e01096ce2c4bfe1e818387294d11de3f1199c54512166df0f3dda5470f2cf7b9e37e4fcdcfe69bc29c9fe5cceaab3817
 EBUILD pulseaudio-16.0.ebuild 879 BLAKE2B bf99843aea835578905b86529c2bc11d93b28b6457d5ed6b52157e90a98ad5d9be17208c52f9e9d7dfa290e4676fcc79279aa38afa59c51d694579d4f15ec8ee SHA512 644aa3f63973836971e5793451f2e1ea4d81ce46b82c36ec61fcbe3807c5920a3c6ee8684c87f9164a9806bfc1d719b091bf1674b6955c2b3d3d2ca7367203d6
-EBUILD pulseaudio-16.1.ebuild 882 BLAKE2B 96662d523942487693b4ab70abb68b432468316312df1870e43db8dea3157eb7594a4ec844fba37ec3bb872666cebc1284099a6c5198ed0bbeeb2465acbb5b61 SHA512 fc87fd853175b7945185d94eab2248b2031ac6e83251616057dab03617cebcb8e7754ad2f4a262f5f196bfa53ae1cd9b3e37599190ad981a4e1d99fd44e3ddeb
-MISC metadata.xml 4111 BLAKE2B c2f5d0e123d9fee8d8d5e6a3f15cc4edb94c2ab8f6e0f4e0b8e0de778c67dc5482b4cfba550fec8653412b8dd026b66e0c2334d78144028d84d7ccd8a9e77cd1 SHA512 d3c949697b0be0cf3d0447b9691a77e97f2d77e099e0662a345e5c22f965a0d0a2dfd073dd601f28f39f4fb5676c0561c816335fa8ac8a019b55699637dac78c
+EBUILD pulseaudio-16.1.ebuild 878 BLAKE2B 0addc95dfcd08dfb038c3cfdd2177f75b293b7c5de5ff826c872f3c9667f70bba90d0aacb9109a82b2d16796edb6042ec16373341784d8afd3728e18eaf895cc SHA512 9f4adb9f425e55a26e85a62b5edd13fd5e9c3c48c689bdca1af3db71f6819db7800677224f7587763732158e857e790c846120adda828f300f13147eceebff45
+MISC metadata.xml 953 BLAKE2B a3a358855135a25b03c43f563fe9717da9eb56fb0bb18fba3c1a24f4e12e3eb97cb92e7582c1a7b4abf2e2496c712b5f514c1a74de85600e35d5196bc4c12574 SHA512 222d58e1ce890721bfab43768a62940e818a85bd100505bc782771d05614570038a8be515bddea0ace47baabcf3fba3529f783c94dbdaea969b84982a8625453
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
deleted file mode 100644
index 40b23ec05f2e..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
---- a/man/pulse-daemon.conf.5.xml.in	2016-05-26 23:21:17.000000000 -0500
-+++ b/man/pulse-daemon.conf.5.xml.in	2016-05-31 10:01:55.679976730 -0500
-@@ -220,7 +220,7 @@ License along with PulseAudio; if not, s
-       <p><opt>flat-volumes=</opt> Enable 'flat' volumes, i.e. where
-       possible let the sink volume equal the maximum of the volumes of
-       the inputs connected to it. Takes a boolean argument, defaults
--      to <opt>yes</opt>.</p>
-+      to <opt>no</opt>.</p>
-     </option>
- 
-   </section>
-diff -up a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
---- a/src/daemon/daemon-conf.c	2016-05-26 23:21:17.000000000 -0500
-+++ b/src/daemon/daemon-conf.c	2016-05-31 10:01:55.680976735 -0500
-@@ -68,7 +68,7 @@ static const pa_daemon_conf default_conf
-     .realtime_priority = 5,  /* Half of JACK's default rtprio */
-     .disallow_module_loading = false,
-     .disallow_exit = false,
--    .flat_volumes = true,
-+    .flat_volumes = false,
-     .exit_idle_time = 20,
-     .scache_idle_time = 20,
-     .script_commands = NULL,
-diff -up a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
---- a/src/daemon/daemon.conf.in	2016-05-31 10:01:55.680976735 -0500
-+++ b/src/daemon/daemon.conf.in	2016-05-31 10:02:28.048133267 -0500
-@@ -57,7 +57,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
- ; enable-lfe-remixing = no
- ; lfe-crossover-freq = 0
- 
--; flat-volumes = yes
-+; flat-volumes = no
- 
- ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
- ; rlimit-fsize = -1
-diff -up a/src/pulsecore/core.c b/src/pulsecore/core.c
---- a/src/pulsecore/core.c	2016-05-26 23:21:17.000000000 -0500
-+++ b/src/pulsecore/core.c	2016-05-31 10:01:55.681976740 -0500
-@@ -135,7 +135,7 @@ pa_core* pa_core_new(pa_mainloop_api *m,
-     c->exit_idle_time = -1;
-     c->scache_idle_time = 20;
- 
--    c->flat_volumes = true;
-+    c->flat_volumes = false;
-     c->disallow_module_loading = false;
-     c->disallow_exit = false;
-     c->running_as_daemon = false;
diff --git a/media-sound/pulseaudio/files/pulseaudio-13.0-clang.patch b/media-sound/pulseaudio/files/pulseaudio-13.0-clang.patch
deleted file mode 100644
index d7b81de0313e..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-13.0-clang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e4450d8b586103ec1414e2d6245ff34a9096d97a Mon Sep 17 00:00:00 2001
-From: Peter Levine <plevine457@gmail.com>
-Date: Thu, 26 Sep 2019 07:24:40 +0000
-Subject: [PATCH] atomic: Explicitly cast void* to unsigned long
-
----
- src/pulsecore/atomic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
-index a82ca83c5..e5c140109 100644
---- a/src/pulsecore/atomic.h
-+++ b/src/pulsecore/atomic.h
-@@ -117,7 +117,7 @@ static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
- }
- 
- static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void* p) {
--    __atomic_store_n(&a->value, p, __ATOMIC_SEQ_CST);
-+    __atomic_store_n(&a->value, (unsigned long) p, __ATOMIC_SEQ_CST);
- }
- 
- #else
--- 
-GitLab
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch b/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch
deleted file mode 100644
index a6554178da60..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 58052e0e04ee1b5fdb1027ebc19717e7766825ec Mon Sep 17 00:00:00 2001
-From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
-Date: Mon, 21 Jun 2021 02:32:41 +0300
-Subject: [PATCH] build-sys: meson: require GIO dependency for RTP-GStreamer
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/584>
----
- meson.build             | 6 ++++--
- src/modules/meson.build | 2 +-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index fdd8bf655..61660b981 100644
---- a/meson.build
-+++ b/meson.build
-@@ -614,8 +614,9 @@ if dbus_dep.found()
-   cdata.set('HAVE_DBUS', 1)
- endif
- 
--gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
--if gio_dep.found()
-+gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
-+if get_option('gsettings').enabled()
-+  assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
-   cdata.set('HAVE_GSETTINGS', 1)
- endif
- 
-@@ -760,6 +761,7 @@ gstrtp_dep = dependency('gstreamer-rtp-1.0', required : get_option('gstreamer'))
- 
- have_gstreamer = false
- if gst_dep.found() and gstapp_dep.found() and gstrtp_dep.found()
-+  assert(gio_dep.found(), 'GStreamer-based RTP needs glib I/O library (GIO)')
-   have_gstreamer = true
- endif
- 
-diff --git a/src/modules/meson.build b/src/modules/meson.build
-index 9c498a4e1..e7db573b6 100644
---- a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -161,7 +161,7 @@ if dbus_dep.found() and fftw_dep.found()
-   ]
- endif
- 
--if gio_dep.found()
-+if get_option('gsettings').enabled() and gio_dep.found()
-   subdir('gsettings')
-   all_modules += [
-     [ 'module-gsettings',
--- 
-GitLab
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-bluez-dependency.patch b/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-bluez-dependency.patch
deleted file mode 100644
index 5983a05ea4a9..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-bluez-dependency.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c817dfb5a438055c98449a4a2f34eb4ec341ccde Mon Sep 17 00:00:00 2001
-From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
-Date: Fri, 18 Jun 2021 20:48:12 +0300
-Subject: [PATCH] build-sys: meson: Require bluez dependency if bluez5 feature
- is enabled
-
-Build breaks if bluez5 and bluez5-native-headset are both enabled
-but bluez headers are not available.
-
-Fix this by changing `bluez5` to Meson feature requiring `bluez` dependency.
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/583>
----
- meson.build                       | 10 ++++++----
- meson_options.txt                 |  2 +-
- src/modules/bluetooth/meson.build |  2 +-
- src/modules/meson.build           |  2 +-
- 4 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 61660b981..92ceef706 100644
---- a/meson.build
-+++ b/meson.build
-@@ -706,7 +706,9 @@ endif
- 
- sbc_dep = dependency('sbc', version : '>= 1.0', required : false)
- 
--if get_option('bluez5')
-+bluez_dep = dependency('bluez', required : get_option('bluez5'))
-+
-+if bluez_dep.found()
-   assert(dbus_dep.found(), 'BlueZ requires D-Bus support')
-   assert(sbc_dep.found(), 'BlueZ requires SBC support')
-   cdata.set('HAVE_SBC', 1)
-@@ -914,9 +916,9 @@ summary = [
-   'Enable Async DNS:              @0@'.format(asyncns_dep.found()),
-   'Enable LIRC:                   @0@'.format(lirc_dep.found()),
-   'Enable D-Bus:                  @0@'.format(dbus_dep.found()),
--  '  Enable BlueZ 5:              @0@'.format(get_option('bluez5')),
--  '    Enable native headsets:    @0@'.format(get_option('bluez5-native-headset')),
--  '    Enable  ofono headsets:    @0@'.format(get_option('bluez5-ofono-headset')),
-+  '  Enable BlueZ 5:              @0@'.format(cdata.has('HAVE_BLUEZ_5')),
-+  '    Enable native headsets:    @0@'.format(cdata.has('HAVE_BLUEZ_5_NATIVE_HEADSET')),
-+  '    Enable  ofono headsets:    @0@'.format(cdata.has('HAVE_BLUEZ_5_OFONO_HEADSET')),
-   '    Enable GStreamer based codecs: @0@'.format(have_bluez5_gstreamer),
-   'Enable udev:                   @0@'.format(udev_dep.found()),
-   '  Enable HAL->udev compat:     @0@'.format(get_option('hal-compat')),
-diff --git a/meson_options.txt b/meson_options.txt
-index cdb3c6787..bb41a42a7 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -85,7 +85,7 @@ option('avahi',
-        type : 'feature', value : 'auto',
-        description : 'Optional Avahi support')
- option('bluez5',
--       type : 'boolean', value : 'true',
-+       type : 'feature', value : 'auto',
-        description : 'Optional BlueZ 5 support')
- option('bluez5-gstreamer',
-        type : 'feature', value: 'auto',
-diff --git a/src/modules/bluetooth/meson.build b/src/modules/bluetooth/meson.build
-index 99263bb5a..ca77ee6aa 100644
---- a/src/modules/bluetooth/meson.build
-+++ b/src/modules/bluetooth/meson.build
-@@ -35,7 +35,7 @@ libbluez5_util = shared_library('bluez5-util',
-   c_args : [pa_c_args, server_c_args],
-   link_args : [nodelete_link_args],
-   include_directories : [configinc, topinc],
--  dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
-+  dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, bluez_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
-   install : true,
-   install_rpath : privlibdir,
-   install_dir : modlibexecdir,
-diff --git a/src/modules/meson.build b/src/modules/meson.build
-index e7db573b6..be72c3b9b 100644
---- a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -118,7 +118,7 @@ if avahi_dep.found()
-   ]
- endif
- 
--if get_option('bluez5')
-+if cdata.has('HAVE_BLUEZ_5')
-   subdir('bluetooth')
-   all_modules += [
-     [ 'module-bluetooth-discover', 'bluetooth/module-bluetooth-discover.c' ],
--- 
-GitLab
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
deleted file mode 100644
index f3df62031d34..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/806052
-
-commit 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5
-Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-Date:   Tue Aug 3 09:43:32 2021 +0300
-
-    build-sys: meson: Require xice, xsm and xtst for daemon only
-    
-    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/613>
-
---- a/meson.build
-+++ b/meson.build
-@@ -681,9 +681,9 @@ endif
- x11_dep = dependency('x11-xcb', required : get_option('x11'))
- if x11_dep.found()
-   xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
--  ice_dep  = dependency('ice',  required : true)
--  sm_dep   = dependency('sm',   required : true)
--  xtst_dep = dependency('xtst', required : true)
-+  ice_dep  = dependency('ice',  required : get_option('daemon'))
-+  sm_dep   = dependency('sm',   required : get_option('daemon'))
-+  xtst_dep = dependency('xtst', required : get_option('daemon'))
-   cdata.set('HAVE_X11', 1)
-   if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
-     cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d
deleted file mode 100644
index 9e7245344a57..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-# Config file for /etc/init.d/pulseaudio
-
-# For more see "pulseaudio -h".
-
-# Startup options
-PA_OPTS="--log-target=syslog --disallow-module-loading=1"
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-5 b/media-sound/pulseaudio/files/pulseaudio.init.d-5
deleted file mode 100644
index d5415d6987d8..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-5
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	use net
-
-	local script="/etc/pulse/system.pa"
-
-	for opt in ${PA_OPTS}; do
-		case "$opt" in
-			--file=*)	script="${opt#*=}" ;;
-			-F*)		script="${opt#-F}" ;;
-		esac
-	done
-
-	config "$script"
-
-	local needs="$(get_options need)"
-	if [ -n "${needs}" ]; then
-		need ${needs}
-		return
-	fi
-
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then
-	    needs="${needs} consolekit"
-	fi
-
-#ifdef UDEV
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then
-	    needs="${needs} udev"
-	fi
-#endif
-
-#ifdef AVAHI
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then
-	    needs="${needs} avahi-daemon"
-	fi
-#endif
-
-#ifdef BLUETOOTH
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then
-	    needs="${needs} bluetooth"
-	fi
-#endif
-
-#ifdef ALSA
-	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || 
-	    egrep -q '^[[:space:]]*load-module[[:space:]]+module-(udev-)?detect' "$script" ||
-	    egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then
-	    needs="${needs} alsasound"
-	fi
-#endif
-
-	need "${needs}"
-	save_options need "${needs}"
-}
-
-start() {
-	if [ -z "${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE}" ]; then
-		eerror "Please don't use system wide PulseAudio unless you read the"
-		eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
-		eerror ""
-		eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in"
-		eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode"
-		eerror "when used for standard desktop configurations."
-		return 1
-	fi
-	ebegin "Starting pulseaudio"
-	PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system"
-	start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pulseaudio"
-	start-stop-daemon --stop --quiet --exec /usr/bin/pulseaudio --pidfile /var/run/pulse/pid
-	eend $?
-}
diff --git a/media-sound/pulseaudio/files/pulseaudio.service b/media-sound/pulseaudio/files/pulseaudio.service
deleted file mode 100644
index c5f0d5799929..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=System wide PulseAudio instance
-After=syslog.target network.target alsasound.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/pulseaudio --system --log-target=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/media-sound/pulseaudio/files/pulseaudio.tmpfiles b/media-sound/pulseaudio/files/pulseaudio.tmpfiles
deleted file mode 100644
index 88374e35574b..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/pulse 0755 pulse audio -
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index b2a077b71249..9810b94f531c 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -14,83 +14,14 @@
     <name>Mart Raudsepp</name>
   </maintainer>
   <use>
-    <flag name="X">
-      Build the X11 publish module to export PulseAudio information
-      through X11 protocol for clients to make use. Don't enable this
-      flag if you want to use a system wide instance. If unsure, enable
-      this flag.
-    </flag>
-    <flag name="alsa-plugin">
-      Request installing <pkg>media-plugins/alsa-plugins</pkg> with
-      PulseAudio plugin enabled. This ensures that clients supporting
-      ALSA only will use PulseAudio.
-    </flag>
     <flag name="daemon">Build the pulseaudio binary (not-needed for pipewire-pulse)</flag>
-    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for giving each session a PA client</flag>
-    <flag name="gconf">
-      Ensure <pkg>gnome-base/gconf</pkg> is present for pulseaudio GConf
-      to GSettings module automatic migration (keeping the user configuration)
-    </flag>
-    <flag name="oss">
-      Enable OSS sink/source (output/input). Deprecated, upstream does
-      not support this on systems where other sink/source systems are
-      available (i.e.: Linux). The padsp wrapper is now always build
-      if the system supports OSS at all.
-    </flag>
     <flag name="glib">
       Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
       libpulse client library, to allow using libpulse on glib-based
       programs. Build the GSettings PA module.
     </flag>
-    <flag name="system-wide">
-      Allow preparation and installation of the system-wide init
-      script for PulseAudio. Since this support is only supported for
-      embedded situations, do not enable without reading the upstream
-      instructions at
-      https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
-    </flag>
-    <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
-    <flag name="doc">Build the doxygen-described API documentation.</flag>
-    <flag name="realtime">
-      Makes PulseAudio use RealtimeKit (<pkg>sys-auth/rtkit</pkg>) to get
-      real-time priority while running.
-    </flag>
-    <flag name="equalizer">
-      Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
-    </flag>
-    <flag name="ssl">
-      Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
-      (AirPort) streaming.
-    </flag>
-    <flag name="gdbm">
-      Use <pkg>sys-libs/gdbm</pkg> to store PulseAudio
-      databases. Recommended for desktop usage. This flag causes the
-      whole package to be licensed under GPL-2 or later.
-    </flag>
-    <flag name="webrtc-aec">
-      Uses the webrtc.org AudioProcessing library for enhancing VoIP calls
-      greatly in applications that support it by performing acoustic echo
-      cancellation, analog gain control, noise suppression and other processing.
-    </flag>
-    <flag name="systemd">
-      Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
-      ConsoleKit.
-    </flag>
-    <flag name="native-headset">
-      Build with native HSP backend for bluez 5.
-    </flag>
     <flag name="ofono-headset">
       Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
     </flag>
-    <flag name="gstreamer">
-      Build with support for gstreamer including ability to use bluetooth codecs.
-      For bluetooth codecs see USE ldac and aptx.
-    </flag>
-    <flag name="aptx">
-      aptX (HD) over Bluetooth (many Android compatible headphones), requires <pkg>media-plugins/gst-plugins-openaptx</pkg>.
-    </flag>
-    <flag name="ldac">
-      LDAC over Bluetooth (primarily Sony headphones), requires <pkg>media-plugins/gst-plugins-ldac</pkg>.
-    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
deleted file mode 100644
index 5c3f45966c18..000000000000
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs udev multilib-minimal tmpfiles
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
-+gdbm +glib gtk ipv6 jack libsamplerate lirc native-headset cpu_flags_arm_neon
-ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
-+udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	?? ( elogind systemd )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	realtime? ( dbus )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? ( dev-libs/openssl:0= )
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-	realtime? ( sys-auth/rtkit )
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-		acct-user/pulse
-		acct-group/pulse-access
-	)
-	acct-group/audio
-"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	system-wide? ( dev-util/unifdef )
-	test? ( >=dev-libs/check-0.9.10 )
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
-	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(multilib_native_usex orc "ORCC=${BROOT}/usr/bin/orcc" '')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable cpu_flags_arm_neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use elogind && multilib_is_native_abi; then
-		local PKGCONFIG="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind")"
-			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind")"
-		)
-	fi
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	else
-		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
-		if use elibc_glibc ; then
-			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	if use system-wide; then
-		tmpfiles_process "${PN}.conf"
-
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
deleted file mode 100644
index 91cc01e8a068..000000000000
--- a/media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
-else
-	SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-
-# +alsa-plugin as discussed in bug #519530
-# TODO: Deal with bluez5-gstreamer - requires ldacenc and rtpldacpay gstreamer elements
-# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
-# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm
-gstreamer +glib gtk ipv6 jack lirc native-headset ofono-headset +orc oss selinux sox ssl systemd
-system-wide tcpd test +udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
-# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
-REQUIRED_USE="
-	alsa-plugin? ( alsa )
-	bluetooth? ( dbus )
-	daemon? ( ?? ( elogind systemd ) )
-	!daemon? (
-		!alsa
-		!alsa-plugin
-		!bluetooth
-		!equalizer
-		!gdbm
-		!gstreamer
-		!gtk
-		!jack
-		!lirc
-		!native-headset
-		!ofono-headset
-		!orc
-		!oss
-		!sox
-		!ssl
-		!system-wide
-		!udev
-		!webrtc-aec
-		!zeroconf
-	)
-	equalizer? ( dbus )
-	native-headset? ( bluetooth )
-	ofono-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-	zeroconf? ( dbus )
-"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	system-wide? ( dev-util/unifdef )
-"
-
-# NOTE:
-# - libpcre needed in some cases, bug #472228
-# - media-libs/speexdsp is providing echo canceller implementation
-COMMON_DEPEND="
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	>=media-libs/speexdsp-1.2[${MULTILIB_USEDEP}]
-	virtual/libc
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		media-libs/sbc
-	)
-	daemon? (
-		dev-libs/libltdl
-		sys-kernel/linux-headers
-		>=sys-libs/libcap-2.22-r2
-	)
-	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
-	elogind? ( sys-auth/elogind )
-	equalizer? (
-		sci-libs/fftw:3.0
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gst-plugins-base
-		>=media-libs/gstreamer-1.14
-	)
-	gtk? ( x11-libs/gtk+:3 )
-	jack? ( virtual/jack )
-	lirc? ( app-misc/lirc )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	selinux? ( sec-policy/selinux-pulseaudio )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		daemon? (
-			x11-libs/libICE
-			x11-libs/libSM
-			>=x11-libs/libX11-1.4.0
-			>=x11-libs/libXtst-1.0.99.2
-		)
-	)
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-"
-
-# pulseaudio ships a bundle xmltoman, which uses XML::Parser
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libatomic_ops
-	dev-libs/libpcre:*
-	test? ( >=dev-libs/check-0.9.10 )
-	X? ( x11-base/xorg-proto )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
-# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
-RDEPEND="
-	${COMMON_DEPEND}
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		acct-user/pulse
-		acct-group/audio
-		acct-group/pulse-access
-	)
-"
-
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-DOCS=( NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
-)
-
-src_prepare() {
-	default
-
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}"/var
-
-		$(meson_native_use_bool daemon)
-		$(meson_native_use_bool doc doxygen)
-		-Dgcov=false
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_native_use_bool test tests)
-		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
-		-Dstream-restore-clear-old-devices=true
-		-Drunning-from-build-tree=false
-
-		# Paths
-		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
-		-Dsystemduserunitdir=$(systemd_get_userunitdir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
-		# Optional features
-		$(meson_native_use_feature alsa)
-		$(meson_feature asyncns)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature bluetooth bluez5)
-		-Dbluez5-gstreamer=disabled # no ldacenc/rtpldacpay gst elements packaged yet
-		$(meson_native_use_bool native-headset bluez5-native-headset)
-		$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
-		$(meson_feature dbus)
-		$(meson_native_use_feature elogind)
-		$(meson_native_use_feature equalizer fftw)
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		$(meson_native_use_feature glib gsettings) # Supposedly correct?
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gtk)
-		-Dhal-compat=true # Consider disabling on next revbump
-		$(meson_use ipv6)
-		$(meson_native_use_feature jack)
-		$(meson_native_use_feature lirc)
-		$(meson_native_use_feature ssl openssl)
-		$(meson_native_use_feature orc)
-		$(meson_native_use_feature oss oss-output)
-		-Dsamplerate=disabled # Matches upstream
-		$(meson_native_use_feature sox soxr)
-		-Dspeex=enabled
-		$(meson_native_use_feature systemd)
-		$(meson_native_use_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
-		$(meson_native_use_feature udev)
-		-Dvalgrind=auto
-		$(meson_feature X x11)
-
-		# Echo cancellation
-		-Dadrian-aec=false # Not packaged?
-		$(meson_native_use_feature webrtc-aec)
-	)
-
-	if multilib_is_native_abi; then
-		# Make padsp work for non-native ABI, supposedly only possible with glibc;
-		# this is used by /usr/bin/padsp that comes from native build, thus we need
-		# this argument for native build
-		if use elibc_glibc; then
-			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	else
-		emesonargs+=( -Dman=false )
-		if ! use elibc_glibc; then
-			# Non-glibc multilib is probably non-existent but just in case:
-			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
-		fi
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Generating documentation ..."
-			meson_src_compile doxygen
-		fi
-	fi
-}
-
-multilib_src_install() {
-	# The files referenced in the DOCS array do not exist in the multilib source directory,
-	# therefore clear the variable when calling the function that will access it.
-	DOCS= meson_src_install
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Installing documentation ..."
-			docinto html
-			dodoc -r doxygen/html/.
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use system-wide; then
-		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
-
-			use "${1}" && echo "-D${define}" || echo "-U${define}"
-		}
-
-		unifdef -x 1 \
-			$(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}"/pulseaudio.init.d-5 \
-			> "${T}"/pulseaudio \
-			|| die
-
-		doinitd "${T}"/pulseaudio
-
-		systemd_dounit "${FILESDIR}"/${PN}.service
-
-		# We need /var/run/pulse, bug 442852
-		newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-	else
-		# Prevent warnings when system-wide is not used, bug 447694
-		if use dbus && use daemon; then
-			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf; then
-		sed -i \
-			-e '/module-zeroconf-publish/s:^#::' \
-			"${ED}/etc/pulse/default.pa" \
-			|| die
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	if use system-wide; then
-		tmpfiles_process "${PN}.conf"
-
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog ""
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		elog ""
-	fi
-
-	if use equalizer; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-		elog ""
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-		elog ""
-	fi
-
-	if use systemd && use daemon; then
-		elog "It's recommended to start pulseaudio via its systemd user units:"
-		elog ""
-		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "The change from autospawn to user units will take effect after restarting."
-		elog ""
-	fi
-
-	optfeature_header "PulseAudio can be enhanced by installing the following:"
-	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
-	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
deleted file mode 100644
index 85f1d2a7a9a7..000000000000
--- a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
-else
-	SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-
-# +alsa-plugin as discussed in bug #519530
-# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
-# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm
-gstreamer +glib gtk ipv6 jack ldac lirc native-headset ofono-headset +orc oss selinux sox ssl systemd
-system-wide tcpd test +udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
-# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
-REQUIRED_USE="
-	alsa-plugin? ( alsa )
-	bluetooth? ( dbus )
-	daemon? ( ?? ( elogind systemd ) )
-	!daemon? (
-		!alsa
-		!alsa-plugin
-		!bluetooth
-		!equalizer
-		!gdbm
-		!gstreamer
-		!gtk
-		!jack
-		!lirc
-		!native-headset
-		!ofono-headset
-		!orc
-		!oss
-		!sox
-		!ssl
-		!system-wide
-		!udev
-		!webrtc-aec
-		!zeroconf
-	)
-	equalizer? ( dbus )
-	native-headset? ( bluetooth )
-	ofono-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-	zeroconf? ( dbus )
-"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	system-wide? ( dev-util/unifdef )
-"
-
-# NOTE:
-# - libpcre needed in some cases, bug #472228
-# - media-libs/speexdsp is providing echo canceller implementation
-COMMON_DEPEND="
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	>=media-libs/speexdsp-1.2[${MULTILIB_USEDEP}]
-	virtual/libc
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		media-libs/sbc
-	)
-	daemon? (
-		dev-libs/libltdl
-		sys-kernel/linux-headers
-		>=sys-libs/libcap-2.22-r2
-	)
-	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
-	elogind? ( sys-auth/elogind )
-	equalizer? (
-		sci-libs/fftw:3.0
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gst-plugins-base
-		>=media-libs/gstreamer-1.14
-	)
-	gtk? ( x11-libs/gtk+:3 )
-	jack? ( virtual/jack )
-	lirc? ( app-misc/lirc )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	selinux? ( sec-policy/selinux-pulseaudio )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		daemon? (
-			x11-libs/libICE
-			x11-libs/libSM
-			>=x11-libs/libX11-1.4.0
-			>=x11-libs/libXtst-1.0.99.2
-		)
-	)
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-"
-
-# pulseaudio ships a bundle xmltoman, which uses XML::Parser
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libatomic_ops
-	dev-libs/libpcre:*
-	test? ( >=dev-libs/check-0.9.10 )
-	X? ( x11-base/xorg-proto )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
-# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
-RDEPEND="
-	${COMMON_DEPEND}
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		acct-user/pulse
-		acct-group/audio
-		acct-group/pulse-access
-	)
-	daemon? (
-		bluetooth? (
-			gstreamer? (
-				ldac? ( media-plugins/gst-plugins-ldac )
-				aptx? ( media-plugins/gst-plugins-openaptx )
-			)
-		)
-	)
-"
-
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-DOCS=( NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
-)
-
-src_prepare() {
-	default
-
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}"/var
-
-		$(meson_native_use_bool daemon)
-		$(meson_native_use_bool doc doxygen)
-		-Dgcov=false
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_native_use_bool test tests)
-		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
-		-Dstream-restore-clear-old-devices=true
-		-Drunning-from-build-tree=false
-
-		# Paths
-		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
-		-Dsystemduserunitdir=$(systemd_get_userunitdir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
-		# Optional features
-		$(meson_native_use_feature alsa)
-		$(meson_feature asyncns)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature gstreamer bluez5-gstreamer)
-		$(meson_native_use_bool native-headset bluez5-native-headset)
-		$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
-		$(meson_feature dbus)
-		$(meson_native_use_feature elogind)
-		$(meson_native_use_feature equalizer fftw)
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		$(meson_native_use_feature glib gsettings) # Supposedly correct?
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gtk)
-		-Dhal-compat=true # Consider disabling on next revbump
-		$(meson_use ipv6)
-		$(meson_native_use_feature jack)
-		$(meson_native_use_feature lirc)
-		$(meson_native_use_feature ssl openssl)
-		$(meson_native_use_feature orc)
-		$(meson_native_use_feature oss oss-output)
-		-Dsamplerate=disabled # Matches upstream
-		$(meson_native_use_feature sox soxr)
-		-Dspeex=enabled
-		$(meson_native_use_feature systemd)
-		$(meson_native_use_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
-		$(meson_native_use_feature udev)
-		-Dvalgrind=auto
-		$(meson_feature X x11)
-
-		# Echo cancellation
-		-Dadrian-aec=false # Not packaged?
-		$(meson_native_use_feature webrtc-aec)
-	)
-
-	if multilib_is_native_abi; then
-		# Make padsp work for non-native ABI, supposedly only possible with glibc;
-		# this is used by /usr/bin/padsp that comes from native build, thus we need
-		# this argument for native build
-		if use elibc_glibc; then
-			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	else
-		emesonargs+=( -Dman=false )
-		if ! use elibc_glibc; then
-			# Non-glibc multilib is probably non-existent but just in case:
-			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
-		fi
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Generating documentation ..."
-			meson_src_compile doxygen
-		fi
-	fi
-}
-
-multilib_src_install() {
-	# The files referenced in the DOCS array do not exist in the multilib source directory,
-	# therefore clear the variable when calling the function that will access it.
-	DOCS= meson_src_install
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Installing documentation ..."
-			docinto html
-			dodoc -r doxygen/html/.
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use system-wide; then
-		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
-
-			use "${1}" && echo "-D${define}" || echo "-U${define}"
-		}
-
-		unifdef -x 1 \
-			$(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}"/pulseaudio.init.d-5 \
-			> "${T}"/pulseaudio \
-			|| die
-
-		doinitd "${T}"/pulseaudio
-
-		systemd_dounit "${FILESDIR}"/${PN}.service
-
-		# We need /var/run/pulse, bug 442852
-		newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-	else
-		# Prevent warnings when system-wide is not used, bug 447694
-		if use dbus && use daemon; then
-			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf; then
-		sed -i \
-			-e '/module-zeroconf-publish/s:^#::' \
-			"${ED}/etc/pulse/default.pa" \
-			|| die
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	if use system-wide; then
-		tmpfiles_process "${PN}.conf"
-
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog ""
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		elog ""
-	fi
-
-	if use equalizer; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-		elog ""
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-		elog ""
-	fi
-
-	if use systemd && use daemon; then
-		elog "It's recommended to start pulseaudio via its systemd user units:"
-		elog ""
-		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "The change from autospawn to user units will take effect after restarting."
-		elog ""
-	fi
-
-	optfeature_header "PulseAudio can be enhanced by installing the following:"
-	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
-	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-16.1.ebuild b/media-sound/pulseaudio/pulseaudio-16.1.ebuild
index 829409ae228c..4dcb6be5ba33 100644
--- a/media-sound/pulseaudio/pulseaudio-16.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-16.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A meta package for PulseAudio (networked sound server)"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 SRC_URI=""
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 LICENSE="metapackage"
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 7c88bcf8ebad..d4294ba4a8d0 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 457440e4a6ed..eacec3f5b3ff 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,21 +1,13 @@
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
-AUX pipewire-0.3.52-pulse-path.patch 2586 BLAKE2B 2569452967f54ac531f07852fcd78070e61f5972c95eed8d8690461f215330e92aad6eca8c5ac393b0903e6d0c26e8a69fac51b445c39aa428cfd47f0ad4d659 SHA512 0ec2d9ceb5acfdf0ecedb7683db52d0d2ddbee52f318a77720134ec51e920d0f76621b4b44c531b7b1c857d161979351eccb08734e6cb80d0c7a8925399d58b3
-AUX pipewire-0.3.55-jack-mix.patch 715 BLAKE2B 2e07e0cc5350f62bc5e3ff3c65cb30438c9b2085b744c6ea2a813408116575213738a8c1afdd693710ed99378d413d32dae0a887cfb491181850333551cbc160 SHA512 5873b788aa9716c1065cc79ea4a07ffe9feb9bfffad95d35fd7719da9eec8974b3725a6b31b90f02d895ed9e49c963c543edc030f6ae68b9afb6cc7fc87bdb61
 AUX pipewire-0.3.56-big-endian.patch 1632 BLAKE2B b47b5ca888de71c9ee71ba35d5a490074e39219777345f4bf55252c0e9de65b97cc995c894b27c43945c8b32d70304e46610b3b641732170dc8f1ad97ea6549b SHA512 84bda8d747b91f04a40da6e55f186991b679b124e2571d64cd18368d5d4e1e2273565e3eee0a7b4b1a20a731429c240f168b970b02f88534375131b24c358cc1
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
-DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a
-DIST pipewire-0.3.53_p20220705.tar.bz2 1358645 BLAKE2B 365e81ab114fb9b4abbd5351145d0558c7c00bdbccefc2f7bacb965018c1e7009b7b26b8e95baf35534b74cf9ce49483604841aa7ba949d6a94e720e8ec4233c SHA512 631e737e3517cb4d4c3f84e9540acde2cf94bde472626c61e0223ff4ac5cc2118a35dae79d009558384e24b955cf002d209db1bcf1465056757234725213f152
-DIST pipewire-0.3.55.tar.gz 1801857 BLAKE2B ee8d75bffba5f6b2e6ccd4da518339aa8e00e6afd8a4e8b6839bc0e4422b587f7543916ef161c9995bb7bfdf20032af984ac2fe9238ac9ad6160ab5d5942f700 SHA512 a139e51bc0d4144ae3bd3511962e541ae5c8a76d344d472805819e5bda6e62ec9807489c2a9e9f42bd9a25eff243f8a794b71d629438bf732a5cd92b85eaa9fc
 DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0 SHA512 a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108
 EBUILD pipewire-0.3.51-r2.ebuild 13194 BLAKE2B 8be112d99c48d5699dc51efe5bb3cff9509d4787f42f97df4ae4c14c254699e13750d2bbf3abf87a4102e763ffec7cd3a49103d29909284d4e94b35a04c0e965 SHA512 3504398ade620b89890c85c18aafa61707068e488ef2c1d1bfda8d9d429cadbf3cfbe333c42b2229201bf778c96e71e333e0d4a08fff59286149ccb1fa7634eb
-EBUILD pipewire-0.3.52-r1.ebuild 13293 BLAKE2B 17049f576d95cacf15f9e2ba4e0e11c61ecb36cf9cf6cad87b847ffdb5873b3b61607f727af6c3c6c6fd8cbbf3620da6ecb0bf8f77329ae79b34cd7af248dbd2 SHA512 ccaa19700ef8aec87ecb0e1c3a537cf15e7a08a3b603241d3a095e6ba22127d897662ddd3f495b923534f2889714129862c9dec14d3ee59262558d6c7faae9f8
-EBUILD pipewire-0.3.53_p20220705-r1.ebuild 15132 BLAKE2B c384019726ec2652d2032cf09f31bf8b6ef8d1453ceb111921f4a437148f5c66808f6d8a13196d211fb88c7ed7fd46703d89a7341047bb8e1787f3d1661c1fb5 SHA512 184e710cc6d91b4c648f0bbf29bf04523c23936bfb259791a6db47ed61263a4ba135e29c80049553c32e03540fe67f409084919906b09a1b8f2ac1f562263ba3
-EBUILD pipewire-0.3.55-r1.ebuild 15642 BLAKE2B f8a9b85d83c88194e449653ca1273a44eda37904d5deb84dd9b4454a3faba8cd74125d9a536d9900c63e8d16b9c22420634e1f8e848e8208c47376245f95b5c7 SHA512 de760271d46826a4e7544f6452197a6bf6089c189e867b9e7a2a0a8d3ae90deff84e310c06fb9f80b3efbda23151e2bb94b0859dc3b6f45ae2290fcb4409d838
-EBUILD pipewire-0.3.56.ebuild 15643 BLAKE2B 8eb67af2fdd2958f5612c00bf86330d5707033f1fbdd989b8b159007e85379180fe1957a5ed4fd8f262f289b7f6c21a97d1dc5a9bc494b51516b1a9986659333 SHA512 176c10f0bc185c9d510317435d807303943f10430dbf7e79b3291544a14677ae49fb5b7e0677e2357856a85a502dc6ccb18f79eacd9c76bc5d4da9828f6d1bd7
+EBUILD pipewire-0.3.56.ebuild 15639 BLAKE2B 125b7cb530f0dbde8e34ff66fee3abea351b91a37eca41100f61b5e3d845cf0bbcb0fa204926bc6e7f93ab954e558456bc4f98ffa6260fa91da9aa738e086dd9 SHA512 2acc32d30ee3207e39e3aaf4cea10dab44aeeb81ec93cfb73ad8cdddd6d74223e81961f99817bfbe1af5e0a35f09795a77c1532cb3c14945ce0a55484043f5bf
 EBUILD pipewire-9999.ebuild 15608 BLAKE2B cfe907ce58142207c01a9c36c529cb6cfcdf03298160e9c24e896aab41126cdaaa93b8db5b84a2abc3bd478600cdecb8b89ccc2007338b965cd376e106460090 SHA512 a1fa3c11fe7f2b355bf50bd0cc170246f89b4e2d0487a59e3cfe85958b396df2463dc15326085b45a44a48da690fbac173dc835e31bccdc33d0551950a65a6e5
 MISC metadata.xml 1480 BLAKE2B e70d9f3751b05ecfe3f2b550c031023c2904d50cb2e181147847b56100c17390a79b8467dc564d6549e5096e50a60d37f1f53279b3e2cfbf394808a0556283f1 SHA512 052a52c3a277654d29f8cb01a0d6b34440782e279aad78ab610775098dd376b04d8b67bc138614d6c8bc43f0e4a99d4a1617bdfda7ba9709370a7d8ee6df1398
diff --git a/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch b/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch
deleted file mode 100644
index 09d8ffff699f..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4821c7ca2fe5e25ba018e9f5d4967f08d6bb816f
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 9 Jun 2022 17:06:07 +0200
-Subject: [PATCH] pulse-server: don't append "/pulse" to PULSE_RUNTIME_PATH
-
-Fixes #2431
---- a/src/modules/module-protocol-pulse/server.c
-+++ b/src/modules/module-protocol-pulse/server.c
-@@ -460,7 +460,7 @@ static int parse_unix_address(const char *address, struct sockaddr_storage *addr
- 	if (address[0] != '/') {
- 		char runtime_dir[PATH_MAX];
- 
--		if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir), "pulse")) < 0)
-+		if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir))) < 0)
- 			return res;
- 
- 		res = snprintf(addr.sun_path, sizeof(addr.sun_path),
---- a/src/modules/module-protocol-pulse/utils.c
-+++ b/src/modules/module-protocol-pulse/utils.c
-@@ -50,27 +50,30 @@
- #include "log.h"
- #include "utils.h"
- 
--int get_runtime_dir(char *buf, size_t buflen, const char *dir)
-+int get_runtime_dir(char *buf, size_t buflen)
- {
--	const char *runtime_dir;
-+	const char *runtime_dir, *dir = NULL;
- 	struct stat stat_buf;
- 	int res, size;
- 
- 	runtime_dir = getenv("PULSE_RUNTIME_PATH");
--	if (runtime_dir == NULL)
-+	if (runtime_dir == NULL) {
- 		runtime_dir = getenv("XDG_RUNTIME_DIR");
--
-+		dir = "pulse";
-+	}
- 	if (runtime_dir == NULL) {
- 		pw_log_error("could not find a suitable runtime directory in"
- 				"$PULSE_RUNTIME_PATH and $XDG_RUNTIME_DIR");
- 		return -ENOENT;
- 	}
- 
--	size = snprintf(buf, buflen, "%s/%s", runtime_dir, dir);
-+	size = snprintf(buf, buflen, "%s%s%s", runtime_dir,
-+			dir ? "/" : "", dir ? dir : "");
- 	if (size < 0)
- 		return -errno;
- 	if ((size_t) size >= buflen) {
--		pw_log_error("path %s/%s too long", runtime_dir, dir);
-+		pw_log_error("path %s%s%s too long", runtime_dir,
-+				dir ? "/" : "", dir ? dir : "");
- 		return -ENAMETOOLONG;
- 	}
- 
-@@ -182,7 +185,7 @@ int create_pid_file(void) {
- 	FILE *f;
- 	int res;
- 
--	if ((res = get_runtime_dir(pid_file, sizeof(pid_file), "pulse")) < 0)
-+	if ((res = get_runtime_dir(pid_file, sizeof(pid_file))) < 0)
- 		return res;
- 
- 	if (strlen(pid_file) > PATH_MAX - sizeof("/pid")) {
---- a/src/modules/module-protocol-pulse/utils.h
-+++ b/src/modules/module-protocol-pulse/utils.h
-@@ -31,7 +31,7 @@
- struct client;
- struct pw_context;
- 
--int get_runtime_dir(char *buf, size_t buflen, const char *dir);
-+int get_runtime_dir(char *buf, size_t buflen);
- int check_flatpak(struct client *client, pid_t pid);
- pid_t get_client_pid(struct client *client, int client_fd);
- const char *get_server_name(struct pw_context *context);
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch b/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch
deleted file mode 100644
index 8667b3a6d167..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/40552a0e914c3aef48ce59ce1bfb9d80516aa893
-
-From 40552a0e914c3aef48ce59ce1bfb9d80516aa893 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 12 Jul 2022 15:10:02 +0200
-Subject: [PATCH] jack: only mix when we have input to mix
-
-Avoids a crash when starting ardour6.
---- a/pipewire-jack/src/pipewire-jack.c
-+++ b/pipewire-jack/src/pipewire-jack.c
-@@ -4449,7 +4449,7 @@ static void *get_buffer_input_float(struct port *p, jack_nframes_t frames)
- 	}
- 	if (n_ptr == 1) {
- 		ptr = mix_ptr[0];
--	} else {
-+	} else if (n_ptr > 1) {
- 		ptr = p->emptyptr;
- 		mix_function(ptr, mix_ptr, n_ptr, ptr_aligned, frames);
- 		p->zeroed = false;
-GitLab
diff --git a/media-video/pipewire/pipewire-0.3.52-r1.ebuild b/media-video/pipewire/pipewire-0.3.52-r1.ebuild
deleted file mode 100644
index c94a3f03a994..000000000000
--- a/media-video/pipewire/pipewire-0.3.52-r1.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT=""
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	fi
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	lv2? ( media-libs/lilv )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${P}-pulse-path.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		# Not yet packaged.
-		-Dbluez5-codec-lc3plus=disabled
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both new users and those upgrading need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild b/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild
deleted file mode 100644
index e8e364be1937..000000000000
--- a/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT="76350cebefe9bdabe24e9d043b83737547c225d8"
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	fi
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
-pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
-# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
-# which provides adequate guarantee that alsa-lib will be able to provide audio services.
-# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
-# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	lv2? ( media-libs/lilv )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-	)
-	sound-server? (
-		!media-sound/pulseaudio[daemon(+)]
-		!media-sound/pulseaudio-daemon
-	)
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_feature dbus)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		# Not yet packaged.
-		-Dbluez5-codec-lc3plus=disabled
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-
-		# Disable pipewire-pulse if sound-server is disabled.
-		if ! use sound-server ; then
-			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-
-			break
-		fi
-	done
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both new users and those upgrading need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-
-		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.55-r1.ebuild b/media-video/pipewire/pipewire-0.3.55-r1.ebuild
deleted file mode 100644
index 5e6d7aa08a0a..000000000000
--- a/media-video/pipewire/pipewire-0.3.55-r1.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to mention
-# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT=""
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	fi
-
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
-pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
-# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
-# which provides adequate guarantee that alsa-lib will be able to provide audio services.
-# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
-# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	lv2? ( media-libs/lilv )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-	)
-	sound-server? (
-		!media-sound/pulseaudio[daemon(+)]
-		!media-sound/pulseaudio-daemon
-	)
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${P}-jack-mix.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_feature dbus)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		# Not yet packaged.
-		-Dbluez5-codec-lc3plus=disabled
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-
-		# Disable pipewire-pulse if sound-server is disabled.
-		if ! use sound-server ; then
-			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-
-			break
-		fi
-	done
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both new users and those upgrading need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-
-		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.56.ebuild b/media-video/pipewire/pipewire-0.3.56.ebuild
index 665d278e82ae..0023199c8e09 100644
--- a/media-video/pipewire/pipewire-0.3.56.ebuild
+++ b/media-video/pipewire/pipewire-0.3.56.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 	fi
 
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 6fa746950677..18f737431f36 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -9,8 +9,6 @@ AUX wireplumber-0.4.11-dbus-reconnect-crash.patch 1553 BLAKE2B 1792743e726f22ff2
 DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f
 DIST wireplumber-0.4.11.tar.gz 403931 BLAKE2B 77ef2540081420d4255dcb54165d0aceb08d97c60d19b9eb7606e90cf95e305e690794a1f46234b53b13765452fea0d23ae6acae9deea672db67e21c31d2307d SHA512 73a5120cd0c55b5fe5248cc22497efd23e40bb91961553639d9cf1bbf138d273db65153fa3c1bb0d2794f869e077e011156d323832534f62651d66f8cc87dca4
 EBUILD wireplumber-0.4.10-r4.ebuild 3933 BLAKE2B bccd391fc42848f7f57d5403ae481c554862f4bbc6b11b4f8fc55019044b3b9150ac3704370242a39992c65d88928f2f64d441a19cddd61721c82cd887b9e1ce SHA512 2c5c1977655178717c6ad1158b0af18267cafed7ace937e28dfc08d466efe227c6a4ad7f276a27ded906cf8439ecb0ae7579ebf64b90ccc4bf67fa8eeed08bca
-EBUILD wireplumber-0.4.10-r6.ebuild 4062 BLAKE2B 5706c5fe1a0f68900c9b2eb9131de0aa68ed5b1c51923bab01d557283452f6bc8e9d092f3aa0b182e3c9163a18061cd07fd821f61754ffd9c8355dcd5149d688 SHA512 8a74fc5f82c40ae63660c941d2b6d59189f852b7594a3eaf9f7539eae68917297168ebbd5f5a9c32acca6a10d2ab4b0351812dd7c39dac6da752c619bbbc08da
-EBUILD wireplumber-0.4.11-r1.ebuild 4071 BLAKE2B 724bb567cf077985bcd0e9d58649c6e6c8c75f04babb56c503c05416fde901bef4330930e735b6b9e3658ea66369cc8829a30be6ec780a41f8eca33b26454a21 SHA512 7e8e40f7f3d727776881004e01a109e7a7711668a3a8738a960cb2326edb55fe854f0932ca07ff31255bbdc200013e6498933443eb115661052122b517e0dcf5
-EBUILD wireplumber-0.4.11-r2.ebuild 4116 BLAKE2B 8dc7626b61deb64814eadd8e1713a12d9c29e5b41640a955bb360a6106ef46628be851298ccc8e8fb53bea03fb1e6820ac1afa8f246acb6fba52d6c53c5c0de4 SHA512 b75a20d0ab6056103a930a152025480e2727377e648478513215a1e5581d26a94a7f5988435d7ff797b61127cbeedcd4f2b25c28446f786cb472464c1c641bac
+EBUILD wireplumber-0.4.11-r2.ebuild 4112 BLAKE2B 2f94d975252cb165d86fe23531fa8ea94a54ba44033e506a6785aea9d7be959e5a0f3f1b7b6872566de62475ab3d2a982294c53f7808348166ae6b6db7e44c15 SHA512 8504018873d34dbeb65c3a1acbc2acf68c7074902875bc1dd4f2f1088933edba51551a293345a5aa4ce8b4443fed8405126a197db65d1948ac2839107b29a430
 EBUILD wireplumber-9999.ebuild 3889 BLAKE2B d44e25f12dc2e6b0d8884b2a670b7fd3c7f1d42b67e6899cff3dd709d8b02d9c9497d4b95beca6f3973e76f54809b042ff6e66058c3de41f39332a022909083d SHA512 07ad0521fbd48382287d6d6f3b62906fa8a29fae84a5a0fb94cdcf8e87da01e6af0ba81f61c8675efb69c038a4fdf62fdde9b9e25b17d4a76b0148de32e457ae
 MISC metadata.xml 647 BLAKE2B 0370f3c897d7fcab0bd95fe1f97208f911de022e533ac795817289c554cc75d4de686223cbfd255ecb6e930ff0aee6c9419327ab51b3c65b1c4d8ed7597a1f3e SHA512 9708a52cf340caf359c300116b6ec687fba08a3c0fe33895eb10cda08517583ad36b5ff539142d8ba5f625ad34e5b7228f55fc7b85e7a162cf775f8780899f0e
diff --git a/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
deleted file mode 100644
index 5a21755d5858..000000000000
--- a/media-video/wireplumber/wireplumber-0.4.10-r6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit lua-single meson systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
-LICENSE="MIT"
-SLOT="0/0.4"
-IUSE="elogind system-service systemd test"
-
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	?? ( elogind systemd )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	sys-devel/gettext
-"
-
-DEPEND="
-	${LUA_DEPS}
-	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.53-r1:=
-	virtual/libintl
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-
-# Any dev-lua/* deps get declared like this inside RDEPEND:
-#	$(lua_gen_cond_dep '
-#		dev-lua/<NAME>[${LUA_USEDEP}]
-#	')
-RDEPEND="${DEPEND}
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-"
-
-DOCS=( {NEWS,README}.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-config-fix-enabled-property-to-default-to-true-when.patch
-	"${FILESDIR}"/${P}-m-lua-scripting-allow-converting-GValue-holding-NUL.patch
-	"${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch
-	"${FILESDIR}"/${P}-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
-	"${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch
-	"${FILESDIR}"/${P}-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
-		-Dintrospection=disabled # Only used for Sphinx doc generation
-		-Dsystem-lua=true # We always unbundle everything we can
-		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
-		$(meson_feature elogind)
-		$(meson_feature systemd)
-		$(meson_use system-service systemd-system-service)
-		$(meson_use systemd systemd-user-service)
-		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
-		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# We copy the default config, so that Gentoo tools can pick up on any
-	# updates and /etc does not end up with stale overrides.
-	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
-	# will not actually get stored twice until modified.
-	insinto /etc
-	doins -r "${ED}"/usr/share/wireplumber
-}
-
-pkg_postinst() {
-	if systemd_is_booted ; then
-		ewarn "pipewire-media-session.service is no longer installed. You must switch"
-		ewarn "to wireplumber.service user unit before your next logout/reboot:"
-		ewarn "systemctl --user disable pipewire-media-session.service"
-		ewarn "systemctl --user --force enable wireplumber.service"
-	else
-		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
-		ewarn "is started (a replacement for directly calling pipewire binary)."
-		ewarn
-		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
-		ewarn "or, if it does exist, that any reference to"
-		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
-	fi
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/wireplumber/wireplumber-0.4.11-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.11-r1.ebuild
deleted file mode 100644
index 9b738b1c7ac8..000000000000
--- a/media-video/wireplumber/wireplumber-0.4.11-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
-#
-# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit lua-single meson systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
-LICENSE="MIT"
-SLOT="0/0.4"
-IUSE="elogind system-service systemd test"
-
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	?? ( elogind systemd )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	sys-devel/gettext
-"
-
-DEPEND="
-	${LUA_DEPS}
-	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.53-r1:=
-	virtual/libintl
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-
-# Any dev-lua/* deps get declared like this inside RDEPEND:
-#	$(lua_gen_cond_dep '
-#		dev-lua/<NAME>[${LUA_USEDEP}]
-#	')
-RDEPEND="${DEPEND}
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-"
-
-DOCS=( {NEWS,README}.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
-	"${FILESDIR}"/${P}-alsa-lua-crash.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
-		-Dintrospection=disabled # Only used for Sphinx doc generation
-		-Dsystem-lua=true # We always unbundle everything we can
-		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
-		$(meson_feature elogind)
-		$(meson_feature systemd)
-		$(meson_use system-service systemd-system-service)
-		$(meson_use systemd systemd-user-service)
-		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
-		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# We copy the default config, so that Gentoo tools can pick up on any
-	# updates and /etc does not end up with stale overrides.
-	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
-	# will not actually get stored twice until modified.
-	insinto /etc
-	doins -r "${ED}"/usr/share/wireplumber
-}
-
-pkg_postinst() {
-	if systemd_is_booted ; then
-		ewarn "pipewire-media-session.service is no longer installed. You must switch"
-		ewarn "to wireplumber.service user unit before your next logout/reboot:"
-		ewarn "systemctl --user disable pipewire-media-session.service"
-		ewarn "systemctl --user --force enable wireplumber.service"
-	else
-		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
-		ewarn "is started (a replacement for directly calling pipewire binary)."
-		ewarn
-		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
-		ewarn "or, if it does exist, that any reference to"
-		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
-	fi
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild b/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild
index 57312314aed7..8cef1f20f182 100644
--- a/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 17ca642169dd..ff961a6525cd 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c55e8fb12303..b069e4564d99 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 31 Jul 2022 00:39:40 +0000
+Sun, 31 Jul 2022 06:39:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e05efb456b02..ac19bfd2acdf 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-31T00:39:44Z
+TIMESTAMP 2022-07-31T06:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLlz1BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLmI7JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA1aRAAoXb/Gy6t60i3GAbHiZcsfvw9XpyaGZnu7S1G0bUak/0BGCV9N2rzJSr8
-pOFfRw2jnI8HxA2JNCVNvjcIiQg3Fbxu0EnTu3fpaQq234BEYA2M/rVV52lQiuJU
-Ez4bT/9EsGgyRb7g3mlAbVdrZPVjffVthGZEq/pDVi/iBiOOOgzsBYcNiwi5cHlg
-qktpvRglEvRbSvSTX6voxxSL9K1opRUaKyQ3rsMx7V6EuhqwKlETRzGdKhD9jK3L
-sRLyFhrxXxJpsfK+xyYSLfPMarAHfdMe6vwSwUFhBNvR7M/Lj0R/oNZbzyFd5pVY
-OIri9IlxGjq5uhg4uYOVPeODh59geSYZ7gm0+f92upLKi4r9lPbDbZlVZWITBui+
-0LG7alXk5WTSm8o3HBPbER33Daur/KGwQRsY5zqy5/KFgHLh7GYV+s4J/CRT0tuX
-gpiyoyFUFAgHeIq8TJ0PSWrfBdalicyK5eTBftWPjT4U1m6lsov0J4unMZgTDnEp
-N2xzo9zpwWl9QxH68z1Xw6igJyv1ze35CFMTjwkUxdCAzsAHVPwRrlAcpXOfbRMA
-F2G8xbBrSaRWcIix48FuYfzAaBYalDxYmNART/fnSC1/a87nwGWoaR/ncSOvfs04
-/JrilrUL0b6hMDTHm9/NbvBF4SuxNsmccBj6VDHb45C/tuCAyeE=
-=81LZ
+klBOGQ//cGfj15Zh65nWIYnVhaWolZQ2cX4fmgqvDHhzDhe0ej0yGvtrThFCzLrK
+p6Tv34ETvsirhGeWD2jjXPzj6nsmcdF4mr8FAazqV3B0tKATHxVVzQ0gDW006aYr
+uc3Na6DT8FTJs6GTV+FFhggBf0LVK6CFEwQInAf39xX2dv/vK/z4tqabtYuO5x6k
+G5C4/1u9dmY0G51VTkh2BxwyqL14062aSoLgvvVwmENtOVwFR4GtIe6hQWTpIIeG
+u6ncpIvbh5JShjJkputgIaZxqdKNl9t6AJv0d5dlOBj+RI8W8jk490GFad6RGFFn
+Q3+FXYxSf2ORREv5IuJegL+WnwqX02qB4eLL2fvLL1Iqpc1S/cTeoCRcRYB5ch3b
+d5rL5pjRZWuiYj2dvIVpUjOnx/PhdoNEW2qQEKBPZW2bEjuJwRVTVR92gJLCvafh
+tnYw9AwSqLrFX/uhvfeMxkkBi+T2vS/85GDyqSfW1A6teyU59PVEh5tlPomERnbB
+e8VstvqZRMkAQnX8lrIbEOqnAPgihYYDvnz+I0Pi2Qb2O0AU0IzJdqy1wqPvai4S
+jPaBeYV3deViVNdgIQb6zAuS3zQM4qRmkcJL4gvN/l0JWwWV0cBSBvhllkoHWphS
+kD9+y3NLgo++kjCiGLvtXHBXgLaThhxGaxVbxNROqLsp9yS8mWU=
+=/HIf
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c55e8fb12303..c680ec9295a6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 31 Jul 2022 00:39:40 +0000
+Sun, 31 Jul 2022 06:39:41 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 4acd45ce2bb1..593e8701edfc 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b8aabd0fda78..499cdc22bc42 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.26 b/metadata/md5-cache/app-admin/awscli-1.25.26
deleted file mode 100644
index 3ebdadca770d..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.26
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=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 ) 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/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=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin 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 )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.26.tar.gz -> aws-cli-1.25.26.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3e9bea6751f29667f4e645e0d0fa1458
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.37 b/metadata/md5-cache/app-admin/awscli-1.25.37
deleted file mode 100644
index d1f5f82805a8..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.37
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=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 ) 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/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=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin 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 )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.37.tar.gz -> aws-cli-1.25.37.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.40 b/metadata/md5-cache/app-admin/awscli-1.25.40
deleted file mode 100644
index f45c0e3b3492..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.40
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.40[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=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 ) 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/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=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.40[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin 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 )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.40.tar.gz -> aws-cli-1.25.40.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index eeb7acf5ab34..ae31a9c9cdb7 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.5 b/metadata/md5-cache/app-misc/pax-utils-1.3.5
new file mode 100644
index 000000000000..d4f049ca537f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.5
@@ -0,0 +1,17 @@
+BDEPEND=caps? ( virtual/pkgconfig ) man? ( app-text/xmlto ) python? ( 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 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyelftools[python_targets_python3_11(-)] ) ) >=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=caps? ( >=sys-libs/libcap-2.24 ) python? ( 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 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyelftools[python_targets_python3_11(-)] ) )
+DESCRIPTION=ELF utils that can check files for security relevant properties
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
+INHERIT=meson python-single-r1
+IUSE=caps +man python seccomp test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( 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 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyelftools[python_targets_python3_11(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( python )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-misc/pax-utils/pax-utils-1.3.5.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.5.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0f49b2fc55f666d2a617cf43d45814c9
diff --git a/metadata/md5-cache/app-misc/pax-utils-9999 b/metadata/md5-cache/app-misc/pax-utils-9999
index 5508e55507cc..68713010b5d0 100644
--- a/metadata/md5-cache/app-misc/pax-utils-9999
+++ b/metadata/md5-cache/app-misc/pax-utils-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=33f1ae6dc7904a547bbe8288a6e05774
+_md5_=ce4650d10d154b087030ff382db6237e
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 8c2e3a0e1507..b8ab965fddda 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/base-compat-0.11.1 b/metadata/md5-cache/dev-haskell/base-compat-0.11.1
deleted file mode 100644
index 2ff71c9ffb00..000000000000
--- a/metadata/md5-cache/dev-haskell/base-compat-0.11.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/cabal-1.8 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A compatibility layer for base
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/base-compat
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/0.11.1
-SRC_URI=https://hackage.haskell.org/package/base-compat-0.11.1/base-compat-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_=3c4e9cccf5b2a94228a85ea01b36f933
diff --git a/metadata/md5-cache/dev-haskell/base-orphans-0.8.4 b/metadata/md5-cache/dev-haskell/base-orphans-0.8.4
deleted file mode 100644
index f0ae37f4252e..000000000000
--- a/metadata/md5-cache/dev-haskell/base-orphans-0.8.4
+++ /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.12 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Backwards-compatible orphan instances for base
-EAPI=7
-HOMEPAGE=https://github.com/haskell-compat/base-orphans#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/0.8.4
-SRC_URI=https://hackage.haskell.org/package/base-orphans-0.8.4/base-orphans-0.8.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_=3fa51f067bb25e32d79fda8e88be93f1
diff --git a/metadata/md5-cache/dev-haskell/basement-0.0.11 b/metadata/md5-cache/dev-haskell/basement-0.0.11
deleted file mode 100644
index 89436fd6ad80..000000000000
--- a/metadata/md5-cache/dev-haskell/basement-0.0.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Foundation scrap box of array & string
-EAPI=7
-HOMEPAGE=https://github.com/haskell-foundation/foundation#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-8.0.1:=
-SLOT=0/0.0.11
-SRC_URI=https://hackage.haskell.org/package/basement-0.0.11/basement-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_=899278eee12714379c3a6b7772554869
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4 b/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
deleted file mode 100644
index 8a852dfc7fdc..000000000000
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
+++ /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/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.7 <dev-haskell/quickcheck-2.15 >=dev-haskell/tasty-1.0 <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 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A blazingly fast markup 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/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8.2.4
-SRC_URI=https://hackage.haskell.org/package/blaze-markup-0.8.2.4/blaze-markup-0.8.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_=8da098cae56fd211650df6067e311190
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.28.7 b/metadata/md5-cache/dev-haskell/c2hs-0.28.7
deleted file mode 100644
index f1b2f6ff1003..000000000000
--- a/metadata/md5-cache/dev-haskell/c2hs-0.28.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/dlist:= dev-haskell/fail:= >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.9.0:= <dev-haskell/shelly-1.10.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/transformers !regression? ( >=dev-haskell/shelly-1.9.0 <dev-haskell/shelly-1.10.0 dev-haskell/text ) )
-DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
-EAPI=7
-HOMEPAGE=https://github.com/haskell/c2hs
-INHERIT=haskell-cabal
-IUSE=regression test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-haskell/dlist:= dev-haskell/fail:= >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.9.0:= <dev-haskell/shelly-1.10.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/c2hs-0.28.7/c2hs-0.28.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_=3e0b3f0f426b4edf88a2ed9ec63a22b1
diff --git a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1 b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1
deleted file mode 100644
index 6c7180266f64..000000000000
--- a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A Setup.hs helper for doctests running
-EAPI=7
-HOMEPAGE=https://github.com/phadej/cabal-doctest
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/1.0.8
-SRC_URI=https://hackage.haskell.org/package/cabal-doctest-1.0.8/cabal-doctest-1.0.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_=b0dd2f8ba9fd0b841572596a1d66bf90
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.13.8.1 b/metadata/md5-cache/dev-haskell/cairo-0.13.8.1
deleted file mode 100644
index d2655d050977..000000000000
--- a/metadata/md5-cache/dev-haskell/cairo-0.13.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Binding to the Cairo library
-EAPI=7
-HOMEPAGE=http://projects.haskell.org/gtk2hs/
-INHERIT=haskell-cabal
-IUSE=+pdf +postscript +svg doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo
-SLOT=0/0.13.8.1
-SRC_URI=https://hackage.haskell.org/package/cairo-0.13.8.1/cairo-0.13.8.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_=12c5eb7278018838f5b7f3af334160ab
diff --git a/metadata/md5-cache/dev-haskell/call-stack-0.2.0 b/metadata/md5-cache/dev-haskell/call-stack-0.2.0
deleted file mode 100644
index e7a3afbeeaaa..000000000000
--- a/metadata/md5-cache/dev-haskell/call-stack-0.2.0
+++ /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.12 test? ( dev-haskell/nanospec ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Use GHC call-stacks in a backward compatible way
-EAPI=7
-HOMEPAGE=https://github.com/sol/call-stack#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.2.0
-SRC_URI=https://hackage.haskell.org/package/call-stack-0.2.0/call-stack-0.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_=af5642338f3f9709ae009b48efbeb593
diff --git a/metadata/md5-cache/dev-haskell/citeproc-0.3.0.9 b/metadata/md5-cache/dev-haskell/citeproc-0.3.0.9
deleted file mode 100644
index 981444bfa08a..000000000000
--- a/metadata/md5-cache/dev-haskell/citeproc-0.3.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/attoparsec:=[profile?] >=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/uniplate:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/xml-conduit:=[profile?] >=dev-lang/ghc-8.6.5:= executable? ( dev-haskell/aeson-pretty:=[profile?] ) icu? ( dev-haskell/text-icu:=[profile?] ) !icu? ( >=dev-haskell/rfc5051-0.2:=[profile?] <dev-haskell/rfc5051-0.3:=[profile?] ) >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/diff-0.4 dev-haskell/mtl dev-haskell/timeit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Generates citations and bibliography from CSL styles
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/citeproc
-INHERIT=haskell-cabal
-IUSE=executable icu doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/uniplate:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/xml-conduit:=[profile?] >=dev-lang/ghc-8.6.5:= executable? ( dev-haskell/aeson-pretty:=[profile?] ) icu? ( dev-haskell/text-icu:=[profile?] ) !icu? ( >=dev-haskell/rfc5051-0.2:=[profile?] <dev-haskell/rfc5051-0.3:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/0.3.0.9
-SRC_URI=https://hackage.haskell.org/package/citeproc-0.3.0.9/citeproc-0.3.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_=2cca6e7a1baedb827b8419c74b62f0b8
diff --git a/metadata/md5-cache/dev-haskell/commonmark-0.1.1.4 b/metadata/md5-cache/dev-haskell/commonmark-0.1.1.4
deleted file mode 100644
index e61b2cf94c6d..000000000000
--- a/metadata/md5-cache/dev-haskell/commonmark-0.1.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Pure Haskell commonmark parser
-EAPI=7
-HOMEPAGE=https://github.com/jgm/commonmark-hs
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1.1.4
-SRC_URI=https://hackage.haskell.org/package/commonmark-0.1.1.4/commonmark-0.1.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_=eb506de2ff8b6bb0d637a8f8359e4c77
diff --git a/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.0.4 b/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.0.4
deleted file mode 100644
index 48df5c412e74..000000000000
--- a/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.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/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Pure Haskell commonmark parser
-EAPI=7
-HOMEPAGE=https://github.com/jgm/commonmark-hs
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.2.0.4
-SRC_URI=https://hackage.haskell.org/package/commonmark-extensions-0.2.0.4/commonmark-extensions-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_=d487a1e4c9ab1b8d3118a5670f646e2e
diff --git a/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.0.1 b/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.0.1
deleted file mode 100644
index bb3d0969f12e..000000000000
--- a/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.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/commonmark-0.1:=[profile?] <dev-haskell/commonmark-0.2:=[profile?] >=dev-haskell/commonmark-extensions-0.2:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Bridge between commonmark and pandoc AST
-EAPI=7
-HOMEPAGE=https://github.com/jgm/commonmark-hs
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/commonmark-0.1:=[profile?] <dev-haskell/commonmark-0.2:=[profile?] >=dev-haskell/commonmark-extensions-0.2:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:=
-SLOT=0/0.2.0.1
-SRC_URI=https://hackage.haskell.org/package/commonmark-pandoc-0.2.0.1/commonmark-pandoc-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_=531da0d319d85048530e3744a13f8e40
diff --git a/metadata/md5-cache/dev-haskell/comonad-5.0.7 b/metadata/md5-cache/dev-haskell/comonad-5.0.7
deleted file mode 100644
index 8a2b73ed5ff8..000000000000
--- a/metadata/md5-cache/dev-haskell/comonad-5.0.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[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.18 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Haskell package providing comonads
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/comonad/
-INHERIT=haskell-cabal
-IUSE=+indexed-traversable doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] )
-RESTRICT=test
-SLOT=0/5.0.7
-SRC_URI=https://hackage.haskell.org/package/comonad-5.0.7/comonad-5.0.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_=d095532c6e85dd13aabb5b29c1e5cb3a
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.3.4 b/metadata/md5-cache/dev-haskell/conduit-1.3.4
deleted file mode 100644
index a9bba82d0483..000000000000
--- a/metadata/md5-cache/dev-haskell/conduit-1.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/exceptions:=[profile?] >=dev-haskell/mono-traversable-1.0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/exceptions-0.6 >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.7 dev-haskell/safe dev-haskell/silently >=dev-haskell/split-0.2.0.0 >=dev-haskell/unliftio-0.2.4.0 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Streaming data processing library
-EAPI=7
-HOMEPAGE=https://github.com/snoyberg/conduit
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/mono-traversable-1.0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.3.4
-SRC_URI=https://hackage.haskell.org/package/conduit-1.3.4/conduit-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_=779ac11c649cf6887616d90aa65c3e56
diff --git a/metadata/md5-cache/dev-haskell/contravariant-1.5.2 b/metadata/md5-cache/dev-haskell/contravariant-1.5.2
deleted file mode 100644
index 7f5b3c65c79d..000000000000
--- a/metadata/md5-cache/dev-haskell/contravariant-1.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Contravariant functors
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/contravariant/
-INHERIT=haskell-cabal
-IUSE=+semigroups +statevar +tagged doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
-SLOT=0/1.5.2
-SRC_URI=https://hackage.haskell.org/package/contravariant-1.5.2/contravariant-1.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_=fbdf1f96309dd03fa67d5c944e04d068
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1 b/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
deleted file mode 100644
index d40ecec7c9aa..000000000000
--- a/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/basement-0.0.6:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc >=dev-haskell/cabal-1.18 test? ( dev-haskell/memory dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-kat dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Cryptography Primitives sink
-EAPI=7
-HOMEPAGE=https://github.com/haskell-crypto/cryptonite
-INHERIT=haskell-cabal
-IUSE=cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/basement-0.0.6:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc
-RESTRICT=!test? ( test )
-SLOT=0/0.26
-SRC_URI=https://hackage.haskell.org/package/cryptonite-0.26/cryptonite-0.26.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_=99322c981d0d0f34535af649d434aae2
diff --git a/metadata/md5-cache/dev-haskell/distributive-0.6.1 b/metadata/md5-cache/dev-haskell/distributive-0.6.1
deleted file mode 100644
index 3b358de81566..000000000000
--- a/metadata/md5-cache/dev-haskell/distributive-0.6.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-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/semigroups-0.13:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-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/generic-deriving-1.11 <dev-haskell/generic-deriving-2 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Distributive functors -- Dual to Traversable
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/distributive/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/semigroups-0.13:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/0.6.1
-SRC_URI=https://hackage.haskell.org/package/distributive-0.6.1/distributive-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_=1412360d6d21eb1662cd9479346216a5
diff --git a/metadata/md5-cache/dev-haskell/doclayout-0.3.0.2 b/metadata/md5-cache/dev-haskell/doclayout-0.3.0.2
deleted file mode 100644
index 8bfa15ba884b..000000000000
--- a/metadata/md5-cache/dev-haskell/doclayout-0.3.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/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A prettyprinting library for laying out text documents
-EAPI=7
-HOMEPAGE=https://github.com/jgm/doclayout
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.0.2
-SRC_URI=https://hackage.haskell.org/package/doclayout-0.3.0.2/doclayout-0.3.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_=e44d9cf1e0be15652e802b2f182882a6
diff --git a/metadata/md5-cache/dev-haskell/doctemplates-0.8.2 b/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
deleted file mode 100644
index 04fd3afc9f65..000000000000
--- a/metadata/md5-cache/dev-haskell/doctemplates-0.8.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/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] dev-haskell/hsyaml:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-conversions:=[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/glob dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Pandoc-style document templates
-EAPI=7
-HOMEPAGE=https://github.com/jgm/doctemplates#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] dev-haskell/hsyaml:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-conversions:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8.2
-SRC_URI=https://hackage.haskell.org/package/doctemplates-0.8.2/doctemplates-0.8.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_=c33779426d2768321fe5ac86b0205d8d
diff --git a/metadata/md5-cache/dev-haskell/doctemplates-0.9 b/metadata/md5-cache/dev-haskell/doctemplates-0.9
deleted file mode 100644
index 3dd252b6b40f..000000000000
--- a/metadata/md5-cache/dev-haskell/doctemplates-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/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-conversions:=[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/glob dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Pandoc-style document templates
-EAPI=7
-HOMEPAGE=https://github.com/jgm/doctemplates#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-conversions:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.9
-SRC_URI=https://hackage.haskell.org/package/doctemplates-0.9/doctemplates-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_=1df40d3ee3201b3a6fc7b5743a90a6ec
diff --git a/metadata/md5-cache/dev-haskell/doctest-0.16.3 b/metadata/md5-cache/dev-haskell/doctest-0.16.3
deleted file mode 100644
index 41d9e1945afd..000000000000
--- a/metadata/md5-cache/dev-haskell/doctest-0.16.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-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.3.0 >=dev-haskell/hspec-core-2.3.0 dev-haskell/hunit dev-haskell/mockery >=dev-haskell/quickcheck-2.13.1 dev-haskell/setenv >=dev-haskell/silently-1.2.4 >=dev-haskell/stringbuilder-0.4 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Test interactive Haskell examples
-EAPI=7
-HOMEPAGE=https://github.com/sol/doctest#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:=
-RESTRICT=test
-SLOT=0/0.16.3
-SRC_URI=https://hackage.haskell.org/package/doctest-0.16.3/doctest-0.16.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_=08a05d3b14ca9bcd16e21dd885bffa99
diff --git a/metadata/md5-cache/dev-haskell/emojis-0.1 b/metadata/md5-cache/dev-haskell/emojis-0.1
deleted file mode 100644
index e2299bc0b272..000000000000
--- a/metadata/md5-cache/dev-haskell/emojis-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/text:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between emoji characters and their names
-EAPI=7
-HOMEPAGE=https://github.com/jgm/emojis#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1
-SRC_URI=https://hackage.haskell.org/package/emojis-0.1/emojis-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_=8cea43f2bd96108b3778d92f4d8d8d29
diff --git a/metadata/md5-cache/dev-haskell/foundation-0.0.25 b/metadata/md5-cache/dev-haskell/foundation-0.0.25
deleted file mode 100644
index 74b3c0221b69..000000000000
--- a/metadata/md5-cache/dev-haskell/foundation-0.0.25
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-haskell/basement-0.0.11:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/basement >=dev-haskell/doctest-0.9 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Alternative prelude with batteries and no dependencies
-EAPI=7
-HOMEPAGE=https://github.com/haskell-foundation/foundation
-INHERIT=haskell-cabal
-IUSE=experimental doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=~dev-haskell/basement-0.0.11:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=test
-SLOT=0/0.0.25
-SRC_URI=https://hackage.haskell.org/package/foundation-0.0.25/foundation-0.0.25.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_=100d501590a91a75017937d915737641
diff --git a/metadata/md5-cache/dev-haskell/free-5.1.3 b/metadata/md5-cache/dev-haskell/free-5.1.3
deleted file mode 100644
index 8495ae5027c0..000000000000
--- a/metadata/md5-cache/dev-haskell/free-5.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-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/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0.1.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-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Monads for free
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/free/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0.1.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-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/5.1.3
-SRC_URI=https://hackage.haskell.org/package/free-5.1.3/free-5.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_=0ac94d30587154314ff8782e2c094aab
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.8.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
deleted file mode 100644
index 6106f8bb7647..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.8.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.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2
-DESCRIPTION=Library exposing some functionality of Haddock
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-INHERIT=haskell-cabal
-IUSE=profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/1.8.0
-SRC_URI=https://hackage.haskell.org/package/haddock-library-1.8.0/haddock-library-1.8.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_=289ca738e30f2f2b40f6b8d3c2b99331
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.9.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.9.0
deleted file mode 100644
index 75befacfc018..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.9.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.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/hspec-2.4.4 >=dev-haskell/optparse-applicative-0.15 >=dev-haskell/tree-diff-0.1 >=dev-haskell/base-compat-0.9.3 >=dev-haskell/quickcheck-2.11 )
-DESCRIPTION=Library exposing some functionality of Haddock
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-INHERIT=haskell-cabal
-IUSE=profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/1.9.0
-SRC_URI=https://hackage.haskell.org/package/haddock-library-1.9.0/haddock-library-1.9.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_=94150257c4ceec76a03f81269d72404e
diff --git a/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2 b/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
deleted file mode 100644
index 6162ba65724b..000000000000
--- a/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
+++ /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/cabal-1.6 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A fully compliant Haskell 98 lexer
-EAPI=7
-HOMEPAGE=https://github.com/yav/haskell-lexer
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/1.0.2
-SRC_URI=https://hackage.haskell.org/package/haskell-lexer-1.0.2/haskell-lexer-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_=458044df77004e832576ffd8bab64725
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
deleted file mode 100644
index 24d89fa2be7d..000000000000
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/mtl dev-haskell/pretty-show >=dev-haskell/smallcheck-1.0 dev-haskell/syb >=dev-haskell/tasty-0.3 >=dev-haskell/tasty-golden-2.2.2 dev-haskell/tasty-smallcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
-EAPI=7
-HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/1.17.1
-SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-1.17.1/haskell-src-exts-1.17.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_=3589036a49772c85025f543877df5a58
diff --git a/metadata/md5-cache/dev-haskell/hedgehog-1.0.4 b/metadata/md5-cache/dev-haskell/hedgehog-1.0.4
deleted file mode 100644
index 874ded75e5bb..000000000000
--- a/metadata/md5-cache/dev-haskell/hedgehog-1.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/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?] >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?] >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Release with confidence
-EAPI=7
-HOMEPAGE=https://hedgehog.qa
-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.12:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?] >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?] >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0.4
-SRC_URI=https://hackage.haskell.org/package/hedgehog-1.0.4/hedgehog-1.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_=0b42615b0bd172835b0643584311dcba
diff --git a/metadata/md5-cache/dev-haskell/hslua-2.1.0 b/metadata/md5-cache/dev-haskell/hslua-2.1.0
deleted file mode 100644
index bff027bf26f8..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-2.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/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-classes-2.1:=[profile?] <dev-haskell/hslua-classes-2.2:=[profile?] >=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?] >=dev-haskell/hslua-objectorientation-2.1:=[profile?] <dev-haskell/hslua-objectorientation-2.2:=[profile?] >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/tasty-0.11 dev-haskell/tasty-hslua >=dev-haskell/tasty-hunit-0.9 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Bindings to Lua, an embeddable scripting language
-EAPI=8
-HOMEPAGE=https://hslua.org/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-classes-2.1:=[profile?] <dev-haskell/hslua-classes-2.2:=[profile?] >=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?] >=dev-haskell/hslua-objectorientation-2.1:=[profile?] <dev-haskell/hslua-objectorientation-2.2:=[profile?] >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.1.0
-SRC_URI=https://hackage.haskell.org/package/hslua-2.1.0/hslua-2.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5eddea9c1d10378fdc00bdbe0d6d55e4
diff --git a/metadata/md5-cache/dev-haskell/hslua-classes-2.1.0 b/metadata/md5-cache/dev-haskell/hslua-classes-2.1.0
deleted file mode 100644
index 11856c183a11..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-classes-2.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/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/lua-arbitrary-1.0 >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hslua-1.0 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Type classes for HsLua
-EAPI=8
-HOMEPAGE=https://hslua.org/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.1.0
-SRC_URI=https://hackage.haskell.org/package/hslua-classes-2.1.0/hslua-classes-2.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=89658741822747a75cb0b7ed1f4fe475
diff --git a/metadata/md5-cache/dev-haskell/hslua-core-2.1.0 b/metadata/md5-cache/dev-haskell/hslua-core-2.1.0
deleted file mode 100644
index 83b73edaa632..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-core-2.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/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/lua-arbitrary-1.0 >=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=8
-HOMEPAGE=https://hslua.org/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.1.0
-SRC_URI=https://hackage.haskell.org/package/hslua-core-2.1.0/hslua-core-2.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6592099428eebd576199897e88b1c277
diff --git a/metadata/md5-cache/dev-haskell/hslua-marshalling-2.1.0 b/metadata/md5-cache/dev-haskell/hslua-marshalling-2.1.0
deleted file mode 100644
index 61e6bf6c8214..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-marshalling-2.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/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/lua-arbitrary-1.0 >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.11 dev-haskell/tasty-hslua >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Marshalling of values between Haskell and Lua
-EAPI=8
-HOMEPAGE=https://hslua.org/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/2.1.0
-SRC_URI=https://hackage.haskell.org/package/hslua-marshalling-2.1.0/hslua-marshalling-2.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1304a3d2d8de060ced4551127f01e538
diff --git a/metadata/md5-cache/dev-haskell/hslua-objectorientation-2.1.0 b/metadata/md5-cache/dev-haskell/hslua-objectorientation-2.1.0
deleted file mode 100644
index b743e66a3adc..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-objectorientation-2.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/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/lua-arbitrary-1.0 >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hslua-1.0 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Object orientation tools for HsLua
-EAPI=8
-HOMEPAGE=https://hslua.org/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.1.0
-SRC_URI=https://hackage.haskell.org/package/hslua-objectorientation-2.1.0/hslua-objectorientation-2.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0b3428f591f45980cc5e8656e86b8723
diff --git a/metadata/md5-cache/dev-haskell/hslua-packaging-2.1.0 b/metadata/md5-cache/dev-haskell/hslua-packaging-2.1.0
deleted file mode 100644
index 3b466eaedc5e..000000000000
--- a/metadata/md5-cache/dev-haskell/hslua-packaging-2.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/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?] >=dev-haskell/hslua-objectorientation-2.1:=[profile?] <dev-haskell/hslua-objectorientation-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/tasty-0.11 dev-haskell/tasty-hslua >=dev-haskell/tasty-hunit-0.9 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Utilities to build Lua modules
-EAPI=8
-HOMEPAGE=https://hslua.org/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.2:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.2:=[profile?] >=dev-haskell/hslua-objectorientation-2.1:=[profile?] <dev-haskell/hslua-objectorientation-2.2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/2.1.0
-SRC_URI=https://hackage.haskell.org/package/hslua-packaging-2.1.0/hslua-packaging-2.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6d643714b6b8c6e7ac33e0771ac328bc
diff --git a/metadata/md5-cache/dev-haskell/hspec-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-2.7.1
deleted file mode 100644
index a809b27aa7b3..000000000000
--- a/metadata/md5-cache/dev-haskell/hspec-2.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-haskell/hspec-core-2.7.1:=[profile?] ~dev-haskell/hspec-discover-2.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A Testing Framework for Haskell
-EAPI=7
-HOMEPAGE=http://hspec.github.io/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=~dev-haskell/hspec-core-2.7.1:=[profile?] ~dev-haskell/hspec-discover-2.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/2.7.1
-SRC_URI=https://hackage.haskell.org/package/hspec-2.7.1/hspec-2.7.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_=a0e6f3eb973040de975b28c4d2271a0d
diff --git a/metadata/md5-cache/dev-haskell/hspec-core-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-core-2.7.1
deleted file mode 100644
index 6534455a94b5..000000000000
--- a/metadata/md5-cache/dev-haskell/hspec-core-2.7.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.5:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?] >=dev-haskell/quickcheck-2.13.1:2=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-meta-2.3.2 >=dev-haskell/silently-1.2.4 dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A Testing Framework for Haskell
-EAPI=7
-HOMEPAGE=http://hspec.github.io/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?] >=dev-haskell/quickcheck-2.13.1:2=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/2.7.1
-SRC_URI=https://hackage.haskell.org/package/hspec-core-2.7.1/hspec-core-2.7.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_=787c31005019ed3711af0d020f48b250
diff --git a/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
deleted file mode 100644
index 3774496e3e82..000000000000
--- a/metadata/md5-cache/dev-haskell/hspec-discover-2.7.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.12 test? ( >=dev-haskell/hspec-meta-2.3.2 >=dev-haskell/quickcheck-2.7 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Automatically discover and run Hspec tests
-EAPI=7
-HOMEPAGE=http://hspec.github.io/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.7.1
-SRC_URI=https://hackage.haskell.org/package/hspec-discover-2.7.1/hspec-discover-2.7.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_=f1c3867624b9b07654bebb646d38c53d
diff --git a/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0 b/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
deleted file mode 100644
index 2a4050f3d5f7..000000000000
--- a/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/call-stack:=[profile?] dev-haskell/clock:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A version of Hspec which is used to test Hspec itself
-EAPI=7
-HOMEPAGE=http://hspec.github.io/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/call-stack:=[profile?] dev-haskell/clock:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/2.6.0
-SRC_URI=https://hackage.haskell.org/package/hspec-meta-2.6.0/hspec-meta-2.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_=e3e2128b16828618e94962a6a80d8196
diff --git a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
deleted file mode 100644
index d8392039ecde..000000000000
--- a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.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/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=MySQL driver for HSQL
-EAPI=8
-HOMEPAGE=https://hackage.haskell.org/package/hsql-mysql
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0=
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/hsql-mysql-1.8.2/hsql-mysql-1.8.2.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=81de10d92f8aed22f98fa43e76bbf5cb
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1 b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
deleted file mode 100644
index 32dea816caaa..000000000000
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A unit testing framework for Haskell
-EAPI=7
-HOMEPAGE=http://hunit.sourceforge.net/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.4:=
-SLOT=0/1.2.5.2
-SRC_URI=https://hackage.haskell.org/package/HUnit-1.2.5.2/HUnit-1.2.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_=1d2cd814822779253a71d5d753247bd5
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.6.0.0 b/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
deleted file mode 100644
index 03bd6b9062a7..000000000000
--- a/metadata/md5-cache/dev-haskell/hunit-1.6.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/call-stack:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A unit testing framework for Haskell
-EAPI=8
-HOMEPAGE=https://github.com/hspec/HUnit#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.6.0.0
-SRC_URI=https://hackage.haskell.org/package/HUnit-1.6.0.0/HUnit-1.6.0.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8234acf0768212cc593d2deabac4c930
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
deleted file mode 100644
index 3ba74faf7e60..000000000000
--- a/metadata/md5-cache/dev-haskell/integer-logarithms-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-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Integer logarithms
-EAPI=7
-HOMEPAGE=https://github.com/haskellari/integer-logarithms
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-8.4.3:=
-RESTRICT=test
-SLOT=0/1.0.3.1
-SRC_URI=https://hackage.haskell.org/package/integer-logarithms-1.0.3.1/integer-logarithms-1.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_=10d998c399169bcd3b9383e6d9d4b01d
diff --git a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4 b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
deleted file mode 100644
index 0d174eb23834..000000000000
--- a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-2.0 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Parse jira wiki text into an abstract syntax tree
-EAPI=7
-HOMEPAGE=https://github.com/tarleb/jira-wiki-markup
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.1.4
-SRC_URI=https://hackage.haskell.org/package/jira-wiki-markup-1.1.4/jira-wiki-markup-1.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_=a2f8e5103c3a8b9d2496733efc0292e9
diff --git a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.3.4 b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.3.4
deleted file mode 100644
index ef6e31e409e8..000000000000
--- a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.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/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.1.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 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Handle Jira wiki markup
-EAPI=7
-HOMEPAGE=https://github.com/tarleb/jira-wiki-markup
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/1.3.4
-SRC_URI=https://hackage.haskell.org/package/jira-wiki-markup-1.3.4/jira-wiki-markup-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_=8cc71c0635685eb5a472f7c0cc9bdded
diff --git a/metadata/md5-cache/dev-haskell/kan-extensions-5.2 b/metadata/md5-cache/dev-haskell/kan-extensions-5.2
deleted file mode 100644
index 696cdb44a1f3..000000000000
--- a/metadata/md5-cache/dev-haskell/kan-extensions-5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[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.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[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 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads
-EAPI=8
-HOMEPAGE=https://github.com/ekmett/kan-extensions/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[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.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/5.2
-SRC_URI=https://hackage.haskell.org/package/kan-extensions-5.2/kan-extensions-5.2.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=33f7171e4158123bfcfc55ca23271fea
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.4.7 b/metadata/md5-cache/dev-haskell/language-c-0.4.7
deleted file mode 100644
index 5a2675586502..000000000000
--- a/metadata/md5-cache/dev-haskell/language-c-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.6 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Analysis and generation of C code
-EAPI=7
-HOMEPAGE=https://visq.github.io/language-c/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.4.7
-SRC_URI=https://hackage.haskell.org/package/language-c-0.4.7/language-c-0.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_=7328d5699e32aae0b55c85aa4b6f18d5
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.7.1 b/metadata/md5-cache/dev-haskell/language-c-0.7.1
deleted file mode 100644
index cf77e176a561..000000000000
--- a/metadata/md5-cache/dev-haskell/language-c-0.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Analysis and generation of C code
-EAPI=6
-HOMEPAGE=https://visq.github.io/language-c/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.7.1
-SRC_URI=https://hackage.haskell.org/package/language-c-0.7.1/language-c-0.7.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ee779cf358f2a3c659fc6420a9122c27
diff --git a/metadata/md5-cache/dev-haskell/linear-1.21.10 b/metadata/md5-cache/dev-haskell/linear-1.21.10
new file mode 100644
index 000000000000..44eb748a1b6e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/linear-1.21.10
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-6:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/reflection-2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.5.0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.14:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hunit-1.2.5 >=dev-haskell/simple-reflect-0.3.1 >=dev-haskell/test-framework-0.8 >=dev-haskell/test-framework-hunit-0.3 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Linear Algebra
+EAPI=8
+HOMEPAGE=https://github.com/ekmett/linear/
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-6:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/reflection-2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.5.0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.14:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/1.21.10
+SRC_URI=https://hackage.haskell.org/package/linear-1.21.10/linear-1.21.10.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b8b5bc3e7ed98999fa22299abf3cc21a
diff --git a/metadata/md5-cache/dev-haskell/linear-1.21.3 b/metadata/md5-cache/dev-haskell/linear-1.21.3
deleted file mode 100644
index 53c7d1647db2..000000000000
--- a/metadata/md5-cache/dev-haskell/linear-1.21.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-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.18 >=dev-haskell/hunit-1.2.5 >=dev-haskell/simple-reflect-0.3.1 >=dev-haskell/test-framework-0.8 >=dev-haskell/test-framework-hunit-0.3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Linear Algebra
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/linear/
-INHERIT=haskell-cabal
-IUSE=+template-haskell doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/1.21.3
-SRC_URI=https://hackage.haskell.org/package/linear-1.21.3/linear-1.21.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_=38b027cd18ad1e9a986a38f55283f4be
diff --git a/metadata/md5-cache/dev-haskell/linear-1.21.5 b/metadata/md5-cache/dev-haskell/linear-1.21.5
deleted file mode 100644
index b484fdb0d847..000000000000
--- a/metadata/md5-cache/dev-haskell/linear-1.21.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-6:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hunit-1.2.5 >=dev-haskell/simple-reflect-0.3.1 >=dev-haskell/test-framework-0.8 >=dev-haskell/test-framework-hunit-0.3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Linear Algebra
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/linear/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-6:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
-SLOT=0/1.21.5
-SRC_URI=https://hackage.haskell.org/package/linear-1.21.5/linear-1.21.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_=e8e4aff79913eb61ac25b4876d447011
diff --git a/metadata/md5-cache/dev-haskell/lua-2.1.0 b/metadata/md5-cache/dev-haskell/lua-2.1.0
deleted file mode 100644
index e1e10c45d6f5..000000000000
--- a/metadata/md5-cache/dev-haskell/lua-2.1.0
+++ /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-lang/lua:5.3 >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hunit-0.9 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lua, an embeddable scripting language
-EAPI=8
-HOMEPAGE=https://hslua.org/
-INHERIT=haskell-cabal
-IUSE=+allow-unsafe-gc apicheck +export-dynamic +hardcode-reg-keys lua-32bits doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-8.4.3:= dev-lang/lua:5.3
-RESTRICT=!test? ( test )
-SLOT=0/2.1.0
-SRC_URI=https://hackage.haskell.org/package/lua-2.1.0/lua-2.1.0.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ef7bb2f19ccf25437c16a5fd43500fe
diff --git a/metadata/md5-cache/dev-haskell/memory-0.15.0 b/metadata/md5-cache/dev-haskell/memory-0.15.0
deleted file mode 100644
index e2340380aff2..000000000000
--- a/metadata/md5-cache/dev-haskell/memory-0.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/basement-0.0.7:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/foundation ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=memory and related abstraction stuff
-EAPI=7
-HOMEPAGE=https://github.com/vincenthz/hs-memory
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/basement-0.0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.15.0
-SRC_URI=https://hackage.haskell.org/package/memory-0.15.0/memory-0.15.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_=77a9e58de8acf67f9eba7ce28249fc93
diff --git a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0 b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0-r1
index 643e89723eaa..531eac2b8d64 100644
--- a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
+++ b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/monad-loops-0.3:=[profile?] dev-haskell/pretty-hex:=[profile?] >=dev-lang/ghc-7.6.1:= generators? ( <dev-haskell/language-c-0.7:=[profile?] dev-haskell/regex-pcre:=[profile?] ) >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/monad-loops-0.3:=[profile?] dev-haskell/pretty-hex:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Netlink communication for Haskell
 EAPI=8
 HOMEPAGE=https://github.com/Ongy/netlink-hs
 INHERIT=haskell-cabal
-IUSE=generators doc hscolour profile
-KEYWORDS=~amd64 ~x86
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/monad-loops-0.3:=[profile?] dev-haskell/pretty-hex:=[profile?] >=dev-lang/ghc-7.6.1:= generators? ( <dev-haskell/language-c-0.7:=[profile?] dev-haskell/regex-pcre:=[profile?] )
+RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/monad-loops-0.3:=[profile?] dev-haskell/pretty-hex:=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=0/1.1.1.0
 SRC_URI=https://hackage.haskell.org/package/netlink-1.1.1.0/netlink-1.1.1.0.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=04d24dbe807529a395a62f3365bebb24
+_md5_=1c34be0af5917b3a2345985562756eaa
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0 b/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
deleted file mode 100644
index fdc467c8872c..000000000000
--- a/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
+++ /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/cabal-1.10
-DESCRIPTION=URI manipulation
-EAPI=7
-HOMEPAGE=https://github.com/haskell/network-uri
-INHERIT=haskell-cabal
-IUSE=profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/2.5.0.0
-SRC_URI=https://hackage.haskell.org/package/network-uri-2.5.0.0/network-uri-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_=82021aa1b4773e26a26139b355b78028
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0 b/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
deleted file mode 100644
index 31030e285bf4..000000000000
--- a/metadata/md5-cache/dev-haskell/network-uri-2.6.3.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.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=URI manipulation
-EAPI=7
-HOMEPAGE=https://github.com/haskell/network-uri
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/2.6.3.0
-SRC_URI=https://hackage.haskell.org/package/network-uri-2.6.3.0/network-uri-2.6.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_=50469135c34afac1cd1dfd6a41935a04
diff --git a/metadata/md5-cache/dev-haskell/nonce-1.0.7 b/metadata/md5-cache/dev-haskell/nonce-1.0.7
deleted file mode 100644
index 9a3dc2dd28fb..000000000000
--- a/metadata/md5-cache/dev-haskell/nonce-1.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/text-0.9:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Generate cryptographic nonces
-EAPI=6
-HOMEPAGE=https://github.com/prowdsponsor/nonce
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/text-0.9:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/1.0.7
-SRC_URI=https://hackage.haskell.org/package/nonce-1.0.7/nonce-1.0.7.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=35db5ab7b691e4dabdb7ffbdc214aca3
diff --git a/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3 b/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
deleted file mode 100644
index ccdb9847f14e..000000000000
--- a/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Combinators for executing IO actions in parallel on a thread pool
-EAPI=8
-HOMEPAGE=http://batterseapower.github.com/parallel-io
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.3.3
-SRC_URI=https://hackage.haskell.org/package/parallel-io-0.3.3/parallel-io-0.3.3.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d6130612fe04fa6bd126f20835fb4e6a
diff --git a/metadata/md5-cache/dev-haskell/parallel-io-0.3.5 b/metadata/md5-cache/dev-haskell/parallel-io-0.3.5
new file mode 100644
index 000000000000..92e337085787
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/parallel-io-0.3.5
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Combinators for executing IO actions in parallel on a thread pool
+EAPI=7
+HOMEPAGE=https://batterseapower.github.com/parallel-io
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/0.3.5
+SRC_URI=https://hackage.haskell.org/package/parallel-io-0.3.5/parallel-io-0.3.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_=ca9f31bbfb90207f063ff11e9005507d
diff --git a/metadata/md5-cache/dev-haskell/pretty-show-1.9.5 b/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
deleted file mode 100644
index 32188f0bb2c2..000000000000
--- a/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Tools for working with derived 'Show' instances and generic inspection of values
-EAPI=7
-HOMEPAGE=https://wiki.github.com/yav/pretty-show
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/1.9.5
-SRC_URI=https://hackage.haskell.org/package/pretty-show-1.9.5/pretty-show-1.9.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_=6d054d740d1eb68eabdca5e6eb598cd2
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1 b/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
deleted file mode 100644
index adadc27adcdd..000000000000
--- a/metadata/md5-cache/dev-haskell/prettyprinter-1.6.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.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/pgp-wordlist-0.1 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A modern, easy to use, well-documented, extensible pretty-printer
-EAPI=7
-HOMEPAGE=https://github.com/quchen/prettyprinter
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.6.1
-SRC_URI=https://hackage.haskell.org/package/prettyprinter-1.6.1/prettyprinter-1.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_=eecc138762e9096d1999dd390e5d0d1d
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2 b/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
deleted file mode 100644
index 39a7494d0b53..000000000000
--- a/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-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/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/prettyprinter-1.1.1:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/doctest-0.9 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=ANSI terminal backend for the "prettyprinter" package
-EAPI=8
-HOMEPAGE=https://github.com/quchen/prettyprinter
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/prettyprinter-1.1.1:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/1.1.1.2
-SRC_URI=https://hackage.haskell.org/package/prettyprinter-ansi-terminal-1.1.1.2/prettyprinter-ansi-terminal-1.1.1.2.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b5b7d73c9094402d234731ffc5095732
diff --git a/metadata/md5-cache/dev-haskell/random-1.1 b/metadata/md5-cache/dev-haskell/random-1.1
deleted file mode 100644
index bd12345503e7..000000000000
--- a/metadata/md5-cache/dev-haskell/random-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.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=random number library
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/random
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=https://hackage.haskell.org/package/random-1.1/random-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_=9849de8e62128985cf4f7c4d4705e14b
diff --git a/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0 b/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
deleted file mode 100644
index 52674e2a2382..000000000000
--- a/metadata/md5-cache/dev-haskell/regex-base-0.94.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/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Replaces/Enhances Text.Regex
-EAPI=7
-HOMEPAGE=https://wiki.haskell.org/Regular_expressions
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.94.0.0
-SRC_URI=https://hackage.haskell.org/package/regex-base-0.94.0.0/regex-base-0.94.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_=659bd7efeb54b82831b571b8b4ce5ddb
diff --git a/metadata/md5-cache/dev-haskell/retry-0.8.1.1 b/metadata/md5-cache/dev-haskell/retry-0.8.1.1
deleted file mode 100644
index 11e477545ec5..000000000000
--- a/metadata/md5-cache/dev-haskell/retry-0.8.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/exceptions-0.5:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hedgehog >=dev-haskell/hunit-1.2.5.2 dev-haskell/mtl dev-haskell/stm dev-haskell/tasty dev-haskell/tasty-hedgehog dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Retry combinators for monadic actions that may fail
-EAPI=7
-HOMEPAGE=https://github.com/Soostone/retry
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8.1.1
-SRC_URI=https://hackage.haskell.org/package/retry-0.8.1.1/retry-0.8.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_=dd88c79585591c0cbad9dbf773de404c
diff --git a/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4 b/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
deleted file mode 100644
index 86400d5158d8..000000000000
--- a/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
+++ /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/cabal-1.8 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Simple unicode collation as per RFC5051
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/rfc5051
-INHERIT=haskell-cabal
-IUSE=mkunicodedata doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/0.1.0.4
-SRC_URI=https://hackage.haskell.org/package/rfc5051-0.1.0.4/rfc5051-0.1.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_=3c92607e0a097293be55e64d9919552a
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1 b/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1
deleted file mode 100644
index 5b2760000d2d..000000000000
--- a/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-haskell/skylighting-core-0.10.5:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=syntax highlighting library
-EAPI=7
-HOMEPAGE=https://github.com/jgm/skylighting
-INHERIT=haskell-cabal
-IUSE=executable doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=~dev-haskell/skylighting-core-0.10.5:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] )
-SLOT=0/0.10.5
-SRC_URI=https://hackage.haskell.org/package/skylighting-0.10.5/skylighting-0.10.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_=ea0a9b433e0f81152b43cce377769c59
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1 b/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1
deleted file mode 100644
index fd6b188ecc99..000000000000
--- a/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=syntax highlighting library
-EAPI=7
-HOMEPAGE=https://github.com/jgm/skylighting
-INHERIT=haskell-cabal
-IUSE=executable doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] )
-SLOT=0/0.8.5
-SRC_URI=https://hackage.haskell.org/package/skylighting-0.8.5/skylighting-0.8.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_=06d3303a7cd9690cd51352189a9dceeb
diff --git a/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1 b/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1
deleted file mode 100644
index 15c1c974ff3c..000000000000
--- a/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1
+++ /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/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/diff dev-haskell/pretty-show dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=syntax highlighting library
-EAPI=7
-HOMEPAGE=https://github.com/jgm/skylighting
-INHERIT=haskell-cabal
-IUSE=executable doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:=
-RESTRICT=!test? ( test )
-SLOT=0/0.10.5
-SRC_URI=https://hackage.haskell.org/package/skylighting-core-0.10.5/skylighting-core-0.10.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_=db4b3dd860daee2db90b5ab5c2bc3491
diff --git a/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1 b/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1
deleted file mode 100644
index fe51043cdc78..000000000000
--- a/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1
+++ /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/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/hxt:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/libpcre:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/diff dev-haskell/hunit dev-haskell/pretty-show dev-haskell/quickcheck dev-haskell/random dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=syntax highlighting library
-EAPI=7
-HOMEPAGE=https://github.com/jgm/skylighting
-INHERIT=haskell-cabal
-IUSE=executable doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/hxt:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/libpcre:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8.5
-SRC_URI=https://hackage.haskell.org/package/skylighting-core-0.8.5/skylighting-core-0.8.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_=f5e7802d187cd3ab1bbb8df80a6a6377
diff --git a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1 b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
deleted file mode 100644
index 3cc3a0755d87..000000000000
--- a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.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-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=True Sums of Products
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/sop-core
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-8.0.1:=
-SLOT=0/0.5.0.1
-SRC_URI=https://hackage.haskell.org/package/sop-core-0.5.0.1/sop-core-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_=afdc0bb356980cd81f2ea8f1a253a97f
diff --git a/metadata/md5-cache/dev-haskell/splitmix-0.0.4 b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
deleted file mode 100644
index d8d8cc8a42bc..000000000000
--- a/metadata/md5-cache/dev-haskell/splitmix-0.0.4
+++ /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:= random? ( >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] ) >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Fast Splittable PRNG
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/splitmix
-INHERIT=haskell-cabal
-IUSE=optimised-mixer +random doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:= random? ( >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
-RESTRICT=test
-SLOT=0/0.0.4
-SRC_URI=https://hackage.haskell.org/package/splitmix-0.0.4/splitmix-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_=933e939552dffd8030e321225d39dc76
diff --git a/metadata/md5-cache/dev-haskell/statevar-1.1.1.1 b/metadata/md5-cache/dev-haskell/statevar-1.1.1.1
deleted file mode 100644
index 451cd7c6f512..000000000000
--- a/metadata/md5-cache/dev-haskell/statevar-1.1.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/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=State variables
-EAPI=8
-HOMEPAGE=https://github.com/haskell-opengl/StateVar
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/1.1.1.1
-SRC_URI=https://hackage.haskell.org/package/StateVar-1.1.1.1/StateVar-1.1.1.1.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3997bb8f43d484f25bda7662949cbfc5
diff --git a/metadata/md5-cache/dev-haskell/strict-0.3.2-r1 b/metadata/md5-cache/dev-haskell/strict-0.3.2-r1
deleted file mode 100644
index ec70c91e0151..000000000000
--- a/metadata/md5-cache/dev-haskell/strict-0.3.2-r1
+++ /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/cabal-1.2 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Strict data types and String IO
-EAPI=7
-HOMEPAGE=https://github.com/haskellari/strict
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/0.3.2
-SRC_URI=https://hackage.haskell.org/package/strict-0.3.2/strict-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_=c964d7e35e51ad39638d79696515fc0c
diff --git a/metadata/md5-cache/dev-haskell/syb-0.7.1 b/metadata/md5-cache/dev-haskell/syb-0.7.1
deleted file mode 100644
index ac4e8383cc83..000000000000
--- a/metadata/md5-cache/dev-haskell/syb-0.7.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/mtl ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Scrap Your Boilerplate
-EAPI=7
-HOMEPAGE=http://www.cs.uu.nl/wiki/GenericProgramming/SYB
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.7.1
-SRC_URI=https://hackage.haskell.org/package/syb-0.7.1/syb-0.7.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_=4c33546dd082bf18013d4078d0612fc3
diff --git a/metadata/md5-cache/dev-haskell/tagged-0.8.6 b/metadata/md5-cache/dev-haskell/tagged-0.8.6
deleted file mode 100644
index 0144cb377b66..000000000000
--- a/metadata/md5-cache/dev-haskell/tagged-0.8.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Haskell 98 phantom types to avoid unsafely passing dummy arguments
-EAPI=7
-HOMEPAGE=https://github.com/ekmett/tagged
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
-SLOT=0/0.8.6
-SRC_URI=https://hackage.haskell.org/package/tagged-0.8.6/tagged-0.8.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_=0b0349b58cf856a6e4e5d75a46f9e956
diff --git a/metadata/md5-cache/dev-haskell/tasty-1.2.3 b/metadata/md5-cache/dev-haskell/tasty-1.2.3
deleted file mode 100644
index e8892d1b36b5..000000000000
--- a/metadata/md5-cache/dev-haskell/tasty-1.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ansi-terminal-0.9:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] dev-haskell/wcwidth:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/clock-0.4.4.0:=[profile?] >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Modern and extensible testing framework
-EAPI=7
-HOMEPAGE=https://github.com/feuerbach/tasty
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/ansi-terminal-0.9:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] dev-haskell/wcwidth:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/clock-0.4.4.0:=[profile?]
-SLOT=0/1.2.3
-SRC_URI=https://hackage.haskell.org/package/tasty-1.2.3/tasty-1.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_=7710b7d029a012ca256efeee03884819
diff --git a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1 b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
deleted file mode 100644
index b9481ddbd4c8..000000000000
--- a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[profile?] >=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.13 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Integration for tasty and hedgehog
-EAPI=7
-HOMEPAGE=https://github.com/qfpl/tasty-hedgehog
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[profile?] >=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0.0.2
-SRC_URI=https://hackage.haskell.org/package/tasty-hedgehog-1.0.0.2/tasty-hedgehog-1.0.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_=4ff4e2ba27397d8537ac44dcc413e5ed
diff --git a/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2 b/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
deleted file mode 100644
index c14828ccaee0..000000000000
--- a/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/tasty-1.2.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=HUnit support for the Tasty test framework
-EAPI=7
-HOMEPAGE=https://github.com/UnkindPartition/tasty
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/tasty-1.2.2:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.10.0.2
-SRC_URI=https://hackage.haskell.org/package/tasty-hunit-0.10.0.2/tasty-hunit-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_=a2c13204a5455e06c4daf63691717fa4
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2 b/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
deleted file mode 100644
index da37022af310..000000000000
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
+++ /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.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/base-orphans-0.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Framework for running and organising tests, with HUnit and QuickCheck support
-EAPI=7
-HOMEPAGE=http://haskell.github.io/test-framework/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/base-orphans-0.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/0.8.2.0
-SRC_URI=https://hackage.haskell.org/package/test-framework-0.8.2.0/test-framework-0.8.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_=d3c76e99d3d9f51f9708e68a2baa5418
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
deleted file mode 100644
index 032f63becae0..000000000000
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=QuickCheck2 support for the test-framework package
-EAPI=7
-HOMEPAGE=http://haskell.github.io/test-framework/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.3.0.5
-SRC_URI=https://hackage.haskell.org/package/test-framework-quickcheck2-0.3.0.5/test-framework-quickcheck2-0.3.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_=5f1879fb8365bb3cdb3d4a7e31478e71
diff --git a/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1 b/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
deleted file mode 100644
index 821a4b0ad69c..000000000000
--- a/metadata/md5-cache/dev-haskell/text-icu-0.7.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/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/icu:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Bindings to the ICU library
-EAPI=7
-HOMEPAGE=https://github.com/haskell/text-icu
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/icu:=
-RESTRICT=test
-SLOT=0/0.7.0.1
-SRC_URI=https://hackage.haskell.org/package/text-icu-0.7.0.1/text-icu-0.7.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_=6a741db477a0225e2e41573b9a72cf4b
diff --git a/metadata/md5-cache/dev-haskell/th-reify-many-0.1.10 b/metadata/md5-cache/dev-haskell/th-reify-many-0.1.10
new file mode 100644
index 000000000000..6f399a0ad5f7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-reify-many-0.1.10
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Recurseively reify template haskell datatype info
+EAPI=8
+HOMEPAGE=https://github.com/mgsloan/th-reify-many
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.10
+SRC_URI=https://hackage.haskell.org/package/th-reify-many-0.1.10/th-reify-many-0.1.10.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=924c818a4fe54bd26e3773c42043df3d
diff --git a/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9 b/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
deleted file mode 100644
index c60be0165c1f..000000000000
--- a/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
+++ /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/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Recurseively reify template haskell datatype info
-EAPI=7
-HOMEPAGE=https://github.com/mgsloan/th-reify-many
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1.9
-SRC_URI=https://hackage.haskell.org/package/th-reify-many-0.1.9/th-reify-many-0.1.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_=ee2809c1349eebede4178e01ebee6adc
diff --git a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1 b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1
deleted file mode 100644
index fa8d66103a04..000000000000
--- a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15 >=dev-haskell/split-0.1 <dev-haskell/split-0.3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Unicode normalization
-EAPI=7
-HOMEPAGE=https://github.com/composewell/unicode-transforms
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.7.1
-SRC_URI=https://hackage.haskell.org/package/unicode-transforms-0.3.7.1/unicode-transforms-0.3.7.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_=3863ae04dbcdbef5180ead63cd7d647a
diff --git a/metadata/md5-cache/dev-haskell/uniplate-1.6.12 b/metadata/md5-cache/dev-haskell/uniplate-1.6.12
deleted file mode 100644
index 4b2f10998ec3..000000000000
--- a/metadata/md5-cache/dev-haskell/uniplate-1.6.12
+++ /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.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Help writing simple, concise and fast generic operations
-EAPI=7
-HOMEPAGE=http://community.haskell.org/~ndm/uniplate/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/1.6.12
-SRC_URI=https://hackage.haskell.org/package/uniplate-1.6.12/uniplate-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_=7b67870a7da09557be387d7bb2fb29ce
diff --git a/metadata/md5-cache/dev-haskell/wreq-0.5.3.3 b/metadata/md5-cache/dev-haskell/wreq-0.5.3.3
deleted file mode 100644
index 07a0e501c6e9..000000000000
--- a/metadata/md5-cache/dev-haskell/wreq-0.5.3.3
+++ /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.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/
-INHERIT=haskell-cabal
-IUSE=aws httpbin doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-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.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_=59cf6a820941596f116cde99da1626d4
diff --git a/metadata/md5-cache/dev-haskell/wreq-0.5.3.3-r1 b/metadata/md5-cache/dev-haskell/wreq-0.5.3.3-r1
new file mode 100644
index 000000000000..e1b5e6ece11d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wreq-0.5.3.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+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/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/time-locale-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 >=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An easy-to-use HTTP client library
+EAPI=8
+HOMEPAGE=https://www.serpentine.com/wreq
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+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/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/time-locale-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.10.1:=
+RESTRICT=test
+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_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=026c13859d62b81514cd10056b6a91f2
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9 b/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
deleted file mode 100644
index fed2f0933b58..000000000000
--- a/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3.4:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] dev-haskell/http-client-tls:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[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.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Authentication for Yesod
-EAPI=7
-HOMEPAGE=https://www.yesodweb.com/
-INHERIT=haskell-cabal
-IUSE=+network-uri doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3.4:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] dev-haskell/http-client-tls:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[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.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-SLOT=0/1.6.9
-SRC_URI=https://hackage.haskell.org/package/yesod-auth-1.6.9/yesod-auth-1.6.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_=5da16ac5d878abc8705a8153360d7fbc
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.6.2.2 b/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
deleted file mode 100644
index 2f20d33c046b..000000000000
--- a/metadata/md5-cache/dev-haskell/zlib-0.6.2.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:= sys-libs/zlib >=dev-haskell/cabal-1.10 virtual/pkgconfig test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Compression and decompression in the gzip and zlib formats
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/zlib
-INHERIT=haskell-cabal
-IUSE=bundled-c-zlib non-blocking-ffi doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=0/0.6.2.2
-SRC_URI=https://hackage.haskell.org/package/zlib-0.6.2.2/zlib-0.6.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_=f658bd5a9816b543baf74a6d7f1e446c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3ac792878f81..1d8177f22ffb 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 c42dbcb3a6d1..0f31775a86c1 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 7917c60ee444..e9b0aa81af9e 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 57fff535da15..23475fb97f6e 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c354ac5fa7f6f003792af2ba1a9b5549
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r6 b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r6
index 18140423cf2e..623009a15e79 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r6
+++ b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r6
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/nspr-4.13.1 dev-libs/libffi:= sys-libs/readline:0= >=sys-libs/
 DESCRIPTION=Stand-alone JavaScript C++ library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
-INHERIT=autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5
+INHERIT=autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5 flag-o-matic
 IUSE=debug +jit minimal +system-icu test custom-cflags custom-optimization
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=NPL-1.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=60
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-60.0-patches-04.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	mozcoreconf-v5	5c5854abb425b22d77b3f6eea04881f9	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6b75c79eb7d0c8325651bab50ff1cf9e
+_md5_=0aef497b0c07409e2cfc4453442a2b3d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index bba76fea1a06..377fc562709c 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/nwjs-0.65.1 b/metadata/md5-cache/dev-libs/nwjs-0.65.1
index 9b7913b4304c..2a54f337b37c 100644
--- a/metadata/md5-cache/dev-libs/nwjs-0.65.1
+++ b/metadata/md5-cache/dev-libs/nwjs-0.65.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/libglvnd media-libs/vulkan-loader media-video/ffmpeg-chromium:102 net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango[X]
 SLOT=0
 SRC_URI=amd64? ( https://dl.nwjs.io/v0.65.1/nwjs-v0.65.1-linux-x64.tar.gz )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=53f8d65ae634e285cf18c7642e440573
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 84da74a23ae9..637aa2932142 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/scipy-1.9.0 b/metadata/md5-cache/dev-python/scipy-1.9.0-r1
index 783cbaa1aa43..5770d252688b 100644
--- a/metadata/md5-cache/dev-python/scipy-1.9.0
+++ b/metadata/md5-cache/dev-python/scipy-1.9.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=dev-lang/swig >=dev-python/cython-0.29.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.62.2 dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/meson-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-lang/swig >=dev-python/cython-0.29.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.62.2 dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/meson-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) virtual/fortran
+DEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 virtual/fortran
 DESCRIPTION=Scientific algorithms library for Python
 EAPI=8
 HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
 INHERIT=fortran-2 distutils-r1 multiprocessing
-IUSE=doc +sparse test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 -hppa
 LICENSE=BSD LGPL-2
-RDEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+RDEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.9.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.8.1/scipy-html-1.8.1.zip https://docs.scipy.org/doc/scipy-1.8.1/scipy-ref-1.8.1.pdf )
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4f8b28d7fe0c3b6bbcc98202ef0ec0ab
+_md5_=1c8236a314e8f5ea34c85692362310bd
diff --git a/metadata/md5-cache/dev-python/scipy-1.9.0_rc3 b/metadata/md5-cache/dev-python/scipy-1.9.0_rc3
deleted file mode 100644
index 6d3ed8ac1ec8..000000000000
--- a/metadata/md5-cache/dev-python/scipy-1.9.0_rc3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/swig >=dev-python/cython-0.29.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.62.2 dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/meson-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) virtual/fortran
-DESCRIPTION=Scientific algorithms library for Python
-EAPI=8
-HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
-INHERIT=fortran-2 distutils-r1 multiprocessing
-IUSE=doc +sparse test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-LICENSE=BSD LGPL-2
-RDEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/scipy/scipy-1.9.0rc3.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.8.1/scipy-html-1.8.1.zip https://docs.scipy.org/doc/scipy-1.8.1/scipy-ref-1.8.1.pdf )
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4676c0559281b206bcaf111bfeb9f90
diff --git a/metadata/md5-cache/dev-python/scipy-1.9.9999 b/metadata/md5-cache/dev-python/scipy-1.9.9999
index 80a495ab9283..a798f5c1e53e 100644
--- a/metadata/md5-cache/dev-python/scipy-1.9.9999
+++ b/metadata/md5-cache/dev-python/scipy-1.9.9999
@@ -1,16 +1,16 @@
-BDEPEND=dev-lang/swig >=dev-python/cython-0.29.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.62.2 dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/meson-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/swig >=dev-python/cython-0.29.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.62.2 dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/meson-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) virtual/fortran
+DEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 virtual/fortran
 DESCRIPTION=Scientific algorithms library for Python
 EAPI=8
 HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
 INHERIT=fortran-2 distutils-r1 multiprocessing git-r3
-IUSE=doc +sparse test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD LGPL-2
 PROPERTIES=live
-RDEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas >=virtual/lapack-3.8 sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+RDEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4f8b28d7fe0c3b6bbcc98202ef0ec0ab
+_md5_=1c8236a314e8f5ea34c85692362310bd
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index a5af3d975a0b..55d4b61a1513 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/valgrind-3.19.0 b/metadata/md5-cache/dev-util/valgrind-3.19.0
index a92ed8e315bd..3865059dbf62 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.19.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.19.0
@@ -12,4 +12,4 @@ RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.19.0.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=acdfc448d36d541f7d76e398ad29af72
+_md5_=185d2a4c7d927759dcc5befa022173ed
diff --git a/metadata/md5-cache/dev-util/valgrind-9999 b/metadata/md5-cache/dev-util/valgrind-9999
index 4cd436be1eeb..2bde5f153a50 100644
--- a/metadata/md5-cache/dev-util/valgrind-9999
+++ b/metadata/md5-cache/dev-util/valgrind-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=acdfc448d36d541f7d76e398ad29af72
+_md5_=185d2a4c7d927759dcc5befa022173ed
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index d6ea301508ff..175cc58081fd 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
index 2f553e06a560..164e77094d68 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-10.20220624
+++ b/metadata/md5-cache/dev-vcs/git-annex-10.20220624
@@ -9,7 +9,8 @@ IUSE=+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentp
 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
+REQUIRED_USE=webapp? ( assistant )
 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
+_md5_=d1f4c9334db7fbcab54c18f496e05d03
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 450c7a4cbfc5..4a7b5e9cc4b4 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/libpulse-16.0-r1 b/metadata/md5-cache/media-libs/libpulse-16.0-r1
deleted file mode 100644
index 6c60884a6c13..000000000000
--- a/metadata/md5-cache/media-libs/libpulse-16.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext sys-devel/m4 virtual/libiconv virtual/libintl virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.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(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0: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(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=Libraries for PulseAudio clients
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
-IUSE=+asyncns dbus doc +glib gtk selinux systemd test valgrind X 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.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(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0: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(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=34d5bb3b37974ed108a0bb79dbcb4846
diff --git a/metadata/md5-cache/media-libs/libpulse-16.1 b/metadata/md5-cache/media-libs/libpulse-16.1
index 1e41955e7e5b..e233ddd1e0fe 100644
--- a/metadata/md5-cache/media-libs/libpulse-16.1
+++ b/metadata/md5-cache/media-libs/libpulse-16.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
 IUSE=+asyncns dbus doc +glib gtk selinux systemd test valgrind X 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 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=|| ( media-video/pipewire[sound-server(+)] media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
 RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.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(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0: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(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=932a0d7d0c439c39c08ede5eb7222dbf
+_md5_=08de218c863dc1e0b55396437bb928eb
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index c74d0a82193f..00b433666ccb 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/pulseaudio-13.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
deleted file mode 100644
index 150e40375631..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) test? ( >=dev-libs/check-0.9.10 ) sys-devel/gettext sys-devel/m4 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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=|| ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.26.0: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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:0= ) media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) realtime? ( sys-auth/rtkit ) gconf? ( >=gnome-base/gconf-3.2.6 ) X? ( x11-base/xorg-proto >=x11-libs/libXtst-1.0.99.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(-)?] ) dev-libs/libatomic_ops
-DESCRIPTION=A networked sound server with an advanced plugin system
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs udev multilib-minimal tmpfiles
-IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf +gdbm +glib gtk ipv6 jack libsamplerate lirc native-headset cpu_flags_arm_neon ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-RDEPEND=|| ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.26.0: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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:0= ) media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) realtime? ( sys-auth/rtkit ) gconf? ( >=gnome-base/gconf-3.2.6 ) equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) acct-user/pulse acct-group/pulse-access ) acct-group/audio virtual/tmpfiles
-REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) realtime? ( dbus ) udev? ( || ( alsa oss ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=273898675884c3d76101d1d4545e3bd3
diff --git a/metadata/md5-cache/media-sound/pulseaudio-15.0-r2 b/metadata/md5-cache/media-sound/pulseaudio-15.0-r2
deleted file mode 100644
index 0fba34d1fee3..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-15.0-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext sys-devel/m4 virtual/libiconv virtual/libintl virtual/pkgconfig doc? ( app-doc/doxygen ) orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-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(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.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(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0: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(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) dev-libs/libatomic_ops dev-libs/libpcre:* test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A networked sound server with an advanced plugin system
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
-IUSE=+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack lirc native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf 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 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-RDEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-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(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.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(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0: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(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) virtual/tmpfiles
-REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) daemon? ( ?? ( elogind systemd ) ) !daemon? ( !alsa !alsa-plugin !bluetooth !equalizer !gdbm !gstreamer !gtk !jack !lirc !native-headset !ofono-headset !orc !oss !sox !ssl !system-wide !udev !webrtc-aec !zeroconf ) equalizer? ( dbus ) native-headset? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-15.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b85ad5b831e876385fd98fb5e4c2324f
diff --git a/metadata/md5-cache/media-sound/pulseaudio-15.0-r3 b/metadata/md5-cache/media-sound/pulseaudio-15.0-r3
deleted file mode 100644
index d60fd45cf402..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-15.0-r3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext sys-devel/m4 virtual/libiconv virtual/libintl virtual/pkgconfig doc? ( app-doc/doxygen ) orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-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(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.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(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0: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(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) dev-libs/libatomic_ops dev-libs/libpcre:* test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A networked sound server with an advanced plugin system
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
-IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack ldac lirc native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf 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 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-RDEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-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(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.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(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0: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(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) daemon? ( bluetooth? ( gstreamer? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) ) ) virtual/tmpfiles
-REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) daemon? ( ?? ( elogind systemd ) ) !daemon? ( !alsa !alsa-plugin !bluetooth !equalizer !gdbm !gstreamer !gtk !jack !lirc !native-headset !ofono-headset !orc !oss !sox !ssl !system-wide !udev !webrtc-aec !zeroconf ) equalizer? ( dbus ) native-headset? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-15.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4141675a48146b57102fe27dc2c93888
diff --git a/metadata/md5-cache/media-sound/pulseaudio-16.1 b/metadata/md5-cache/media-sound/pulseaudio-16.1
index 053543d0022a..d9d62c2b1196 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-16.1
+++ b/metadata/md5-cache/media-sound/pulseaudio-16.1
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=multilib-minimal
 IUSE=bluetooth daemon +glib jack ofono-headset 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 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=media-libs/libpulse-16.1[glib?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( >=media-sound/pulseaudio-daemon-16.1[bluetooth?,glib?,jack?,ofono-headset?] )
 SLOT=0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4606298a23b8b15702e82d050c5f35e
+_md5_=3648bdcea074524aa545954a9d40493d
diff --git a/metadata/md5-cache/media-sound/pulseaudio-ctl-1.67 b/metadata/md5-cache/media-sound/pulseaudio-ctl-1.67
deleted file mode 100644
index f96d7bf76f8f..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-ctl-1.67
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=CLI utility to control PulseAudio volume
-EAPI=7
-HOMEPAGE=https://github.com/graysky2/pulseaudio-ctl
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-sound/pulseaudio
-SLOT=0
-SRC_URI=https://github.com/graysky2/pulseaudio-ctl/archive/v1.67.tar.gz -> pulseaudio-ctl-1.67.tar.gz
-_md5_=00e2ac668fe77f069a1723b8901cefcb
diff --git a/metadata/md5-cache/media-sound/pulseaudio-ctl-1.68 b/metadata/md5-cache/media-sound/pulseaudio-ctl-1.68
deleted file mode 100644
index 474e1740e03c..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-ctl-1.68
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=CLI utility to control PulseAudio volume
-EAPI=7
-HOMEPAGE=https://github.com/graysky2/pulseaudio-ctl
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-sound/pulseaudio
-SLOT=0
-SRC_URI=https://github.com/graysky2/pulseaudio-ctl/archive/v1.68.tar.gz -> pulseaudio-ctl-1.68.tar.gz
-_md5_=ccd57e1a0fbf2d13e384bf577b6acd00
diff --git a/metadata/md5-cache/media-sound/pulseaudio-ctl-1.69 b/metadata/md5-cache/media-sound/pulseaudio-ctl-1.69
deleted file mode 100644
index 31b8fc11ec81..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-ctl-1.69
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=CLI utility to control PulseAudio volume
-EAPI=7
-HOMEPAGE=https://github.com/graysky2/pulseaudio-ctl
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-sound/pulseaudio
-SLOT=0
-SRC_URI=https://github.com/graysky2/pulseaudio-ctl/archive/v1.69.tar.gz -> pulseaudio-ctl-1.69.tar.gz
-_md5_=bd47ce211c95bf728423ba3bbbf61e40
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
deleted file mode 100644
index 993da11b2c0d..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A networked sound server with an advanced plugin system
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
-IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
-REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0837c1f061123fe0cff5af18d7de8498
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5
deleted file mode 100644
index 620dd015744f..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=Daemon component of PulseAudio (networked sound server)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
-IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
-REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ae8d036e4126834cb172d3cefb73a22b
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.1 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.1
index e3e9ead607c4..8bd3e14d80c7 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.1
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
 IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
 RDEPEND=~media-libs/libpulse-16.1[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) !media-video/pipewire[sound-server(+)] virtual/tmpfiles
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f1ffb210569f475275fcd7cb3a6faf65
+_md5_=2c76f1993b9453814f0a71cfd03c18ab
diff --git a/metadata/md5-cache/media-sound/pulseaudio-modules-bt-1.4 b/metadata/md5-cache/media-sound/pulseaudio-modules-bt-1.4
deleted file mode 100644
index 582bd31f4896..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-modules-bt-1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( media-video/ffmpeg ) media-libs/sbc ldac? ( media-libs/libldac ) >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 ofono-headset? ( >=net-misc/ofono-1.13 ) ( >=media-sound/pulseaudio-13.0[-bluetooth(-)] <media-sound/pulseaudio-15.99.1 )
-DESCRIPTION=PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth
-EAPI=7
-HOMEPAGE=https://github.com/EHfive/pulseaudio-modules-bt
-INHERIT=cmake readme.gentoo-r1
-IUSE=fdk +ffmpeg +ldac +native-headset ofono-headset
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( media-video/ffmpeg ) media-libs/sbc ldac? ( media-libs/libldac ) >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 ofono-headset? ( >=net-misc/ofono-1.13 ) ( >=media-sound/pulseaudio-13.0[-bluetooth(-)] <media-sound/pulseaudio-15.99.1 )
-SLOT=0
-SRC_URI=https://github.com/EHfive/pulseaudio-modules-bt/archive/v1.4.tar.gz -> pulseaudio-modules-bt-1.4.tar.gz https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb3b9b37951d7fe08aafeee976cef16c
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index d31ac6c4e38a..dd73b5c63852 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/pipewire-0.3.52-r1 b/metadata/md5-cache/media-video/pipewire-0.3.52-r1
deleted file mode 100644
index 7bd0cff0ef7b..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.52-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=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/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pipewire-alsa? ( media-plugins/alsa-plugins[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] ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Multimedia processing graphs
-EAPI=8
-HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf 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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-PDEPEND=>=media-video/wireplumber-0.4.8-r3
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pipewire-alsa? ( media-plugins/alsa-plugins[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] ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.52/pipewire-0.3.52.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	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=f45ea9b87c50a05f093329255ebad9a8
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.53_p20220705-r1 b/metadata/md5-cache/media-video/pipewire-0.3.53_p20220705-r1
deleted file mode 100644
index 41b75eca9355..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.53_p20220705-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=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/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Multimedia processing graphs
-EAPI=8
-HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-IUSE=bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf 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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-PDEPEND=>=media-video/wireplumber-0.4.8-r3
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/76350cebefe9bdabe24e9d043b83737547c225d8/pipewire-76350cebefe9bdabe24e9d043b83737547c225d8.tar.bz2 -> pipewire-0.3.53_p20220705.tar.bz2
-_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	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=b21d48b2baf069413057e325358d0a13
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.55-r1 b/metadata/md5-cache/media-video/pipewire-0.3.55-r1
deleted file mode 100644
index 3e80cc65cef9..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.55-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=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/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Multimedia processing graphs
-EAPI=8
-HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-IUSE=bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf 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=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-PDEPEND=>=media-video/wireplumber-0.4.8-r3
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.55/pipewire-0.3.55.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	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=2c05f3ed7caa7c2cdd6821cc6e6a89c6
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.56 b/metadata/md5-cache/media-video/pipewire-0.3.56
index 744a1d3ec716..be14425b8615 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.56
+++ b/metadata/md5-cache/media-video/pipewire-0.3.56
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pipewire.org/
 INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 IUSE=bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf 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=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.56/pipewire-0.3.56.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	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=185c3299493e502126bb405ab393e3c5
+_md5_=a452b5a5616b451327aeb603cbbf62c8
diff --git a/metadata/md5-cache/media-video/popcorntime-bin-0.4.8 b/metadata/md5-cache/media-video/popcorntime-bin-0.4.8
index 3eb02c2e7dcd..97814c1561dc 100644
--- a/metadata/md5-cache/media-video/popcorntime-bin-0.4.8
+++ b/metadata/md5-cache/media-video/popcorntime-bin-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/ns
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.4.8/Popcorn-Time-0.4.8-amd64.deb ) x86? ( https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.4.8/Popcorn-Time-0.4.8-i386.deb )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8b73b80ece664bf1d74770ddfe1eb78c
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.10-r6 b/metadata/md5-cache/media-video/wireplumber-0.4.10-r6
deleted file mode 100644
index b65fcad8dbca..000000000000
--- a/metadata/md5-cache/media-video/wireplumber-0.4.10-r6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Replacement for pipewire-media-session
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
-INHERIT=lua-single meson systemd
-IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
-REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.10/wireplumber-0.4.10.tar.gz
-_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bdfeedc5bd69e0b4c2c9495d9a459e89
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.11-r1 b/metadata/md5-cache/media-video/wireplumber-0.4.11-r1
deleted file mode 100644
index 9c440e446d7d..000000000000
--- a/metadata/md5-cache/media-video/wireplumber-0.4.11-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Replacement for pipewire-media-session
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
-INHERIT=lua-single meson systemd
-IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
-REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.11/wireplumber-0.4.11.tar.gz
-_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c93fcc7533977025409976031d5cdefa
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.11-r2 b/metadata/md5-cache/media-video/wireplumber-0.4.11-r2
index 3da4c10d92ac..bbb48ed176b6 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.11-r2
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.11-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
 INHERIT=lua-single meson systemd
 IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.11/wireplumber-0.4.11.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6c50567850138bfe0b9dc1d50861a622
+_md5_=916f35d16775dd0eef8832469c2590f7
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index c5f07ea70116..e67ad528c1fe 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/discord-bin-0.0.18 b/metadata/md5-cache/net-im/discord-bin-0.0.18
index b7cf8f8dda59..37ee4ef787d4 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.18
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.18
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip test
 SLOT=0
 SRC_URI=https://dl.discordapp.net/apps/linux/0.0.18/discord-0.0.18.tar.gz
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e1931bfa6b64e0769331fc851ea4f78c
diff --git a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.8.7 b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.8.7
index d4a29e3ab972..0ccff79b10dd 100644
--- a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.8.7
+++ b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.8.7
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/lib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/3.8.7/rocketchat-3.8.7-linux-x86_64.rpm
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1c901bc802803c9862ce713f4593b524
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.81.0.268 b/metadata/md5-cache/net-im/skypeforlinux-8.81.0.268
index 7179efe23a39..2b3439f2faa4 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.81.0.268
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.81.0.268
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.81.0.268-1.x86_64.rpm
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=df10f5cf2ada436ca9e6c96855121faf
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.82.0.403 b/metadata/md5-cache/net-im/skypeforlinux-8.82.0.403
index a5db334026ce..7491baa56791 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.82.0.403
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.82.0.403
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.82.0.403-1.x86_64.rpm
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=df10f5cf2ada436ca9e6c96855121faf
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.83.0.408 b/metadata/md5-cache/net-im/skypeforlinux-8.83.0.408
index 78ca35e8484e..8becfea17b48 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.83.0.408
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.83.0.408
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.83.0.408-1.x86_64.rpm
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=df10f5cf2ada436ca9e6c96855121faf
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.83.0.411 b/metadata/md5-cache/net-im/skypeforlinux-8.83.0.411
index 83e1bd3a3ccb..276e7a208e8d 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.83.0.411
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.83.0.411
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.83.0.411-1.x86_64.rpm
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=df10f5cf2ada436ca9e6c96855121faf
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.85.0.409 b/metadata/md5-cache/net-im/skypeforlinux-8.85.0.409
index 1e523a871667..ef628ca67e72 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.85.0.409
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.85.0.409
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.85.0.409-1.x86_64.rpm
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	pax-utils	91d47e5d20627c717aa878b9167c62a8	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=df10f5cf2ada436ca9e6c96855121faf
diff --git a/metadata/md5-cache/net-im/teams-1.4.00.13653-r2 b/metadata/md5-cache/net-im/teams-1.4.00.13653-r2
index 543457a64980..38b9fa80f7c0 100644
--- a/metadata/md5-cache/net-im/teams-1.4.00.13653-r2
+++ b/metadata/md5-cache/net-im/teams-1.4.00.13653-r2
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-core:2 app-accessibility/at-spi2-atk:2 app-cry
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.13653_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=703d09f27fba5d1dbaaac8faafd78014
diff --git a/metadata/md5-cache/net-im/teams-1.4.00.26453-r1 b/metadata/md5-cache/net-im/teams-1.4.00.26453-r1
index 5fd135a08761..e5b1f854a54f 100644
--- a/metadata/md5-cache/net-im/teams-1.4.00.26453-r1
+++ b/metadata/md5-cache/net-im/teams-1.4.00.26453-r1
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-core:2 app-accessibility/at-spi2-atk:2 app-cry
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.26453_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cd915724cd1767f1e6899cb9ef64870f
diff --git a/metadata/md5-cache/net-im/teams-1.4.00.7556-r1 b/metadata/md5-cache/net-im/teams-1.4.00.7556-r1
index 071b67891436..0798865ba5e4 100644
--- a/metadata/md5-cache/net-im/teams-1.4.00.7556-r1
+++ b/metadata/md5-cache/net-im/teams-1.4.00.7556-r1
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret dev-libs/atk dev-libs/
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.7556_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2d83ff65cabb27fecead03245620d41f
diff --git a/metadata/md5-cache/net-im/teams-1.5.00.10453 b/metadata/md5-cache/net-im/teams-1.5.00.10453
index a7780f056b6f..1a9a50614d3d 100644
--- a/metadata/md5-cache/net-im/teams-1.5.00.10453
+++ b/metadata/md5-cache/net-im/teams-1.5.00.10453
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-core:2 app-accessibility/at-spi2-atk:2 app-cry
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.5.00.10453_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=69501b23235a54f8526876647abc3fbe
diff --git a/metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1 b/metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1
index 32a45ae971ec..009f9207d98e 100644
--- a/metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1
+++ b/metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/at
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://lx-dynamics.com/wazzapp-0.4.2.x86_64.rpm
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4e00e31d6294fcda57493cd590f170bd
diff --git a/metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.2 b/metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.2
index 064dc37b18fb..2583048a4b57 100644
--- a/metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.2
+++ b/metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/lib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v0.5.2/whatsapp-desktop-x64.deb -> whatsapp-desktop-bin-amd64-0.5.2.deb ) x86? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v0.5.2/whatsapp-desktop-x32.deb -> whatsapp-desktop-bin-x86-0.5.2.deb )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bf63176473d2e21b1d4af5c5a5774662
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 01799b17d5fe..09d83a82047b 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.17.2-r1 b/metadata/md5-cache/sci-libs/scikit-image-0.17.2-r2
index 1d1cef628a49..2759af09fb4d 100644
--- a/metadata/md5-cache/sci-libs/scikit-image-0.17.2-r1
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.17.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-python/cython[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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[sparse,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Image processing routines for SciPy
 EAPI=7
 HOMEPAGE=https://scikit-image.org/
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 optfeature
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[sparse,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tifffile[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 )
+RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tifffile[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 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.17.2.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b18de1dbe2ad542775b5114c1ff3b21
+_md5_=b0d30234084fa6d9f92ef7ab01a69fe0
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.19.1 b/metadata/md5-cache/sci-libs/scikit-image-0.19.1-r1
index 967ff4a5a78a..9cc91f0ebf17 100644
--- a/metadata/md5-cache/sci-libs/scikit-image-0.19.1
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.19.1-r1
@@ -1,6 +1,6 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 ) 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(-)?]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 ) 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 postinst prepare test
-DEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Image processing routines for SciPy
 EAPI=8
 HOMEPAGE=https://scikit-image.org/
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[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 )
+RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[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 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.19.1.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_=a8151a2b52019ef9e2d7682213dcf4e2
+_md5_=e627bd82f1070b0822e8ae98f54ba8e3
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.19.2 b/metadata/md5-cache/sci-libs/scikit-image-0.19.2-r1
index 54b3e6414937..2d337156e3d8 100644
--- a/metadata/md5-cache/sci-libs/scikit-image-0.19.2
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.19.2-r1
@@ -1,6 +1,6 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 ) 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/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(-)?]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 ) 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/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 postinst prepare test
-DEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Image processing routines for SciPy
 EAPI=8
 HOMEPAGE=https://scikit-image.org/
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[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 )
+RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pywavelets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[sparse(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[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 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.19.2.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_=cf677edd5ae03440129c26601e57d4c1
+_md5_=479591b5e8fca01a08b5f88f7387d449
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 70019965168c..ade8c02f376e 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/gcc-10.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
index 52149e5e13f8..dbe639fe051a 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 0a8f3306864d..e91a3319e1c5 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 8dd6b84cc3a5..75492779aa8d 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	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	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 48742cba52a8..1855f7c1ffe6 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	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	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
index 8645099de1e7..68d895b44f77 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220728
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220728
@@ -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-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
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	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 53e059b84c1d..fffc44e462dc 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 b6d21a672692..d2f91550f007 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 e221a31d4d3a..bac70bc93f93 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 f5f03e00953e..e9e2d8c87156 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 e2fdc1c8cd60..4c6515dc67cf 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	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	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
index 3e4172e7afc2..30e8659c8ab8 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220729
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220729
@@ -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-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
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	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 9e7afb8e4f73..a580feb7b40d 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 c3ef242b2a8e..2fb0125a49a3 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	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	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 d2658a35c608..56dfd933bff2 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	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	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 e11d3d8aaa23..83a4763961f2 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	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=0d7a92302649bc2c9b79b7eef60af7b2
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220730 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220730
index 8f72d507e418..d92916d1c34d 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220730
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220730
@@ -12,5 +12,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-20220730/gcc-12-20220730.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	f8d82c5e65a3844cc47ca40004ff7204	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dfe2acdb296b1ba7a25aaa193e3eabb2	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=c1e9c94494ab4cc4b37d34cbb27b2bdf
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.9999 b/metadata/md5-cache/sys-devel/gcc-12.2.9999
index 6d3f3786441f..67c20ed57fc9 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 a5cb428298c9..5598c0dab1e9 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 88d917b1ffed..d5b881154d68 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 edf77c1345b8..f2a2bc137723 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 0ce793298ab7..1744681978f1 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 53c09f564a1a..6d0ce12f9a4e 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 a2396ad7a451..ab5a8e6ea562 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 251b89bbd828..2935b395746b 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 f7510f30970a..755c59e3e87b 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 2977c91fbc62..8c0bee29ab57 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 70d83dfc632b..98e16bda8cc3 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	f8d82c5e65a3844cc47ca40004ff7204	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	dfe2acdb296b1ba7a25aaa193e3eabb2	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 9821e6f4b2a6..7039e8b8c73e 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/genkernel-4.2.6-r2 b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r2
deleted file mode 100644
index 2d1f62c7cba1..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-INHERIT=bash-completion-r1 python-single-r1
-IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.6.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.tar.xz https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.43.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz -> libxcrypt-4.4.26.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.13.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f13426a1f521591b8ea3c4bfa926f1cd
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r3 b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r3
deleted file mode 100644
index e8622eefc860..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-INHERIT=bash-completion-r1 python-single-r1
-IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.6.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.tar.xz https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.43.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz -> libxcrypt-4.4.26.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.13.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1c346c974f986e5d3ba8cdecb891a7bf
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r4 b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r4
deleted file mode 100644
index 2e4b6ea01de9..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
-INHERIT=bash-completion-r1 python-single-r1
-IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.6.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.tar.xz https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.43.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz -> libxcrypt-4.4.26.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.13.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=db45f748a69cf76a28a3a6453ea22bcd
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5 b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r6
index 5c8627131c02..e0524643c0e0 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r6
@@ -6,9 +6,9 @@ INHERIT=bash-completion-r1 python-single-r1
 IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
-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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
+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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.6.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.tar.xz https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.43.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz -> libxcrypt-4.4.26.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.13.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> genkernel-4.2.6-s390x.patch
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a77e5dbc4584efd85ad1a28f56a09da
+_md5_=4e5f25624cf70ad3404a9dc015abac0f
diff --git a/metadata/md5-cache/sys-kernel/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index d9ea48fcd5ea..fb2c58b6ec47 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -8,9 +8,9 @@ INHERIT=bash-completion-r1 python-single-r1 git-r3
 IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
+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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.tar.xz https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.43.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz -> libxcrypt-4.4.26.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.13.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=43d68fd86c96abb405e224101087799f
+_md5_=e327d527407b3e73fb8e941aef6c99e5
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.18_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.18_p5
new file mode 100644
index 000000000000..9a00a3b86df5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.18_p5
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=8
+HOMEPAGE=https://codeberg.org/pf-kernel/linux/wiki/README https://dev.gentoo.org/~mpagano/genpatches/
+INHERIT=kernel-2 optfeature
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.18_p5
+SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v5.18-pf5.tar.gz -> linux-5.18-pf5.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.18-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.18-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.18/prjc_v5.18-r2.patch
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=730367cd963a172c5ffb615caabe6e59
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 16eb922132d4..e24430123b74 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-103.0.5060.114 b/metadata/md5-cache/www-client/chromium-103.0.5060.114
index 73c06576c4f9..fef83c573b37 100644
--- a/metadata/md5-cache/www-client/chromium-103.0.5060.114
+++ b/metadata/md5-cache/www-client/chromium-103.0.5060.114
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless ( || ( X wayland ) )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-103.0.5060.114.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-103-patchset-4/chromium-103-patchset-4.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a16636e240e45a85c4aa02d90e233f00
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4d29198c563a340f306b42cb991805e8
diff --git a/metadata/md5-cache/www-client/chromium-103.0.5060.134 b/metadata/md5-cache/www-client/chromium-103.0.5060.134
index 4c9209c34934..5f10556f03f6 100644
--- a/metadata/md5-cache/www-client/chromium-103.0.5060.134
+++ b/metadata/md5-cache/www-client/chromium-103.0.5060.134
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless ( || ( X wayland ) )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-103.0.5060.134.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-103-patchset-4/chromium-103-patchset-4.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ebf309aa55584f7414320c4967738e88
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=033241715b13c527d0dc0587ef69fa58
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5112.12 b/metadata/md5-cache/www-client/chromium-104.0.5112.12
index 172c63453c49..9ec5cdf054ca 100644
--- a/metadata/md5-cache/www-client/chromium-104.0.5112.12
+++ b/metadata/md5-cache/www-client/chromium-104.0.5112.12
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/dev
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5112.12.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dda5b0838508d4a409ea632762a70245
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=85fca3010184336cb5d335dc1078cf14
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5112.48 b/metadata/md5-cache/www-client/chromium-104.0.5112.48
index 7b0f357c173d..4b2b8593f4c4 100644
--- a/metadata/md5-cache/www-client/chromium-104.0.5112.48
+++ b/metadata/md5-cache/www-client/chromium-104.0.5112.48
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/beta
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5112.48.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3c106cd3ac4927d42c25d4ae1047708b
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5f3d055c264c60e6658092e323a0e816
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5112.57 b/metadata/md5-cache/www-client/chromium-104.0.5112.57
index d8613d376f1f..cb57e74be3a3 100644
--- a/metadata/md5-cache/www-client/chromium-104.0.5112.57
+++ b/metadata/md5-cache/www-client/chromium-104.0.5112.57
@@ -12,5 +12,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu]
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/beta
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5112.57.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3c106cd3ac4927d42c25d4ae1047708b
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5f3d055c264c60e6658092e323a0e816
diff --git a/metadata/md5-cache/www-client/chromium-bin-103.0.5060.53 b/metadata/md5-cache/www-client/chromium-bin-103.0.5060.53
index 6e1686aaf7b3..06c4845bd2f7 100644
--- a/metadata/md5-cache/www-client/chromium-bin-103.0.5060.53
+++ b/metadata/md5-cache/www-client/chromium-bin-103.0.5060.53
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/flac media-libs/fontconfig >=media-libs/freetype-2.11.0-r1 media-libs/libjpeg-turbo media-libs/libwebp media-libs/mesa[gbm(+)] media-libs/openh264:0/6.1 net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/pciutils >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 sys-libs/zlib[minizip] virtual/ttf-fonts virtual/udev x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X,wayland?] gui-libs/gtk:4[X,wayland?] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils amd64? ( widevine? ( www-plugins/chrome-binary-plugins ) ) wayland? ( dev-libs/wayland )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-common.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-l10n.tar.xz amd64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-common-x86_64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-wayland-x86_64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-x11-x86_64.tar.xz ) ) arm64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-common-aarch64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-wayland-aarch64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-x11-aarch64.tar.xz ) ) x86? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-common-i686.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-wayland-i686.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-103.0.5060.53-1-x11-i686.tar.xz ) )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ee7b63ef88175907800db0e42ac352aa
diff --git a/metadata/md5-cache/www-client/google-chrome-103.0.5060.134 b/metadata/md5-cache/www-client/google-chrome-103.0.5060.134
index da9a9218f3ce..82ddfe5c837e 100644
--- a/metadata/md5-cache/www-client/google-chrome-103.0.5060.134
+++ b/metadata/md5-cache/www-client/google-chrome-103.0.5060.134
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_103.0.5060.134-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=64c6f976207c71ee82412bd7fa5d276b
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-104.0.5112.57 b/metadata/md5-cache/www-client/google-chrome-beta-104.0.5112.57
index 5def60ad5023..1adb1b5381d8 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-104.0.5112.57
+++ b/metadata/md5-cache/www-client/google-chrome-beta-104.0.5112.57
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_104.0.5112.57-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d48be4d1b0cae1d9bf1bbfa4dc2a45c7
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-105.0.5176.3 b/metadata/md5-cache/www-client/google-chrome-unstable-105.0.5176.3
index 00fe7eb1b1b3..a3821077b76f 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-105.0.5176.3
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-105.0.5176.3
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_105.0.5176.3-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d48be4d1b0cae1d9bf1bbfa4dc2a45c7
diff --git a/metadata/md5-cache/www-client/microsoft-edge-103.0.1264.62 b/metadata/md5-cache/www-client/microsoft-edge-103.0.1264.62
index b6f5fc608bc6..c1e5f65b680b 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-103.0.1264.62
+++ b/metadata/md5-cache/www-client/microsoft-edge-103.0.1264.62
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_103.0.1264.62-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3301d61577802771b104ca2c26903a47
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.14 b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.14
index 5f62fb7248db..33fb5efac411 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.14
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.14
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.14-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.21 b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.21
index 815cae6c9828..a5b005856e17 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.21
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.21
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.21-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.25 b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.25
index 452437f08fc5..384765ca8ccb 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.25
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.25
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.25-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-104.0.1293.5 b/metadata/md5-cache/www-client/microsoft-edge-dev-104.0.1293.5
index 77487d27b101..466288a967f1 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-104.0.1293.5
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-104.0.1293.5
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_104.0.1293.5-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1300.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1300.1
index d819f5ba9129..11c02e6dc79f 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1300.1
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1300.1
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_105.0.1300.1-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1321.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1321.0
index 875b6ba88fa3..126596dc6e85 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1321.0
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1321.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_105.0.1321.0-1_amd64.deb
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/opera-89.0.4447.51 b/metadata/md5-cache/www-client/opera-89.0.4447.51
index 0370b8259e3b..f428410c8018 100644
--- a/metadata/md5-cache/www-client/opera-89.0.4447.51
+++ b/metadata/md5-cache/www-client/opera-89.0.4447.51
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera/desktop/89.0.4447.51/linux/opera-stable_89.0.4447.51_amd64.deb https://download2.operacdn.com/pub/opera/desktop/89.0.4447.51/linux/opera-stable_89.0.4447.51_amd64.deb https://download3.operacdn.com/pub/opera/desktop/89.0.4447.51/linux/opera-stable_89.0.4447.51_amd64.deb https://download4.operacdn.com/pub/opera/desktop/89.0.4447.51/linux/opera-stable_89.0.4447.51_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d926edef9a5598685c8c74a4685e8966
diff --git a/metadata/md5-cache/www-client/opera-beta-89.0.4447.33 b/metadata/md5-cache/www-client/opera-beta-89.0.4447.33
index 2b80ef093098..943adaacb820 100644
--- a/metadata/md5-cache/www-client/opera-beta-89.0.4447.33
+++ b/metadata/md5-cache/www-client/opera-beta-89.0.4447.33
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/89.0.4447.33/linux/opera-beta_89.0.4447.33_amd64.deb https://download2.operacdn.com/pub/opera-beta/89.0.4447.33/linux/opera-beta_89.0.4447.33_amd64.deb https://download3.operacdn.com/pub/opera-beta/89.0.4447.33/linux/opera-beta_89.0.4447.33_amd64.deb https://download4.operacdn.com/pub/opera-beta/89.0.4447.33/linux/opera-beta_89.0.4447.33_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3d354106d856a8fc7d7958ea47439b09
diff --git a/metadata/md5-cache/www-client/opera-beta-89.0.4447.37 b/metadata/md5-cache/www-client/opera-beta-89.0.4447.37
index d6d0a6a015a6..416d68a514a9 100644
--- a/metadata/md5-cache/www-client/opera-beta-89.0.4447.37
+++ b/metadata/md5-cache/www-client/opera-beta-89.0.4447.37
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/89.0.4447.37/linux/opera-beta_89.0.4447.37_amd64.deb https://download2.operacdn.com/pub/opera-beta/89.0.4447.37/linux/opera-beta_89.0.4447.37_amd64.deb https://download3.operacdn.com/pub/opera-beta/89.0.4447.37/linux/opera-beta_89.0.4447.37_amd64.deb https://download4.operacdn.com/pub/opera-beta/89.0.4447.37/linux/opera-beta_89.0.4447.37_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3d354106d856a8fc7d7958ea47439b09
diff --git a/metadata/md5-cache/www-client/opera-beta-90.0.4480.25 b/metadata/md5-cache/www-client/opera-beta-90.0.4480.25
index 39d4d27ef67b..17a73b58773d 100644
--- a/metadata/md5-cache/www-client/opera-beta-90.0.4480.25
+++ b/metadata/md5-cache/www-client/opera-beta-90.0.4480.25
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/90.0.4480.25/linux/opera-beta_90.0.4480.25_amd64.deb https://download2.operacdn.com/pub/opera-beta/90.0.4480.25/linux/opera-beta_90.0.4480.25_amd64.deb https://download3.operacdn.com/pub/opera-beta/90.0.4480.25/linux/opera-beta_90.0.4480.25_amd64.deb https://download4.operacdn.com/pub/opera-beta/90.0.4480.25/linux/opera-beta_90.0.4480.25_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ca6e138e4454ef1c5a06bb9e51e523f7
diff --git a/metadata/md5-cache/www-client/opera-developer-90.0.4470.0 b/metadata/md5-cache/www-client/opera-developer-90.0.4470.0
index 3b0ab80dbdfe..c50757cf24ed 100644
--- a/metadata/md5-cache/www-client/opera-developer-90.0.4470.0
+++ b/metadata/md5-cache/www-client/opera-developer-90.0.4470.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/90.0.4470.0/linux/opera-developer_90.0.4470.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/90.0.4470.0/linux/opera-developer_90.0.4470.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/90.0.4470.0/linux/opera-developer_90.0.4470.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/90.0.4470.0/linux/opera-developer_90.0.4470.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ca6e138e4454ef1c5a06bb9e51e523f7
diff --git a/metadata/md5-cache/www-client/opera-developer-90.0.4477.0 b/metadata/md5-cache/www-client/opera-developer-90.0.4477.0
index cb0512d1fba5..00f23eb1503f 100644
--- a/metadata/md5-cache/www-client/opera-developer-90.0.4477.0
+++ b/metadata/md5-cache/www-client/opera-developer-90.0.4477.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/90.0.4477.0/linux/opera-developer_90.0.4477.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/90.0.4477.0/linux/opera-developer_90.0.4477.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/90.0.4477.0/linux/opera-developer_90.0.4477.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/90.0.4477.0/linux/opera-developer_90.0.4477.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ca6e138e4454ef1c5a06bb9e51e523f7
diff --git a/metadata/md5-cache/www-client/opera-developer-91.0.4484.0 b/metadata/md5-cache/www-client/opera-developer-91.0.4484.0
index 8e2e20439f8b..933b54990fde 100644
--- a/metadata/md5-cache/www-client/opera-developer-91.0.4484.0
+++ b/metadata/md5-cache/www-client/opera-developer-91.0.4484.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/91.0.4484.0/linux/opera-developer_91.0.4484.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/91.0.4484.0/linux/opera-developer_91.0.4484.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/91.0.4484.0/linux/opera-developer_91.0.4484.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/91.0.4484.0/linux/opera-developer_91.0.4484.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ca6e138e4454ef1c5a06bb9e51e523f7
diff --git a/metadata/md5-cache/www-client/vivaldi-5.3.2679.68 b/metadata/md5-cache/www-client/vivaldi-5.3.2679.68
index f1e91e1e2341..d33ca9fabf9d 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.3.2679.68
+++ b/metadata/md5-cache/www-client/vivaldi-5.3.2679.68
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.68-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.68-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.68-1_arm64.deb )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ed712b79f613228d67574e054165cf53
diff --git a/metadata/md5-cache/www-client/vivaldi-5.3.2679.70 b/metadata/md5-cache/www-client/vivaldi-5.3.2679.70
index bae4b76a1068..c6ba7ba1c03c 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.3.2679.70
+++ b/metadata/md5-cache/www-client/vivaldi-5.3.2679.70
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.70-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.70-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.70-1_arm64.deb )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2737.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2737.3
index 53701e943922..2c508fa47654 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2737.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2737.3
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2737.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2737.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2737.3-1_arm64.deb )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2741.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2741.3
index 22290780cf25..bb9f4ccffe28 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2741.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2741.3
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2741.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2741.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2741.3-1_arm64.deb )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 6ff2f19de39b..0ac95a1eb2b9 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/xmobar-0.37 b/metadata/md5-cache/x11-misc/xmobar-0.37
deleted file mode 100644
index 596d3c930fe4..000000000000
--- a/metadata/md5-cache/x11-misc/xmobar-0.37
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) !wifi? ( iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] net-wireless/wireless-tools ) ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A Minimalistic Text Based Status Bar
-EAPI=7
-HOMEPAGE=https://xmobar.org
-INHERIT=haskell-cabal
-IUSE=alsa dbus inotify iwlib mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) !wifi? ( iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] net-wireless/wireless-tools ) ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/0.37
-SRC_URI=https://hackage.haskell.org/package/xmobar-0.37/xmobar-0.37.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_=b9d53e42c7522e0aede8a43364189fa7
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.44.1 b/metadata/md5-cache/x11-misc/xmobar-0.44.1
new file mode 100644
index 000000000000..b3ea58475e3d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xmobar-0.44.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-1.4.7.1:=[profile?] dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Minimalistic Text Based Status Bar
+EAPI=8
+HOMEPAGE=https://codeberg.org/xmobar/xmobar
+INHERIT=haskell-cabal
+IUSE=alsa dbus mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.4.7.1:=[profile?] dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/0.44.1
+SRC_URI=https://hackage.haskell.org/package/xmobar-0.44.1/xmobar-0.44.1.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8edab0cceb2ba48f3e8ae65bdf2de40c
diff --git a/metadata/news/2022-07-29-pipewire-sound-server/2022-07-29-pipewire-sound-server.en.txt b/metadata/news/2022-07-29-pipewire-sound-server/2022-07-29-pipewire-sound-server.en.txt
index 0cb4a2d73ddf..31283c0b1bd1 100644
--- a/metadata/news/2022-07-29-pipewire-sound-server/2022-07-29-pipewire-sound-server.en.txt
+++ b/metadata/news/2022-07-29-pipewire-sound-server/2022-07-29-pipewire-sound-server.en.txt
@@ -46,8 +46,9 @@ There are several options available:
   Deselect media-sound/pulseaudio-daemon:
   # emerge --deselect media-sound/pulseaudio-daemon
 
-  Then perform a world upgrade:
-  # emerge --ask --update --changed-use --deep @world
+  Then perform a world upgrade with PipeWire on the command line to add
+  it to the world file:
+  # emerge --ask --update --changed-use --deep @world media-video/pipewire
 
   Then depclean:
   # emerge --ask --depclean
@@ -59,6 +60,24 @@ There are several options available:
   files will need to run `gentoo-pipewire-launcher &` in e.g.
   `~/.xprofile`.
 
+  Users who want to switch to PipeWire providing a PulseAudio daemon
+  may need to `emerge --deselect` packages in their world file which
+  hard-require media-sound/pulseaudio-daemon. There are only a handful
+  of these. A non-exhaustive list:
+  * media-sound/paprefs
+  * media-sound/pasystray
+  * media-sound/pulseaudio-modules-bt (shouldn't be needed anyway)
+  * net-misc/pulseaudio-dlna
+
+  If not using any of those packages anymore, please emerge --deselect
+  them. If still using these, PipeWire as a PulseAudio is not an
+  option at this time.
+
+  (Note that media-libs/libpulse (which PipeWire will be using, don't emerge
+  libpulse manually) provides 'pactl' which can be used as a replacement for
+  e.g. media-sound/pulseaudio-ctl, so personal scripts can be adapted to this
+  if desired.)
+
   systemd users will also need to run the following commands:
   $ systemctl --user --now disable pulseaudio.service pulseaudio.socket
   $ systemctl --user --now enable pipewire.socket pipewire-pulse.socket
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ec4d28149719..3b4d9ffa7c28 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14055 BLAKE2B cc8989d376b82bcdb8980643cfd55acab354a49641b1b95506a263a9406db16da70c2af5a10755e35d180167a8123cedb0da0411496add38143d06cd2295da30 SHA512 4c08ccde16f1dafbb970968ef0ea2bc4a0d1775c0b6a687dc12042e322b948a5c4a0b48efd1d01d039c0971c8836c30c44f1f4fad1679d7fa254072281c88eff
-TIMESTAMP 2022-07-31T00:39:44Z
+MANIFEST Manifest.files.gz 14056 BLAKE2B 384ab1fa4a7f7fa60fa28f388fbf17530d39a6a06420e8f2936adf788e39eff3c93c062d5abaeeace41227318964140accd449e95c6b1abd99c33790b571a5b3 SHA512 8d70434ca6fc690e5e14608a138b2f6fb2a9f2975dd32475ff2d0054cfb0c075931ec146e77d9d54dd1c6888e2f888a3336c54a7e220c35ae2be9f9ad9b47b52
+TIMESTAMP 2022-07-31T06:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLlz1BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLmI7NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAaXg/+OT9M/Rk0DgJjigCwYQSgZObhg3bblWbqn4kqhJQ12iuPOF5lZ01WwWEV
-XlQYUvDu/c9KddM+FOkXaXdC4LrDf4N2Xv6QQQnTdCKEMHl3UsNXpmCmuDj/1F6j
-EAJGAX7UFy2bX2jqzgzKqjWX/OTfzs5/4yWFfXMcYWEFV2tYDv3FOkTzbMjT1IlB
-iL6fFc4ivcz+rRIx0Sjnh4f2rkKWBJuF8AkhbJA2RimMA0+bbKZsSi5uNO2G+6sU
-1rl3VVNbyddqCeTE9WMl0pCf4eLKsvpwzTfFw2cCLOiHw9Kt7kYzUPklpLT5I00c
-rRsFZT/dNNq14LMSQVWbPpWfz1Ceh3FzKRqBud4h9elwl6gLRbaoj2mr4p7ITq2N
-cE2cIKutGbdG8I737mFs2i8wWjAOXTr3/OQjkgLeeIQ0MaV/hefD4hCnguNIo+sP
-6qMYioMPWUCZVSZ2UDzMYACarC8pkDkqLyAliGg5NExCsUc9TZsotOVz/2Z/Yzhp
-IvCoxOs9i5oN2RMC4WzTNKH/qWnmNrDIlA5zayDWlq23y5LN9ltOigDGLp1hgbFr
-s3kEAlJ4ISa8n5FqJPFNk4rTqlKTCYiXR+Af8rAtP2/DmS4M8UQgQ5+Jm4uIbhy8
-33tYRfD7KfXqJKVAki3ELKZiC9LPFOG8QTlulV5QWHQLP0JRu0c=
-=FqEV
+klDB5hAAr0xdvfVzADsCZCks0JLbfeJxxZZu9bteowiyZH7J8xSOQ95DoRXQDvLs
+se3E+7kuPYetINWuw1Kwh7euwWl5Vh7UYR12T4nDKryelYZHt7ZvwuXW4e01gbw9
+fHyq6NZpObXwW5bb2C2Joy5H0/qqWVk299kohArPf/BKd3dTZaYnr39p8eIwO38r
+jSx2CS690HwjIbVqeG6dUTXBFkNCKwugbz3x0NPS14iS4+TMriOfd1D5gYBerAsM
+E9YnkYjblX2wBweWwvpnSG461jSmOBjH3IIrd1mMUgsWmaSt15kNe0buH8tjayZX
+SqS8LaVroJCQEHkRr1/P+kIo7co+dKITUj5lxqLthTO+N+BwotsKxmuuhJYfHwBJ
+Uiis7Rbt63HP5NBUaQ+/vu9HA2Sky344bb7sbh+0wPUi5+VrWjmRSsrxReKBLdiK
+dG0oThlzx1lBsvQiK6lphkI4gDHHouoDZ8J+SbdhJtFBOm9qC0f3jSB3/lFiW65Z
+euk+ZXP61cBZxL73SXPHSuOXRVG6u434+onm0I/yJd8eS0PIB7viATIVX7LnV4ka
+TAR1Eg3TgTeS6gIlkKbjz4kVFeGuQg8GWfP3dD4b274upl+uhdt3cUa+hG/z2WUx
+zp82eweGyAcTDA351z6epgF+fcxMzFWkQcyt/TPgx9a/3zlaAQw=
+=IXqW
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 5842e1145792..f6ba11d85aa1 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c55e8fb12303..c680ec9295a6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 31 Jul 2022 00:39:40 +0000
+Sun, 31 Jul 2022 06:39:41 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index b5c37d17557d..330bc926f7b5 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-1d217ffd5deca9d20b61acd2a7832272d036a0e0 1659059087 2022-07-29T01:44:47+00:00
+fbf0d8c39742d6bcedb75f94b9c94216f57ce888 1659237838 2022-07-31T03:23:58+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 22a0a05b89f6..30cff670d08c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jul 31 12:39:40 AM UTC 2022
+Sun Jul 31 06:39:40 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c6378914c8a2..89c2dbe33650 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 31 Jul 2022 00:45:01 +0000
+Sun, 31 Jul 2022 06:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 61c9747cabdf..5dedba2176d8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8a8c47ca0010a6a68b81d17328d117338eb015a5 1659224769 2022-07-30T23:46:09+00:00
+ed582fd4610e4cf1b5249d7e4a6127873e601bf4 1659248995 2022-07-31T06:29:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f7afa896d3ad..afe597213a45 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659228001 Sun 31 Jul 2022 12:40:01 AM UTC
+1659249601 Sun 31 Jul 2022 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c55e8fb12303..b069e4564d99 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 31 Jul 2022 00:39:40 +0000
+Sun, 31 Jul 2022 06:39:40 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8df487a3e555..96b089b0d425 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ab141cbf72dc..f6029679ef08 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1523,13 +1523,7 @@ dev-haskell/json:pretty - Add support for using pretty printing combinators
 dev-haskell/language-dot:executable - Build the `ppdot' executable
 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.
 dev-haskell/lpeg:rely-on-shared-lpeg-library - Do not build lpeg from source, but trust that lpeg is made available in other ways, e.g., through a system-wide installation. The loader will be replaced with a placeholder function that only emits a message.
-dev-haskell/lua:allow-unsafe-gc - Allow optimizations which make Lua's garbage collection potentially unsafe; enabling this should be safe if there are no callbacks into Haskell during Lua garbage collection cycles. The flag should be *disabled* if Lua objects can have Haskell finalizers, i.e., @__gc@ metamethods that call Haskell function.
-dev-haskell/lua:apicheck - Compile Lua with -DLUA_USE_APICHECK.
-dev-haskell/lua:export-dynamic - Add all symbols to dynamic symbol table; disabling this will make it possible to create fully static binaries, but renders loading of dynamic C libraries impossible.
-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/mod:semirings - Derive semiring instances
 dev-haskell/monad-logger:template-haskell - Enable Template Haskell support.
@@ -1537,7 +1531,6 @@ dev-haskell/monad-par:chaselev - Use Chase-Lev Deques for higher-perf work-steal
 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
@@ -1572,7 +1565,6 @@ dev-haskell/quickcheck-classes:vector - Enable the use of the `vector` package.
 dev-haskell/quickcheck-classes-base:binary-laws - Include infrastructure for testing class laws of binary type constructors. Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported configuration.
 dev-haskell/quickcheck-classes-base:unary-laws - Include infrastructure for testing class laws of unary type constructors.
 dev-haskell/recaptcha:network-uri - Get Network.URI from the network-uri package.
-dev-haskell/rfc5051:mkunicodedata - build codes generator itself
 dev-haskell/sandi:conduit - Build with conduit
 dev-haskell/semigroupoid-extras:profunctors - You can disable the use of the `profunctors` package using `-f-profunctors`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/semigroupoids:comonad - You can disable the use of the `comonad` package using `-f-comonad`. 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 `Comonad`
@@ -1595,7 +1587,6 @@ dev-haskell/snap-server:openssl - Enable https support using the HsOpenSSL libra
 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:server - Compile webserver.
@@ -1626,11 +1617,8 @@ dev-haskell/wai-app-static:print - print debug info.
 dev-haskell/warp:allow-sendfilefd - Allow use of sendfileFd (not available on GNU/kFreeBSD)
 dev-haskell/warp:x509 - Adds a dependency on the x509 library to enable getting TLS client certificates.
 dev-haskell/wcwidth:cli - Enable command line tool
-dev-haskell/wreq:aws - Enable AWS tests
-dev-haskell/wreq:httpbin - Install client
 dev-haskell/yaml:examples - Install the haskell-yaml-examples executable
 dev-haskell/yaml:executable - Install the yaml2json and json2yaml executables
-dev-haskell/yesod-auth:network-uri - Get Network.URI from the network-uri package
 dev-haskell/yesod-form:network-uri - Get Network.URI from the network-uri package
 dev-haskell/zip-archive:executable - Build the Zip executable.
 dev-haskell/zlib:bundled-c-zlib - Use the bundled zlib C sources. Requires pkg-config to be False. For windows, this is the default.
@@ -4698,27 +4686,9 @@ media-sound/pragha:rygel - Share music on DLNA using net-misc/rygel
 media-sound/pragha:soup - Search metadata on AcoustID and radios on TuneIn using net-libs/libsoup
 media-sound/puddletag:acoustid - Use media-libs/chromaprint for acoustic fingerprinting
 media-sound/puddletag:quodlibet - Enables support for editing media-sound/quodlibet databases
-media-sound/pulseaudio:X - Build the X11 publish module to export PulseAudio information through X11 protocol for clients to make use. Don't enable this flag if you want to use a system wide instance. If unsure, enable this flag.
-media-sound/pulseaudio:alsa-plugin - Request installing media-plugins/alsa-plugins with PulseAudio plugin enabled. This ensures that clients supporting ALSA only will use PulseAudio.
-media-sound/pulseaudio:aptx - aptX (HD) over Bluetooth (many Android compatible headphones), requires media-plugins/gst-plugins-openaptx.
-media-sound/pulseaudio:asyncns - Use libasyncns for asynchronous name resolution.
 media-sound/pulseaudio:daemon - Build the pulseaudio binary (not-needed for pipewire-pulse)
-media-sound/pulseaudio:doc - Build the doxygen-described API documentation.
-media-sound/pulseaudio:elogind - Use sys-auth/elogind for giving each session a PA client
-media-sound/pulseaudio:equalizer - Enable the equalizer module (requires sci-libs/fftw).
-media-sound/pulseaudio:gconf - Ensure gnome-base/gconf is present for pulseaudio GConf to GSettings module automatic migration (keeping the user configuration)
-media-sound/pulseaudio:gdbm - Use sys-libs/gdbm to store PulseAudio databases. Recommended for desktop usage. This flag causes the whole package to be licensed under GPL-2 or later.
 media-sound/pulseaudio:glib - Add support to dev-libs/glib-based mainloop for the libpulse client library, to allow using libpulse on glib-based programs. Build the GSettings PA module.
-media-sound/pulseaudio:gstreamer - Build with support for gstreamer including ability to use bluetooth codecs. For bluetooth codecs see USE ldac and aptx.
-media-sound/pulseaudio:ldac - LDAC over Bluetooth (primarily Sony headphones), requires media-plugins/gst-plugins-ldac.
-media-sound/pulseaudio:native-headset - Build with native HSP backend for bluez 5.
 media-sound/pulseaudio:ofono-headset - Build with oFono HFP backend for bluez 5, requires net-misc/ofono.
-media-sound/pulseaudio:oss - Enable OSS sink/source (output/input). Deprecated, upstream does not support this on systems where other sink/source systems are available (i.e.: Linux). The padsp wrapper is now always build if the system supports OSS at all.
-media-sound/pulseaudio:realtime - Makes PulseAudio use RealtimeKit (sys-auth/rtkit) to get real-time priority while running.
-media-sound/pulseaudio:ssl - Use dev-libs/openssl to provide support for RAOP (AirPort) streaming.
-media-sound/pulseaudio:system-wide - Allow preparation and installation of the system-wide init script for PulseAudio. Since this support is only supported for embedded situations, do not enable without reading the upstream instructions at https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
-media-sound/pulseaudio:systemd - Build with sys-apps/systemd support to replace standalone ConsoleKit.
-media-sound/pulseaudio:webrtc-aec - Uses the webrtc.org AudioProcessing library for enhancing VoIP calls greatly in applications that support it by performing acoustic echo cancellation, analog gain control, noise suppression and other processing.
 media-sound/pulseaudio-daemon:X - Build the X11 publish module to export PulseAudio information through X11 protocol for clients to make use. Don't enable this flag if you want to use a system wide instance. If unsure, enable this flag.
 media-sound/pulseaudio-daemon:alsa-plugin - Request installing media-plugins/alsa-plugins with PulseAudio plugin enabled. This ensures that clients supporting ALSA only will use PulseAudio.
 media-sound/pulseaudio-daemon:aptx - aptX (HD) over Bluetooth (many Android compatible headphones), requires media-plugins/gst-plugins-openaptx.
@@ -8911,19 +8881,17 @@ x11-misc/xkbd:xrandr - Enable XRandR support through x11-libs/libXrandr
 x11-misc/xkbset:tk - Install the dev-perl/Tk based xkbset-gui utility
 x11-misc/xlockmore:vtlock - Enables support for virtual terminal locking
 x11-misc/xlockmore:xlockrc - Enables xlockrc for people without PAM
-x11-misc/xmobar:alsa - Use alsa-mixer to get the volume from soundcards
-x11-misc/xmobar:dbus - Publish a service on the session bus for controlling xmobar
-x11-misc/xmobar:inotify - inotify support (modern Linux only). Required for the Mail and MBox plugins
-x11-misc/xmobar:iwlib - Wireless info support via Wext ioctls (deprecated)
-x11-misc/xmobar:mpd - Support mpd plugin
-x11-misc/xmobar:mpris - Enables MPRIS v1, v2 support
-x11-misc/xmobar:rtsopts - Reduce process wakekups frequency to decrease CPU usage
-x11-misc/xmobar:timezone - Enables localized date support
-x11-misc/xmobar:uvmeter - Plugin to show UV data for Australia
-x11-misc/xmobar:weather - Enable weather plugin
-x11-misc/xmobar:wifi - Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux
-x11-misc/xmobar:xft - Use Xft to render text. UTF-8 support included
-x11-misc/xmobar:xpm - Enable usage of xpm for icons
+x11-misc/xmobar:alsa - Use alsa-mixer to get the volume from soundcards.
+x11-misc/xmobar:dbus - Publish a service on the session bus for controlling xmobar.
+x11-misc/xmobar:mpd - MPD support. Needs libmpd installed.
+x11-misc/xmobar:mpris - MPRIS v1, v2 support.
+x11-misc/xmobar:rtsopts - Use -with-rtsopts=-V0 to reduce wakeups.
+x11-misc/xmobar:timezone - Enables localized date support.
+x11-misc/xmobar:uvmeter - UVMeter only useful to australians.
+x11-misc/xmobar:weather - Enable weather plugin.
+x11-misc/xmobar:wifi - Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux, the kernel.
+x11-misc/xmobar:xft - Use Xft to render text. UTF-8 support included.
+x11-misc/xmobar:xpm - Enable usage of xpm for icons.
 x11-misc/xscreensaver:fonts - Install the fonts shipped with XScreenSaver that have clear licensing
 x11-misc/xscreensaver:gdk-pixbuf - Include support for the x11-libs/gdk-pixbuf library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well
 x11-misc/xscreensaver:gdm - Use gdmflexiserver from gnome-base/gdm instead of x11-misc/lightdm
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0ca3951cfd4c..c65fb48905f5 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index 173fa0473095..6c66d2b08e25 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1,7 +1,7 @@
 DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e
 DIST scikit-image-0.19.1.tar.gz 22225936 BLAKE2B 86aca2f120c12178d64fd62bce2b5272fc6df345789ed4b1ddee705384e583c7070af7bf885d47ae6769bbfb0676bfeef7fc431abfb10e1618594f31a27a7de8 SHA512 d7ccd4172abc07843a17a2de40240790cbeeb4177c7948cbf74663363ec9cecd3e40e70a245795d88ace57699e178f159198862b4c503fcb3fff95e8ef8f4ed9
 DIST scikit-image-0.19.2.tar.gz 22231106 BLAKE2B b99aa3e70ef01bb8964ed1ec98d14feea87bdef61a9d8590298391f7ead95ba89b287a07e2688e4fa0173ce97c43127c7b0d4b5356ca9d5ea9c2ed596ce99a3a SHA512 366d3e88842fab4febc4bd7dedf8a18a930a36437ea34e8cbe41c6bcfd3d5f59d496856b1a8d3a2f7fc1117563c162209677f2c5776066acc51783aab164db10
-EBUILD scikit-image-0.17.2-r1.ebuild 1187 BLAKE2B cfe9fdb911ede840f3fd4876aeef4281d840ebef24fa9adb88baf6440ebb3dc35a1f10b6c0b6d262ec698df28587103ad1f34cf5ffb387099027531e114bc161 SHA512 9a89cf779e7e244da72abad09c49183fb0038528fe1a80ab1f5a8e3a4442590e7d5cd74c7c350cc0dee64b1b06100269d8dcaec05b8add707698307d70f218f6
-EBUILD scikit-image-0.19.1.ebuild 1435 BLAKE2B 85af932ca4a4526ecf275cbaf21f9573ba3770102217460541a98fe70debb419d1beb2e3059542ce299df1357f7920d680878dbea12ebb17aeb996a070561046 SHA512 e87935c2c74f41a9a709e5a49d7a3ecffc65f5f1d32a35158565c0f913fce0d5a49ded8a38f756ba4013cb818a1453f8ecf4e5ae63fa0241eb8461edcbf73929
-EBUILD scikit-image-0.19.2.ebuild 1634 BLAKE2B dea9f5fd336cc9bc597e6035f243351676def90fb47adcadb118dac22bd4bd8b3f62651653809b516ece9f718d535ad17f6403eff12855994da4d1c47092fcf4 SHA512 cad2e0e886ab4a5e6b8409e0c5090e5c597df6a2bbce8ec4481f725f27164325df316e0ae6f2282fd4559c07ddd597e81da80bfce87e54d49edb0f561ac25232
+EBUILD scikit-image-0.17.2-r2.ebuild 1190 BLAKE2B bd547b16a54f47a427abf98f3889f2107845096933943344f75e891a7d99aa6793095a737df712347f8ac9ed2b608848b92fcf4d32c30f79ecb6c4059c9496e6 SHA512 8014e83b3886a8e1eb8cea4619c0fba915cfc25059c48cfb3d7de575ff5e8c29a6f082b91f970c87bd057c703ce9c336a438d3d85de07a4714d737cf53e85f8f
+EBUILD scikit-image-0.19.1-r1.ebuild 1438 BLAKE2B 947b537c720abbb59f27add33cc4e606e4f5c952668dd6fe66a1fe95f6355ebaf1d95668d3a93ecf0a322c60365cafe8a70d73fe995a109b5af5bdc8605694e3 SHA512 5d8132437fd683f38a0f94cdbb282752ad02c60e6cee2c63b3c788123318707c82e02845a10bf0de8b0f4826bb53c141d28b587773ddfa1830582735221af661
+EBUILD scikit-image-0.19.2-r1.ebuild 1637 BLAKE2B d7ecf954d87a6d1434aa3d249342da3661897cfb1e2918e30a1f9da54a6ce8015d753f6821e612a7f699b792a2a4a99ed9827af11d65fecca8cc2f8de0092273 SHA512 3e75dfdc71edce96fb312440ae986b97b85363c999164cf0bc85bc37a3e7a221b8e1fa7eff705702f0b7b3116bb42249c7ad660026d5b2b109c8e130272844d2
 MISC metadata.xml 695 BLAKE2B 11487b964bde2ce1a39a8680bc3cc62045c4a7e2e17844de830d5f0e043660c431cd002a2a0fc19acb4c0262289ee280195475dd1f8b35f6a51ce0df369871f8 SHA512 fca83587d443373fc7219911900105676bdba5a7ced07ac00a9ab5cbe361d8ca1175b02b04fa53cdbde6f198a986b21f989baf32139cd76b7d1b2b78034d3142
diff --git a/sci-libs/scikit-image/scikit-image-0.17.2-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.17.2-r2.ebuild
index 762e9a629aac..0823ec7e3843 100644
--- a/sci-libs/scikit-image/scikit-image-0.17.2-r1.ebuild
+++ b/sci-libs/scikit-image/scikit-image-0.17.2-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=7
@@ -20,7 +20,7 @@ RDEPEND="dev-python/imageio[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/scipy[sparse,${PYTHON_USEDEP}]
+	dev-python/scipy[sparse(+),${PYTHON_USEDEP}]
 	dev-python/tifffile[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/sci-libs/scikit-image/scikit-image-0.19.1.ebuild b/sci-libs/scikit-image/scikit-image-0.19.1-r1.ebuild
index 2ed329d762d2..34c089266bee 100644
--- a/sci-libs/scikit-image/scikit-image-0.19.1.ebuild
+++ b/sci-libs/scikit-image/scikit-image-0.19.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
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/scipy[sparse,${PYTHON_USEDEP}]
+	dev-python/scipy[sparse(+),${PYTHON_USEDEP}]
 	dev-python/tifffile[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/scikit-image/scikit-image-0.19.2.ebuild b/sci-libs/scikit-image/scikit-image-0.19.2-r1.ebuild
index ab2d264aa8f2..870f5cb3d753 100644
--- a/sci-libs/scikit-image/scikit-image-0.19.2.ebuild
+++ b/sci-libs/scikit-image/scikit-image-0.19.2-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/scipy[sparse,${PYTHON_USEDEP}]
+	dev-python/scipy[sparse(+),${PYTHON_USEDEP}]
 	dev-python/tifffile[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index ebe80bcac066..28a686959eda 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index a07fe42d9394..da3b743d9ffd 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -72,9 +72,6 @@ DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
 EBUILD genkernel-4.0.10.ebuild 9583 BLAKE2B eb8f46374b3dd8a2f51db002e666ce64b32acc63f8c02a3ffe4ea85c3129bb19c904624382758e97662979b0eddddf0b0ebfdd8d3df66420cef569ccc92fd946 SHA512 1f24bee85516973b5652fe9ac354445504fdd82edf75683dfdc38559cd68048c87c9635af7047286575ff9cb95f69b4f7bc02fc49d9fe29e6a7199c76086a3c7
 EBUILD genkernel-4.2.5.ebuild 11468 BLAKE2B 44a9a5e824574e14f036b2964b325367f3abbbe904098ba35b98b4717c7e285366595863a1282d05a36c7f4bdc61f40b0bb6e052372f72c6a4a7b12575f1ece7 SHA512 8a0c4c90e7d132cd338465f7557ab34ceeb2649dc54e23876c90e396e3e3c2fa4c5d178234ede1057a143e116989552279996a14792463800612cd6a72a18c08
-EBUILD genkernel-4.2.6-r2.ebuild 11619 BLAKE2B 4eaed74c7fc68d45137723f604ad97b2591a114bfe48064be4400ecf88224e15f2de97465275177e8df2ceedf37df6fcede6c6f6b77b997c101a48533200b413 SHA512 105524dd26614ffa33ed38cf5a45350d5fb3b22b9fcf84ba92840af0c7a85ef71b9bc8ffe29bdbb28e583a32de40f5d7768d8ac28155d51473afb56740b1042c
-EBUILD genkernel-4.2.6-r3.ebuild 11667 BLAKE2B 8970c3817c942a224ba67b01fc34d99ff1b22f32939d58bb87d8f6451a4c7b4a33b9170996702fede6c5609fc862ef3ba6d39ba006d1261442eb30967d926c29 SHA512 cb2addc25a0bb808b0edabdb0f3d3b43f947e54b8d3843e7b90259e74311b3875b83e11a26f8372494f28acf1aa2dcd563f9b13cccdecec466bfbed161a8cbb8
-EBUILD genkernel-4.2.6-r4.ebuild 11711 BLAKE2B c3a54d2354ce25e8787dd50dd46f973294c590686c79d691b62b9a47dcc09be6ca1ab9b643e0e0c5bb2b11e1c4e6124e38402b5869ae8eb11511816204401109 SHA512 593e8c5d5b5b69aefdce8a6db91c7b5cdb90828014985c8cf235936d5d5bfa9ac4e40460e3fabb6772183494b2059748d32f12af19fa9c8ecfcf3ec7e349448a
-EBUILD genkernel-4.2.6-r5.ebuild 11901 BLAKE2B b45f0d525dcacfb1e56eac3ce8471b838d6287e8379d55c6d8074089ac37beed39fd88b28793bb89eb8333077d57fddef63f4dde5d7fd3a212567488f4fa6d3f SHA512 9e896569b26b3e1fb8fce99b41106bf221bb63120d8dd4c710508cc7b839e382d333e6dc2811f5d82796939e4c6a1cbe388c5755e2c2a312fa2bcf1e0ec8a827
-EBUILD genkernel-9999.ebuild 11679 BLAKE2B 7fa6e85abbf9872158f186c1d1d849f1eadb37697c3d27dc9c12d74e48e0781dd587f8a75e21b2f45b0f7a5c137274e34aea16b7bffc60284d8c4adf303c28d1 SHA512 68614f253f0b5c852f720bfc095235625445979719a4d71b5b638768a98ee5e6dee12f75115d045104045e05af7f56b495fba4e8acaaf30d39551755f7482a33
+EBUILD genkernel-4.2.6-r6.ebuild 11948 BLAKE2B 5c2281ee1a0caeea8950ff16d573b95e2590bcc1a5c866c65126ea34880c24d704bcf2eecc3855f04b151283094357d958117574eee515088c31b5d2ee7b0bf5 SHA512 93e7b2018151c954130e9fd89e34c488f9c65131c283bf62d062f86d6a8e6b2e533dba092f347a39249e20215becd8736dfc18d285482db2d789468eb8051f2a
+EBUILD genkernel-9999.ebuild 11726 BLAKE2B 4cef124c5b87c6908482f4ab2277cdbb8cac5f8d05a59d6059336166a48ee8a4c6d9ee7af08bda0d0eebe1faf384b2830a044b838ba742c7fd539f86e29a5db2 SHA512 be55599bb6a61bf5e5938c9f61003d5f52e2f42e3eb7b9dd1dd756d914dd54d39aacda37d6f3a281c1096f1d9ccd72c9def17decc71cb119eae8570811e061e5
 MISC metadata.xml 473 BLAKE2B 7d2bf14ca0bd4ba5bf05d0ac1529c0c8eae3655a4f52eba56ddb6865e8a44978366b3abad6f334c99b5ad30332113761ea0b7afd76a9eb274c536a7c23aa3983 SHA512 49c916ec4e0690ba17dbaf363acacf3cfaa69f180e0d48644eb742875c55cb409f51123f1e055ecfcffda0f18604208cc61fd2372c2b1aaa6d949dec9edc80a5
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
deleted file mode 100644
index c84a9987b7c4..000000000000
--- a/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit bash-completion-r1 python-single-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.76.0"
-VERSION_BTRFS_PROGS="5.15"
-VERSION_BUSYBOX="1.34.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.4.1"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.4.1"
-VERSION_E2FSPROGS="1.46.4"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20210613"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="29"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.4"
-VERSION_LIBGPGERROR="1.43"
-VERSION_LIBXCRYPT="4.4.26"
-VERSION_LVM="2.02.188"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.14"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.37.2"
-VERSION_XFSPROGS="5.13.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.5.0"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
-	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-	fperms +x /usr/share/genkernel/path_expander.py
-
-	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} -gt 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild
deleted file mode 100644
index 2259c81ff64a..000000000000
--- a/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit bash-completion-r1 python-single-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.76.0"
-VERSION_BTRFS_PROGS="5.15"
-VERSION_BUSYBOX="1.34.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.4.1"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.4.1"
-VERSION_E2FSPROGS="1.46.4"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20210613"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="29"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.4"
-VERSION_LIBGPGERROR="1.43"
-VERSION_LIBXCRYPT="4.4.26"
-VERSION_LVM="2.02.188"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.14"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.37.2"
-VERSION_XFSPROGS="5.13.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.5.0"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-devicemanager.patch
-	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
-	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-	fperms +x /usr/share/genkernel/path_expander.py
-
-	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} -gt 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild
deleted file mode 100644
index 6ad1250b75b1..000000000000
--- a/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit bash-completion-r1 python-single-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.79.0"
-VERSION_BTRFS_PROGS="5.15"
-VERSION_BUSYBOX="1.34.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.4.1"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.4.1"
-VERSION_E2FSPROGS="1.46.4"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20210613"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="29"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.4"
-VERSION_LIBGPGERROR="1.43"
-VERSION_LIBXCRYPT="4.4.26"
-VERSION_LVM="2.02.188"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.14"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.37.2"
-VERSION_XFSPROGS="5.13.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.5.0"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-devicemanager.patch
-	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
-	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
-	"${FILESDIR}"/${P}-gcc-12-boost-1.79.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-	fperms +x /usr/share/genkernel/path_expander.py
-
-	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} -gt 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r6.ebuild
index da125f8192a1..bac6ab0b593e 100644
--- a/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r6.ebuild
@@ -6,7 +6,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -118,6 +118,9 @@ RDEPEND="${PYTHON_DEPS}
 	sys-devel/autoconf
 	sys-devel/autoconf-archive
 	sys-devel/automake
+	sys-devel/bc
+	sys-devel/bison
+	sys-devel/flex
 	sys-devel/libtool
 	virtual/pkgconfig
 	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index db61d4ca5c50..ebc8d966acc7 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.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
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,7 +6,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -119,6 +119,9 @@ RDEPEND="${PYTHON_DEPS}
 	sys-devel/autoconf
 	sys-devel/autoconf-archive
 	sys-devel/automake
+	sys-devel/bc
+	sys-devel/bison
+	sys-devel/flex
 	sys-devel/libtool
 	virtual/pkgconfig
 	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 46e568b921a4..a37877bbc2f8 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -2,7 +2,9 @@ DIST genpatches-5.18-1.base.tar.xz 3800 BLAKE2B 52cf33aea903e8783b554127936ebde6
 DIST genpatches-5.18-1.extras.tar.xz 3924 BLAKE2B b4c7e29f0237ae9e4e3300c8be75c0def63969e5c4dec52d4d5259a6b3b6d27406883e45d2ad4d0fe576a1285121037fb88fcdeab58a5fabbb58d4847cbfbbfe SHA512 0182a96feca475471d1dde2e8326067e98f8f43a6e9122e29635a52ae4ca56eaf6ac349b189a0198704c9adee62cbdbd2def7e90d2dad564c72bec2f8ff32ec9
 DIST linux-5.18-pf3.tar.gz 206979899 BLAKE2B e66670f81f55353f5850272316141833d5dfb804defd03bce2d1a84e404a2631cc5918714cb7dac75b4a9344d1cc597377bcdff94a034e5a544109e0ac2d12ae SHA512 85d9be125bc378ac5aada2f557e6636987c93a108bc7768ae3f314b03bdb4b2bfea66e4226ab04c6323464b3a299381356be49e85a458294fe3d39cd04ebed13
 DIST linux-5.18-pf4.tar.gz 206956302 BLAKE2B 7eb7240792e2ab676facf7c3bae0811ec0db54c0d95d6ccd1ab60c50956e3fdb6cb4d5db3d77e5b08e7b18b78ffeebb5ac98d26ea4be0a7d04a49bc93421421d SHA512 b3b62618f0acb64f66369071eea503a0e894b3bb0c52941c738cc4ac7826a8327ddc32a27db02d493f3e022eacc18b1c7ed6d624b4a798e0773f17ee51f923fb
+DIST linux-5.18-pf5.tar.gz 206988172 BLAKE2B ae5abdee064b429019d7aaa4801d0bf852ed94dfef3965486cbc58d084e68ab9276651297857c1e64d5430e8b17728d1ebd7db597afd7ed7580d100e84431921 SHA512 dde7c08750858a719c70ff332df67b73432ace56571c73dfb7af7bf4ab4d5b5fbfb94486ac97b4b95e252f51a3be125fdb05a3abdc1b7443fb45ca4074810996
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
 EBUILD pf-sources-5.18_p3.ebuild 2630 BLAKE2B 2f5f6ecdc7145daa9bfc3a5215b36426c510255de78aee70b33dbc88509fa227dea386c3749a326c2564d1479c925ec2e6e595c6977dc9e114361523fe02144b SHA512 028345b5777fa5f2d3cb377a643e87abf2f5d72c4428643b014aa274a7594272eb5332a3ca2189d3355cbb59ca884e4bf283ce0477a61f366e4aa18517f9517d
 EBUILD pf-sources-5.18_p4.ebuild 2626 BLAKE2B 2b2320bb1a0caafc9d8a874174c83ebb1418604cf7df3757b677ad2f0ce1eadcd03fec031679b825b49d06e314a8d5a250c82e4703f7a635077a0bb44e5219f2 SHA512 19c892d20a45733a51bc0684d85d55a3f884b708be02e47b9931634bd6f90d58de3e05e4036beca7718719dd24ab987afd5c00bfd1b6dacc5becaf3427a66226
+EBUILD pf-sources-5.18_p5.ebuild 2626 BLAKE2B 2b2320bb1a0caafc9d8a874174c83ebb1418604cf7df3757b677ad2f0ce1eadcd03fec031679b825b49d06e314a8d5a250c82e4703f7a635077a0bb44e5219f2 SHA512 19c892d20a45733a51bc0684d85d55a3f884b708be02e47b9931634bd6f90d58de3e05e4036beca7718719dd24ab987afd5c00bfd1b6dacc5becaf3427a66226
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-5.18_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.18_p5.ebuild
new file mode 100644
index 000000000000..0227431b90ac
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.18_p5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+# major kernel version, e.g. 5.14
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf"
+PFPV="${PV/_p/-pf}"
+
+# https://gitlab.com/alfredchen/projectc/ revision for a major version,
+# e.g. prjc-v5.14-r2 = 2
+PRJC_R=2
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
+	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PFPV}"
+
+PATCHES=( "${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_unpack() {
+	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
+	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
+	unpack ${A}
+
+	mv linux linux-${PFPV} || die "Failed to move source directory"
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
+	# to manually eapply the genpatches too.
+	eapply "${WORKDIR}"/*.patch
+	default
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index a33dc060beca..e2a9232847ca 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 41f012b00a1f..04f479d43755 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -17,9 +17,9 @@ DIST chromium-104.0.5112.12.tar.xz 1482002228 BLAKE2B 128b711ff49b7c1155568d00bc
 DIST chromium-104.0.5112.48.tar.xz 1509278672 BLAKE2B 74f667f85bbe992969fc70320217eeb64fe7ba4cef783bfe4b9e82b08b7fc1411ec37ccd57543354009fa09b071b4a969840f2e8eaf257d1841d1a0ad74c84b3 SHA512 7cd51c476bd55abd430863435747c6919e7d2f335e32003e19837a9302b506f1d430364eb5b1efcdd175a909cc419c578fb41f32413199260e92437aebd0502f
 DIST chromium-104.0.5112.57.tar.xz 1509289272 BLAKE2B d9b7be2cf55c34d244f11232f6471599e35bd107b44a1ee9c37a90a9148048ea5a6959066cbd822e3b3f96b3d388ebf16033dabf560749753f1fc3e9863158da SHA512 4d6426475d9af5f6d99c83eb8e99ac27ca8305e367fb5feb0617bc51dc66146d72c41bcbf342988d76f3b430518c30a2037adedf5da0289a9b12c16e8cd926a4
 DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
-EBUILD chromium-103.0.5060.114.ebuild 35067 BLAKE2B b899ca4211dd76feb3fa1f69a7a037da1bcb7de4b766821f5bfea4dd1887e20a7baaf5333c4835ca95d0a39dac8c50fd0ea19cdae84097d3e70b26a7fd816139 SHA512 7d5cc197f1b47c50eaf7758a9bd60b26729e805df277e1158cbb26b6261f35a81df8524643c629e98cad09f58c35bf7a2f339196e97bd7ffa84c4dc59c1754e3
-EBUILD chromium-103.0.5060.134.ebuild 35064 BLAKE2B 61f33f45aef3a49075ec4545fe07b55cd9765c9ff2d82cf45ab98c625da37b062f3adb8485c376a91aa126d2f5aba7e5bf59f0996a568e6afddc56a4fa2da666 SHA512 6385804b211119943a154869c148a2e5ad0e1107944a9266311fc80f815877405cd3b6331ade3929b33e0444cebda32ed60ea4779ab004775698d9fba2139a67
-EBUILD chromium-104.0.5112.12.ebuild 37202 BLAKE2B c8ce8f59da3ab417ce6aa7d66bbd4078eb0394bc68ff4ba5f4fa6a92ab31481d06abccddd0a14fd22fcaa0aeb99183c0d5c8fd4e6e849063b248732035ccc344 SHA512 ee173c697b913a9a485827da49f0e730709a6e9f9d1340ed64cd173966c8ea810773afc05a9a0bfa8b9dd9cedd6cabe82aed65a7480e70de898b93b2619c2ca7
-EBUILD chromium-104.0.5112.48.ebuild 37203 BLAKE2B 19118f4b35bc59d984bf33f803c768c8e141ed9e9b50812d3f0fb9546818b0b01b3bcf5bf31f79842c1134a50245837b7955fab00cccb5ae954bf4a45552303c SHA512 b00e325137144b8cfc1e8a5fee6e762304852d7545e19109067c8ed9cf138877885b8c35a5b48086cfb2cae77419a3db7d483f91498d849050fe0c2496b1590e
-EBUILD chromium-104.0.5112.57.ebuild 37203 BLAKE2B 19118f4b35bc59d984bf33f803c768c8e141ed9e9b50812d3f0fb9546818b0b01b3bcf5bf31f79842c1134a50245837b7955fab00cccb5ae954bf4a45552303c SHA512 b00e325137144b8cfc1e8a5fee6e762304852d7545e19109067c8ed9cf138877885b8c35a5b48086cfb2cae77419a3db7d483f91498d849050fe0c2496b1590e
+EBUILD chromium-103.0.5060.114.ebuild 35045 BLAKE2B 6879f643c4bc2d1abb78b1d2702115bff4ba8d619ba823a088a91e30bd2084abea541219b53a2319ed1afb8722f420ff32d60f1eba211b901ee98be1770b8b63 SHA512 95f1a1f560fb6397388851497d0c3fbf3c5cb5b52c68b9f9d26717aef470a11fb90b3d730745817bba704bf21e7322a9607d5711fb3aa7f6840013e8ab9ba39d
+EBUILD chromium-103.0.5060.134.ebuild 35042 BLAKE2B 6c0413e2bd6f21c78a35c08a55c199f49ba6046fcbfbe42a7f35c372823098b1bfdc2f1f29e00a1d12ebe2e071231e4ed43376edb187668ddce1be86ea516230 SHA512 dce623498cf9253424b11726f2e888a8e0d55e12b107feb91b5a2a4ba78d9b280b2933456aa7f700ba9f1635b0b8a7756559b62526d3c2b1dff756d7464bb00e
+EBUILD chromium-104.0.5112.12.ebuild 37180 BLAKE2B 5fa65619152e62e070e1508eab353fe3eaab923b513d60cc76420c45c13d331368d8e52c8335949e66f22281742ab17a8f911fb1d834572a13e82e8d26d9866f SHA512 be682c7e512e5ff2fd64ba9db67081bdc3116f9ce80ca841f51916417216900738db5946263207920e008ec2b5f2c0ddc056753fbf02d6d9a77617a516cae428
+EBUILD chromium-104.0.5112.48.ebuild 37181 BLAKE2B 5ce7d0017e8b73f66c060e9ba8cd9f9ea52163bcf1b4b3fdda4bf4f11fc009e52950eb2ada5c9cfc2327e72eba6e32cf069d0b1d9460d04fa9fea6d043b17438 SHA512 3f3da38d1eb18ac53334f5561edf6325397adf02137c98e0a686f2c4efeafbea9f202d7794e1b413aee766298324056fee92dc1c099aa2a2aad98ccd79d6aceb
+EBUILD chromium-104.0.5112.57.ebuild 37181 BLAKE2B 5ce7d0017e8b73f66c060e9ba8cd9f9ea52163bcf1b4b3fdda4bf4f11fc009e52950eb2ada5c9cfc2327e72eba6e32cf069d0b1d9460d04fa9fea6d043b17438 SHA512 3f3da38d1eb18ac53334f5561edf6325397adf02137c98e0a686f2c4efeafbea9f202d7794e1b413aee766298324056fee92dc1c099aa2a2aad98ccd79d6aceb
 MISC metadata.xml 2039 BLAKE2B 165c45988d524ab5fa9562cce25997d1a54685ce1c15cfb4058ca572ba4d5ea906ba4392c59e3f492cd2b7b3ff656a33a5494e1418cb64942c69b70f271138cd SHA512 b85e969b529177a8cec0f10c4f1226fa4facb7c579c102731ae518edf25146044120a713e78f13589979c8f5b6df41e9519ac0243526b23879e3b17f966f6284
diff --git a/www-client/chromium/chromium-103.0.5060.114.ebuild b/www-client/chromium/chromium-103.0.5060.114.ebuild
index 4ddba0b51bd6..c0bb0ecd21a5 100644
--- a/www-client/chromium/chromium-103.0.5060.114.ebuild
+++ b/www-client/chromium/chromium-103.0.5060.114.ebuild
@@ -260,7 +260,7 @@ pre_build_checks() {
 		CHECKREQS_DISK_BUILD="12G"
 		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
 	fi
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+	if is-flagq '-g?(gdb)?([1-9])'; then
 		if use custom-cflags || use component-build; then
 			CHECKREQS_DISK_BUILD="25G"
 		fi
diff --git a/www-client/chromium/chromium-103.0.5060.134.ebuild b/www-client/chromium/chromium-103.0.5060.134.ebuild
index 1d96605e1349..9cb6928cc1fb 100644
--- a/www-client/chromium/chromium-103.0.5060.134.ebuild
+++ b/www-client/chromium/chromium-103.0.5060.134.ebuild
@@ -260,7 +260,7 @@ pre_build_checks() {
 		CHECKREQS_DISK_BUILD="12G"
 		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
 	fi
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+	if is-flagq '-g?(gdb)?([1-9])'; then
 		if use custom-cflags || use component-build; then
 			CHECKREQS_DISK_BUILD="25G"
 		fi
diff --git a/www-client/chromium/chromium-104.0.5112.12.ebuild b/www-client/chromium/chromium-104.0.5112.12.ebuild
index 75d82441782f..0aeeecd3fb38 100644
--- a/www-client/chromium/chromium-104.0.5112.12.ebuild
+++ b/www-client/chromium/chromium-104.0.5112.12.ebuild
@@ -271,7 +271,7 @@ pre_build_checks() {
 		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
 		use pgo && CHECKREQS_DISK_BUILD="19G"
 	fi
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+	if is-flagq '-g?(gdb)?([1-9])'; then
 		if use custom-cflags || use component-build; then
 			CHECKREQS_DISK_BUILD="25G"
 		fi
diff --git a/www-client/chromium/chromium-104.0.5112.48.ebuild b/www-client/chromium/chromium-104.0.5112.48.ebuild
index c7f5e104a472..593650fedb44 100644
--- a/www-client/chromium/chromium-104.0.5112.48.ebuild
+++ b/www-client/chromium/chromium-104.0.5112.48.ebuild
@@ -271,7 +271,7 @@ pre_build_checks() {
 		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
 		use pgo && CHECKREQS_DISK_BUILD="19G"
 	fi
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+	if is-flagq '-g?(gdb)?([1-9])'; then
 		if use custom-cflags || use component-build; then
 			CHECKREQS_DISK_BUILD="25G"
 		fi
diff --git a/www-client/chromium/chromium-104.0.5112.57.ebuild b/www-client/chromium/chromium-104.0.5112.57.ebuild
index c7f5e104a472..593650fedb44 100644
--- a/www-client/chromium/chromium-104.0.5112.57.ebuild
+++ b/www-client/chromium/chromium-104.0.5112.57.ebuild
@@ -271,7 +271,7 @@ pre_build_checks() {
 		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
 		use pgo && CHECKREQS_DISK_BUILD="19G"
 	fi
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+	if is-flagq '-g?(gdb)?([1-9])'; then
 		if use custom-cflags || use component-build; then
 			CHECKREQS_DISK_BUILD="25G"
 		fi
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 88b186b17ea9..d728b977970a 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index b355f88ad271..4a7b5118d8c5 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,3 +1,3 @@
-DIST xmobar-0.37.tar.gz 139585 BLAKE2B b7f115dc18f1ec6f2dc767c0cf6f4f94a9e3691cd5823302cc033542a10430bd3f29f906c4b1d8705cfae7e999695ac85d03d0c3ecfe4f7efaeac627a5e61d3f SHA512 a2904f3658ea32654ba343cd2c815928900e29e819dbc5ddff931601f42bae244365d2636ffce8b52c4dc57f88f3abebeffc62924fd3b39e197698d7b0da7d5d
-EBUILD xmobar-0.37.ebuild 4184 BLAKE2B db757146af294b0ce38bf5350c70dc57a73f829baf74357aea6e3e72e9d7361f6180784c0c9da036c6d35d63d4b40ba5f321b738c53f6e97585821667b04ba35 SHA512 b0f9554fa658e803c72ee0bbf396bfc3712e18c290792fec1b3811056ae5e440d53e4528c558c667b1a13bf32b9d4fa931855824237fa5789c4f6a277d8ef9f0
-MISC metadata.xml 1477 BLAKE2B be481e957d79d05cc2f197e46858a29fca44f7691c8e46ced361ac5b920c48b14afe162ba16ccc05e9501d93a8d2786f93bb88191a09ae5dae727cd2296ae654 SHA512 a505c33e8e000714d2bf7f6c8c735f92c1eddba395286b7b64e57374fa90d3018652658785336ff1a5c0b16aba5ffdf325e3f873c47eccfd03dd51588b412588
+DIST xmobar-0.44.1.tar.gz 156756 BLAKE2B bee81627744146989b402ae04d36edb5e4a69686b546457afebad81cda96ece4ce0ace8a2855bd5136610be3fc396c2f62121ea062fffb1ad837145cf3238fdb SHA512 e04f3f9f40ffa4095df2b523916686d93d28b4cbb880f7732cf63d6f1915e721043764b9d723ed8b3c4938c3df749d0e5a9ddb9a9e64a2a015f8f0d6b3f46c97
+EBUILD xmobar-0.44.1.ebuild 3816 BLAKE2B 4209f0aa1e59f8a80429e2bed9038a72ca1899261650bf56dd31c618bc26e57ae9c8c2b5e968749c491294dd3e8963dd1eb66c0b23edb64f0e2dc2743a35c95c SHA512 2dd9c134ea4c58cf72b51d7bbbee635730eaeca0c2d13d1919bb15ef1005302291ee52dad0d6a13efb02ad6079c39f5664e3a1d3050a5e56dbe09b1b706dc97d
+MISC metadata.xml 1060 BLAKE2B ca04a6c33985ddc558cd68be42c3042c0e87928251ceb681a97b6533e23c6f8d1d2af82355b4fac9af70d2276c2e7cb40e3bf5867f47ad27ca109f5f74b3eb6b SHA512 c875c4b26a7c4c88f7e5d5c3610c90fe100f98e9b018ba649f60e7d68a9bb71d94c1bdf8ddaf703326f11ebccafff5a480ab2976fc7048decae771cd0b44fa57
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 86ecf67faf16..85386171573c 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -6,25 +6,16 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="alsa">Use alsa-mixer to get the volume from soundcards</flag>
-		<flag name="dbus">Publish a service on the session bus for controlling xmobar</flag>
-		<flag name="inotify">inotify support (modern Linux only). Required for the Mail and MBox plugins</flag>
-		<flag name="mpd">Support mpd plugin</flag>
-		<flag name="timezone">Enables localized date support</flag>
-		<flag name="mpris">Enables MPRIS v1, v2  support</flag>
-		<flag name="rtsopts">Reduce process wakekups frequency to decrease CPU usage</flag>
-		<flag name="uvmeter">Plugin to show UV data for Australia</flag>
-		<flag name="weather">Enable weather plugin</flag>
-		<flag name="wifi">Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux</flag>
-		<flag name="iwlib">Wireless info support via Wext ioctls (deprecated)</flag>
-		<flag name="xft">Use Xft to render text. UTF-8 support included</flag>
-		<flag name="xpm">Enable usage of xpm for icons</flag>
+		<flag name="alsa">Use alsa-mixer to get the volume from soundcards.</flag>
+		<flag name="dbus">Publish a service on the session bus for controlling xmobar.</flag>
+		<flag name="mpd">MPD support. Needs libmpd installed.</flag>
+		<flag name="mpris">MPRIS v1, v2 support.</flag>
+		<flag name="rtsopts">Use -with-rtsopts=-V0 to reduce wakeups.</flag>
+		<flag name="timezone">Enables localized date support.</flag>
+		<flag name="uvmeter">UVMeter only useful to australians.</flag>
+		<flag name="weather">Enable weather plugin.</flag>
+		<flag name="wifi">Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux, the kernel.</flag>
+		<flag name="xft">Use Xft to render text. UTF-8 support included.</flag>
+		<flag name="xpm">Enable usage of xpm for icons.</flag>
 	</use>
-	<longdescription>
-		Xmobar is a minimalistic text based status bar.
-		
-		Inspired by the Ion3 status bar, it supports similar
-		features, like dynamic color management, output templates,
-		and extensibility through plugins.
-	</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/xmobar/xmobar-0.37.ebuild b/x11-misc/xmobar/xmobar-0.44.1.ebuild
index df9b615bd71e..3a1e2ecbeb3f 100644
--- a/x11-misc/xmobar/xmobar-0.37.ebuild
+++ b/x11-misc/xmobar/xmobar-0.44.1.ebuild
@@ -1,28 +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
-#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:iwlib,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm,with_nl80211:wifi
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,-with_iwlib,with_nl80211:wifi,+with_inotify
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="https://xmobar.org"
+HOMEPAGE="https://codeberg.org/xmobar/xmobar"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify iwlib mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
+IUSE="alsa dbus mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
 
-RDEPEND="dev-haskell/async:=[profile?]
+RDEPEND=">=dev-haskell/aeson-1.4.7.1:=[profile?]
+	dev-haskell/async:=[profile?]
 	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-haskell/parsec-numbers-0.1.0:=[profile?]
 	dev-haskell/regex-compat:=[profile?]
 	>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?]
@@ -41,7 +40,7 @@ RDEPEND="dev-haskell/async:=[profile?]
 	!dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?]
 						dev-haskell/http-conduit:=[profile?]
 						dev-haskell/http-types:=[profile?] ) ) ) )
-	inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] )
+	>=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?]
 	mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] )
 	mpris? ( >=dev-haskell/dbus-1:=[profile?]
 			!dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?]
@@ -61,9 +60,7 @@ RDEPEND="dev-haskell/async:=[profile?]
 	uvmeter? ( dev-haskell/http-conduit:=[profile?]
 			dev-haskell/http-types:=[profile?] )
 	wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?]
-		>=dev-haskell/netlink-1.1.1.0:=[profile?] )
-	!wifi? ( iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?]
-		net-wireless/wireless-tools ) )
+			>=dev-haskell/netlink-1.1.1.0:=[profile?] )
 	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
 "
 DEPEND="${RDEPEND}
@@ -75,14 +72,14 @@ DEPEND="${RDEPEND}
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-all_extensions \
+		--flag=-with_iwlib \
+		--flag=with_inotify \
 		$(cabal_flag alsa with_alsa) \
 		$(cabal_flag timezone with_datezone) \
 		$(cabal_flag dbus with_dbus) \
-		$(cabal_flag inotify with_inotify) \
-		$(cabal_flag wifi with_nl80211) \
 		$(cabal_flag mpd with_mpd) \
 		$(cabal_flag mpris with_mpris) \
-		$(cabal_flag iwlib with_iwlib) \
+		$(cabal_flag wifi with_nl80211) \
 		$(cabal_flag rtsopts with_rtsopts) \
 		--flag=with_threaded \
 		--flag=with_utf8 \
@@ -95,5 +92,6 @@ src_configure() {
 src_install() {
 	cabal_src_install
 
-	dodoc examples/xmobar.config examples/xmobar.hs readme.md changelog.md
+#   dodoc readme.md
+	dodoc examples/xmobar.config examples/xmobar.hs changelog.md
 }
author	V3n3RiX <venerix@koprulu.sector>	2022-07-31 09:12:05 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-31 09:12:05 +0100
commit	100ce16c6fb75a4911f388aa77f860324607c869 (patch)
tree	de54fe6a6fd7ceb7a41fdf2b03b666c479794055
parent	6262f7e48882f381dea4a0751717f65e6abd212f (diff)