2022-07-24 17:16:40 UTC

29 files changed, 265 insertions, 136 deletions

diff --git a/metadata/md5-cache/dev-db/phpmyadmin-5.2.0 b/metadata/md5-cache/dev-db/phpmyadmin-5.2.0
new file mode 100644
index 000000000000..3e283018b3df
--- /dev/null
+++ b/metadata/md5-cache/dev-db/phpmyadmin-5.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=Web-based administration for MySQL database in PHP
+EAPI=8
+HOMEPAGE=https://www.phpmyadmin.net/
+INHERIT=webapp
+IUSE=setup vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[ctype,filter,json(+),session,ssl,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* app-admin/webapp-config
+SLOT=5.2.0
+SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/5.2.0/phpMyAdmin-5.2.0-all-languages.tar.xz
+_eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
+_md5_=4be26028c9f5831e0a50ebc1d9be38a6
diff --git a/metadata/md5-cache/dev-haskell/alex-3.2.5 b/metadata/md5-cache/dev-haskell/alex-3.2.7.1
index 84da2aa8ea48..e7ecb98a0598 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.2.5
+++ b/metadata/md5-cache/dev-haskell/alex-3.2.7.1
@@ -1,16 +1,16 @@
 BDEPEND=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 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 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )
 DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.haskell.org/alex/
 INHERIT=autotools haskell-cabal
 IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
+RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://hackage.haskell.org/package/alex-3.2.5/alex-3.2.5.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=68e79e66addc68413d82bd9b616491a3
+SRC_URI=https://hackage.haskell.org/package/alex-3.2.7.1/alex-3.2.7.1.tar.gz
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
+_md5_=ccfda52a3adca92ab425bd0f74b31903
diff --git a/metadata/md5-cache/dev-haskell/groups-0.5.3 b/metadata/md5-cache/dev-haskell/groups-0.5.3
new file mode 100644
index 000000000000..465b6b96928a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/groups-0.5.3
@@ -0,0 +1,15 @@
+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.4 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A group is a monoid with invertibility
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/groups
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.4.3:=
+SLOT=0/0.5.3
+SRC_URI=https://hackage.haskell.org/package/groups-0.5.3/groups-0.5.3.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
+_md5_=8c07f87fb13e2d535e0676157be22cf9
diff --git a/metadata/md5-cache/dev-haskell/http2-2.0.3 b/metadata/md5-cache/dev-haskell/http2-3.0.1
index ba3603ec7515..8d539e9b43a7 100644
--- a/metadata/md5-cache/dev-haskell/http2-2.0.3
+++ b/metadata/md5-cache/dev-haskell/http2-3.0.1
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-byte-order-0.1.1:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/aeson dev-haskell/aeson-pretty dev-haskell/base16-bytestring >=dev-haskell/doctest-0.9.3 >=dev-haskell/glob-0.9 >=dev-haskell/hspec-1.3 dev-haskell/text dev-haskell/unordered-containers dev-haskell/vector ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=HTTP/2.0 library including frames and HPACK
+DEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-byte-order-0.1.5:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/time-manager:=[profile?] dev-haskell/unix-time:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP/2 library
 EAPI=7
 HOMEPAGE=https://github.com/kazu-yamamoto/http2
 INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
+IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-byte-order-0.1.1:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.0.3
-SRC_URI=https://hackage.haskell.org/package/http2-2.0.3/http2-2.0.3.tar.gz
+RDEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-byte-order-0.1.5:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/time-manager:=[profile?] dev-haskell/unix-time:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=test
+SLOT=0/3.0.1
+SRC_URI=https://hackage.haskell.org/package/http2-3.0.1/http2-3.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=06df31363ddfa6859e8dd5ded2385b47
+_md5_=7a3e0ead61bff96142709468282b66b4
diff --git a/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0 b/metadata/md5-cache/dev-haskell/network-byte-order-0.1.6
index 3d103d608636..b6c78ea38791 100644
--- a/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
+++ b/metadata/md5-cache/dev-haskell/network-byte-order-0.1.6
@@ -10,7 +10,7 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
-SLOT=0/0.1.4.0
-SRC_URI=https://hackage.haskell.org/package/network-byte-order-0.1.4.0/network-byte-order-0.1.4.0.tar.gz
+SLOT=0/0.1.6
+SRC_URI=https://hackage.haskell.org/package/network-byte-order-0.1.6/network-byte-order-0.1.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=f6146f3f1e632c6f3c3d6e807bbf8901
+_md5_=6ba90d5dac850cb2ba0480a4a0ec20f7
diff --git a/metadata/md5-cache/dev-haskell/rebase-1.15.0.3 b/metadata/md5-cache/dev-haskell/rebase-1.15.0.3
new file mode 100644
index 000000000000..7a73d188105e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rebase-1.15.0.3
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/bifunctors-5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-5.1:=[profile?] >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-1.1:=[profile?] >=dev-haskell/either-5:=[profile?] <dev-haskell/either-5.1:=[profile?] >=dev-haskell/groups-0.5.3:=[profile?] <dev-haskell/groups-0.6:=[profile?] >=dev-haskell/hashable-1.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/invariant-0.5.5:=[profile?] <dev-haskell/invariant-0.6:=[profile?] >=dev-haskell/profunctors-5.6:=[profile?] <dev-haskell/profunctors-5.7:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/selective-0.5:=[profile?] <dev-haskell/selective-0.6:=[profile?] >=dev-haskell/semigroupoids-5.3:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] >=dev-haskell/stm-2.5:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/time-compat-1.9.6.1:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.13:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-instances-3.4:=[profile?] <dev-haskell/vector-instances-3.5:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-3.0.0.0 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A more progressive alternative to the "base" package
+EAPI=8
+HOMEPAGE=https://github.com/nikita-volkov/rebase
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/bifunctors-5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-5.1:=[profile?] >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-1.1:=[profile?] >=dev-haskell/either-5:=[profile?] <dev-haskell/either-5.1:=[profile?] >=dev-haskell/groups-0.5.3:=[profile?] <dev-haskell/groups-0.6:=[profile?] >=dev-haskell/hashable-1.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/invariant-0.5.5:=[profile?] <dev-haskell/invariant-0.6:=[profile?] >=dev-haskell/profunctors-5.6:=[profile?] <dev-haskell/profunctors-5.7:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/selective-0.5:=[profile?] <dev-haskell/selective-0.6:=[profile?] >=dev-haskell/semigroupoids-5.3:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] >=dev-haskell/stm-2.5:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/time-compat-1.9.6.1:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.13:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-instances-3.4:=[profile?] <dev-haskell/vector-instances-3.5:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-8.8.1:=
+SLOT=0/1.15.0.3
+SRC_URI=https://hackage.haskell.org/package/rebase-1.15.0.3/rebase-1.15.0.3.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
+_md5_=1fe74b1174cbcfbc78d7dfb661f59411
diff --git a/metadata/md5-cache/dev-haskell/rebase-1.4.1 b/metadata/md5-cache/dev-haskell/rebase-1.4.1
deleted file mode 100644
index 7533585cacef..000000000000
--- a/metadata/md5-cache/dev-haskell/rebase-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-prelude-0.1:=[profile?] <dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/contravariant-extras-0.3.2:=[profile?] <dev-haskell/contravariant-extras-0.4:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/either-5:=[profile?] <dev-haskell/either-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/hashable-1:=[profile?] <dev-haskell/hashable-2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/selective-0.3:=[profile?] <dev-haskell/selective-0.4:=[profile?] >=dev-haskell/semigroupoids-5.2.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/stm-2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-1:=[profile?] <dev-haskell/uuid-2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A more progressive alternative to the 'base' package
-EAPI=7
-HOMEPAGE=https://github.com/nikita-volkov/rebase
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-haskell/base-prelude-0.1:=[profile?] <dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/contravariant-extras-0.3.2:=[profile?] <dev-haskell/contravariant-extras-0.4:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/either-5:=[profile?] <dev-haskell/either-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/hashable-1:=[profile?] <dev-haskell/hashable-2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/selective-0.3:=[profile?] <dev-haskell/selective-0.4:=[profile?] >=dev-haskell/semigroupoids-5.2.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/stm-2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-1:=[profile?] <dev-haskell/uuid-2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-8.2.1:=
-SLOT=0/1.4.1
-SRC_URI=https://hackage.haskell.org/package/rebase-1.4.1/rebase-1.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=02e4a427a90bbc027d8b7ff82cb5a15b
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1
index 1540fba024b3..932c37725a8a 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1
@@ -1,15 +1,15 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Replaces/Enhances Text.Regex
+DEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/enhances "Text.Regex"
 EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/regex-compat
+HOMEPAGE=https://wiki.haskell.org/Regular_expressions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.95.2.0
-SRC_URI=https://hackage.haskell.org/package/regex-compat-0.95.2.0/regex-compat-0.95.2.0.tar.gz
+RDEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/0.95.2.1
+SRC_URI=https://hackage.haskell.org/package/regex-compat-0.95.2.1/regex-compat-0.95.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=224d24034c88fb49dab960931a8aa4e1
+_md5_=8c1230ae8c4ea399eb8a9c67e9d648c8
diff --git a/metadata/md5-cache/dev-haskell/rerebase-1.15.0.3 b/metadata/md5-cache/dev-haskell/rerebase-1.15.0.3
new file mode 100644
index 000000000000..8a8f7aa3d7be
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rerebase-1.15.0.3
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~dev-haskell/rebase-1.15.0.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reexports from "base" with a bunch of other standard libraries
+EAPI=8
+HOMEPAGE=https://github.com/nikita-volkov/rerebase
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-haskell/rebase-1.15.0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/1.15.0.3
+SRC_URI=https://hackage.haskell.org/package/rerebase-1.15.0.3/rerebase-1.15.0.3.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
+_md5_=9f3bcad25420aa8624146cf0f343108a
diff --git a/metadata/md5-cache/dev-haskell/rerebase-1.4.1 b/metadata/md5-cache/dev-haskell/rerebase-1.4.1
deleted file mode 100644
index 3f50d00a8724..000000000000
--- a/metadata/md5-cache/dev-haskell/rerebase-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-haskell/rebase-1.4.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Reexports from 'base' with a bunch of other standard libraries
-EAPI=7
-HOMEPAGE=https://github.com/nikita-volkov/rerebase
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=~dev-haskell/rebase-1.4.1:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/1.4.1
-SRC_URI=https://hackage.haskell.org/package/rerebase-1.4.1/rerebase-1.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=d008214c84b5b714711178bdeec572f9
diff --git a/metadata/md5-cache/dev-haskell/selective-0.3 b/metadata/md5-cache/dev-haskell/selective-0.3
deleted file mode 100644
index ece6fada03cb..000000000000
--- a/metadata/md5-cache/dev-haskell/selective-0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/mtl-2.2.1 <dev-haskell/mtl-2.3 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-expected-failure-0.11 >=dev-haskell/tasty-quickcheck-0.8.4 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Selective applicative functors
-EAPI=7
-HOMEPAGE=https://github.com/snowleopard/selective
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://hackage.haskell.org/package/selective-0.3/selective-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=970af3d67ad33c267c7633479114b4f0
diff --git a/metadata/md5-cache/dev-haskell/selective-0.5 b/metadata/md5-cache/dev-haskell/selective-0.5
new file mode 100644
index 000000000000..c28c3bd2a931
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/selective-0.5
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Selective applicative functors
+EAPI=8
+HOMEPAGE=https://github.com/snowleopard/selective
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/0.5
+SRC_URI=https://hackage.haskell.org/package/selective-0.5/selective-0.5.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
+_md5_=bac780ecbefec461e8a83e941005da72
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.25 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.25
deleted file mode 100644
index 7d5a6b90c857..000000000000
--- a/metadata/md5-cache/dev-haskell/shakespeare-2.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/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/th-lift:=[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/hspec-2 <dev-haskell/hspec-3 dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A toolkit for making compile-time interpolated templates
-EAPI=7
-HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
-INHERIT=haskell-cabal
-IUSE=test-coffee test-export test-roy doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.0.25
-SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.25/shakespeare-2.0.25.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=3013209c043b7805f2e36504bfc670c7
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.30 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.30
new file mode 100644
index 000000000000..39971f9343ef
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/shakespeare-2.0.30
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=<dev-haskell/aeson-3:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] >=dev-haskell/file-embed-0.0.1:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A toolkit for making compile-time interpolated templates
+EAPI=8
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=<dev-haskell/aeson-3:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] >=dev-haskell/file-embed-0.0.1:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.0.30
+SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.30/shakespeare-2.0.30.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
+_md5_=9309a3104ddce237f4321abe0fa449bc
diff --git a/metadata/md5-cache/dev-haskell/warp-3.3.13 b/metadata/md5-cache/dev-haskell/warp-3.3.13
deleted file mode 100644
index d8a1c5fbae0a..000000000000
--- a/metadata/md5-cache/dev-haskell/warp-3.3.13
+++ /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/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] <dev-haskell/bsb-http-chunked-0.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.12:=[profile?] >=dev-haskell/http2-2.0:=[profile?] <dev-haskell/http2-2.1:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/x509:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/http-client dev-haskell/hunit >=dev-haskell/lifted-base-0.1 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A fast, light-weight web server for WAI applications
-EAPI=7
-HOMEPAGE=https://github.com/yesodweb/wai
-INHERIT=haskell-cabal
-IUSE=+allow-sendfilefd warp-debug doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] <dev-haskell/bsb-http-chunked-0.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.12:=[profile?] >=dev-haskell/http2-2.0:=[profile?] <dev-haskell/http2-2.1:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/x509:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=test
-SLOT=0/3.3.13
-SRC_URI=https://hackage.haskell.org/package/warp-3.3.13/warp-3.3.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	23cb2d46c80c12aa8b25973b4cdcb257	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
-_md5_=20b2d4369bb6283cc4ef27ee544ca5c8
diff --git a/metadata/md5-cache/dev-haskell/warp-3.3.21 b/metadata/md5-cache/dev-haskell/warp-3.3.21
new file mode 100644
index 000000000000..4f00b92d2246
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/warp-3.3.21
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] <dev-haskell/bsb-http-chunked-0.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.12:=[profile?] >=dev-haskell/http2-3.0:=[profile?] <dev-haskell/http2-3.1:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-8.6.3:= x509? ( dev-haskell/x509:=[profile?] ) >=dev-haskell/cabal-2.4.0.1 test? ( dev-haskell/async >=dev-haskell/hspec-1.3 dev-haskell/http-client dev-haskell/hunit dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast, light-weight web server for WAI applications
+EAPI=8
+HOMEPAGE=https://github.com/yesodweb/wai
+INHERIT=haskell-cabal
+IUSE=+allow-sendfilefd debug +x509 doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] <dev-haskell/bsb-http-chunked-0.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.12:=[profile?] >=dev-haskell/http2-3.0:=[profile?] <dev-haskell/http2-3.1:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-8.6.3:= x509? ( dev-haskell/x509:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/3.3.21
+SRC_URI=https://hackage.haskell.org/package/warp-3.3.21/warp-3.3.21.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6
+_md5_=2fd3ac4f43dc88a2f5cf8615595866a3
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.15-r1 b/metadata/md5-cache/dev-java/commons-codec-1.15-r1
new file mode 100644
index 000000000000..3467f951b7b0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-codec-1.15-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/commons-lang-3.11:3.6 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Implementations of common encoders and decoders in Java
+EAPI=7
+HOMEPAGE=https://commons.apache.org/proper/commons-codec/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.15-src.tar.gz -> commons-codec-1.15.tar.gz
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
+_md5_=5cefd7dcbf3a217e433d60576b8a73da
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4-r1 b/metadata/md5-cache/dev-java/commons-collections-4.4-r1
new file mode 100644
index 000000000000..795ed48015e3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/easymock:3.2 dev-java/commons-lang:3.6 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Extends the JCF classes with new interfaces, implementations and utilities
+EAPI=8
+HOMEPAGE=https://commons.apache.org/proper/commons-collections/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz -> commons-collections-4.4-src.tar.gz
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
+_md5_=495e54bc629ccfda6c5f5311ddd0acbf
diff --git a/metadata/md5-cache/dev-java/commons-io-2.11.0-r1 b/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
new file mode 100644
index 000000000000..8007e5e23cb6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/commons-lang-3.12.0:3.6 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Utility classes, stream implementations, file filters, and much more
+EAPI=7
+HOMEPAGE=https://commons.apache.org/proper/commons-io/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=1
+SRC_URI=mirror://apache/commons/io/source/commons-io-2.11.0-src.tar.gz -> commons-io-2.11.0-sources.tar.gz
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
+_md5_=135372418bb4d69ad656f17d61182ded
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
new file mode 100644
index 000000000000..d4ccc154e995
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Lightweight, self-contained mathematics and statistics components
+EAPI=8
+HOMEPAGE=https://commons.apache.org/math/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc examples source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3
+SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
+_md5_=ce8b0dc1187f950ce413642836d173a4
diff --git a/metadata/md5-cache/dev-java/fastinfoset-2.1.0 b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
index 80ab3da50754..d3bb90b7809a 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-2.1.0
+++ b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Open Source implementation of the Fast Infoset Standard for Binary XML
 EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jaxb-impl/FastInfoset
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-fi/archive/2.1.0.tar.gz -> fastinfoset-2.1.0.tar.gz
 _eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
-_md5_=c8e556358a39e2252bf23182f1fd762b
+_md5_=ba6cebb573ffd71f6ef33049975463c0
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0 b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
index ac8a7dfd71eb..281871a502f7 100644
--- a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/istack-commons-runtime:0 dev-java/jaxb-api:4 >=virtual/jdk-11:* dev-java/fastinfoset:0 dev-java/jaxb-stax-ex:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=dev-java/fastinfoset-2.1.0-r1:0 dev-java/jaxb-api:4 >=dev-java/jaxb-stax-ex-2.1.0-r1:0 dev-java/istack-commons-runtime:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=JAXB (JSR 222) Reference Implementation
 EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
@@ -7,9 +7,9 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-11:* dev-java/fastinfoset:0 dev-java/jaxb-stax-ex:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/4.0.0-RI.tar.gz -> jaxb-ri-4.0.0.tar.gz
 _eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
-_md5_=18271d157fbb6330145e8b0283bbc638
+_md5_=ca630f5ca342fe8d2fae6c7d2228f7ee
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0 b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
index bd653fe1f7c8..610add1011db 100644
--- a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-activation-api:2 dev-java/jaxb-api:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=dev-java/jakarta-activation-api:2 dev-java/jaxb-api:4 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Extensions to JSR-173 StAX API.
 EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/stax-ex
@@ -7,9 +7,9 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/2.1.0.tar.gz -> jaxb-stax-ex-2.1.0.tar.gz
 _eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
-_md5_=d4602215299dde047f84e3dce80f5698
+_md5_=0a4a265cfc8dc0c67ae73d7c9e68e459
diff --git a/metadata/md5-cache/dev-java/poi-5.2.2 b/metadata/md5-cache/dev-java/poi-5.2.2
new file mode 100644
index 000000000000..dd6c22b72a9c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/poi-5.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/commons-codec-1.15-r1:0 >=dev-java/commons-collections-4.4-r1:4 >=dev-java/commons-io-2.11.0-r1:1 >=dev-java/commons-math-3.6.1-r2:3 dev-java/log4j-api:2 dev-java/sparsebitset:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Maven build of Apache POI for Sonar checks
+EAPI=8
+HOMEPAGE=https://poi.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/poi/release/src/poi-src-5.2.2-20220312.tgz
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
+_md5_=e73bbe53f22b86f95ae4a8cec689095d
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.4.2 b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
new file mode 100644
index 000000000000..fce170ed1d11
--- /dev/null
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A library of arguably useful Java utilities
+EAPI=8
+HOMEPAGE=https://lightbend.github.io/config/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/lightbend/config/archive/v1.4.2.tar.gz -> typesafe-config-1.4.2.tar.gz
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	50b11e64e7ffa307c4cd0347711a69fb
+_md5_=199545811b332a655dbd981c95bbca9e
diff --git a/metadata/md5-cache/dev-python/sip-6.6.2 b/metadata/md5-cache/dev-python/sip-6.6.2
new file mode 100644
index 000000000000..6b529dd9f4be
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-6.6.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings generator for C/C++ libraries
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
+INHERIT=distutils-r1
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=5
+SRC_URI=mirror://pypi/s/sip/sip-6.6.2.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62
+_md5_=11ce34b372f09c40ea63c0ba28c7c543
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 47f934485e14..f6ecc0f74001 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -4165,7 +4165,7 @@ dev-db/pgpool2 4.2.1-r2 4.2.2-r2 4.2.9 4.3.1 4.3.2 9999: Connection pool server
 dev-db/pgrouting 3.1.1 3.1.2 3.1.3 3.2.1: pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality
 dev-db/pgtap 0.99.0 1.1.0 1.2.0 1.2.0-r2: Unit testing for PostgreSQL
 dev-db/pgxnclient 1.3-r2 1.3.1 1.3.2: PostgreSQL Extension Network Client
-dev-db/phpmyadmin 4.9.6 5.0.3 5.1.0 5.1.1: Web-based administration for MySQL database in PHP
+dev-db/phpmyadmin 4.9.6 5.0.3 5.1.0 5.1.1 5.2.0: Web-based administration for MySQL database in PHP
 dev-db/phppgadmin 7.12.1 7.13.0: Web-based administration for Postgres database in php
 dev-db/plr 8.3.0.17 8.4.1 8.4.5: R language extension for postgresql database
 dev-db/postgis 3.0.3-r3 3.0.5 3.1.3 3.1.5 3.2.0 3.2.1 3.3.0_alpha1 9999: Geographic Objects for PostgreSQL
@@ -4365,7 +4365,7 @@ dev-haskell/aeson-compat 0.3.9-r2: Compatibility layer for aeson
 dev-haskell/aeson-diff 1.1.0.8: Extract and apply patches to JSON documents
 dev-haskell/aeson-pretty 0.8.9: JSON pretty-printing library and command-line tool
 dev-haskell/aeson-qq 0.8.3: JSON quasiquoter for Haskell
-dev-haskell/alex 3.2.5: Alex is a tool for generating lexical analysers in Haskell
+dev-haskell/alex 3.2.7.1: Alex is a tool for generating lexical analysers in Haskell
 dev-haskell/alex-tools 0.4: A set of functions for a common use case of Alex
 dev-haskell/alsa-core 0.5.0.1-r2: Binding to the ALSA Library API (Exceptions)
 dev-haskell/alsa-mixer 0.3.0: Bindings to the ALSA simple mixer API
@@ -4620,6 +4620,7 @@ dev-haskell/gnuidn 0.2.2-r1: Bindings for GNU IDN
 dev-haskell/gnutls 0.2: Bindings for GNU libgnutls
 dev-haskell/graphviz 2999.20.0.4: Bindings to Graphviz for graph visualisation
 dev-haskell/groupoids 4.0: This package has been absorbed into semigroupoids 4.0
+dev-haskell/groups 0.5.3: A group is a monoid with invertibility
 dev-haskell/gsasl 0.3.7: Bindings for GNU libgsasl
 dev-haskell/gtk 0.15.5-r1: Binding to the Gtk+ graphical user interface library
 dev-haskell/gtk2hs-buildtools 0.13.8.0-r1: Tools to build the Gtk2Hs suite of User Interface libraries
@@ -4718,7 +4719,7 @@ dev-haskell/http-media 0.8.0.0: Processing HTTP Content-Type and Accept headers
 dev-haskell/http-reverse-proxy 0.6.0: Reverse proxy HTTP requests, either over raw sockets or with WAI
 dev-haskell/http-streams 0.8.7.2: An HTTP client using io-streams
 dev-haskell/http-types 0.12.3: Generic HTTP types for Haskell (for both client and server code)
-dev-haskell/http2 2.0.3: HTTP/2.0 library including frames and HPACK
+dev-haskell/http2 3.0.1: HTTP/2 library
 dev-haskell/httpd-shed 0.4.1.1: A simple web-server with an interact style API
 dev-haskell/hunit 1.2.5.2-r1 1.6.0.0 1.6.2.0: A unit testing framework for Haskell
 dev-haskell/hxt 9.3.1.18: A collection of tools for processing XML with Haskell
@@ -4843,7 +4844,7 @@ dev-haskell/neat-interpolation 0.5.1.2: A quasiquoter for neat and simple multil
 dev-haskell/netlink 1.1.1.0: Netlink communication for Haskell
 dev-haskell/network 2.4.1.2 2.4.2.2 2.5.0.0 2.6.2.1 2.6.3.1-r1 3.0.1.1: Low-level networking interface
 dev-haskell/network-bsd 2.8.1.0: Network.BSD
-dev-haskell/network-byte-order 0.1.4.0: Network byte order utilities
+dev-haskell/network-byte-order 0.1.6: Network byte order utilities
 dev-haskell/network-conduit 1.1.0: Stream socket data using conduits. (deprecated)
 dev-haskell/network-data 0.5.3: Library for network data structures and their serialization
 dev-haskell/network-info 0.2.0.10: Access the local computer's basic network configuration
@@ -4932,7 +4933,7 @@ dev-haskell/raw-strings-qq 1.1: Raw string literals for Haskell
 dev-haskell/readable 0.3.1: Reading from Text and ByteString
 dev-haskell/readargs 1.2.3: Simple command line argument parsing
 dev-haskell/readline 1.0.3.0-r1: An interface to the GNU readline library
-dev-haskell/rebase 1.4.1: A more progressive alternative to the 'base' package
+dev-haskell/rebase 1.15.0.3: A more progressive alternative to the "base" package
 dev-haskell/recaptcha 0.1.0.4: Functions for using the reCAPTCHA service in web applications
 dev-haskell/reducers 3.12.3-r1: Semigroups, specialized containers and a general map/reduce framework
 dev-haskell/refact 0.3.0.2: Specify refactorings to perform with apply-refact
@@ -4940,13 +4941,13 @@ dev-haskell/reflection 2.1.6: Reifies arbitrary terms into types that can be ref
 dev-haskell/regex-applicative 0.3.3.1: Regex-based parsing with applicative interface
 dev-haskell/regex-applicative-text 0.1.0.1: regex-applicative on text
 dev-haskell/regex-base 0.94.0.0 0.94.0.1: Common "Text.Regex.*" API for Regex matching
-dev-haskell/regex-compat 0.95.2.0: Replaces/Enhances Text.Regex
+dev-haskell/regex-compat 0.95.2.1: Replaces/enhances "Text.Regex"
 dev-haskell/regex-compat-tdfa 0.95.1.4: Unicode Support version of Text.Regex, using regex-tdfa
 dev-haskell/regex-pcre 0.95.0.0: Replaces/Enhances Text.Regex
 dev-haskell/regex-pcre-builtin 0.95.1.3.8.43: PCRE Backend for "Text.Regex" (regex-base)
 dev-haskell/regex-posix 0.96.0.0: Replaces/Enhances Text.Regex
 dev-haskell/regex-tdfa 1.3.1.1: Pure Haskell Tagged DFA Backend for "Text.Regex" (regex-base)
-dev-haskell/rerebase 1.4.1: Reexports from 'base' with a bunch of other standard libraries
+dev-haskell/rerebase 1.15.0.3: Reexports from "base" with a bunch of other standard libraries
 dev-haskell/resolv 0.1.2.0-r1: Domain Name Service (DNS) lookup via the libresolv standard library routines
 dev-haskell/resource-pool 0.2.3.2: A high-performance striped resource pooling implementation
 dev-haskell/resourcet 1.2.4.2: Deterministic allocation and freeing of scarce resources
@@ -4964,7 +4965,7 @@ dev-haskell/sandi 0.5: Data encoding library
 dev-haskell/say 0.1.0.0: Initial project template from stack
 dev-haskell/scientific 0.3.7.0-r1: Numbers represented using scientific notation
 dev-haskell/securemem 0.1.10: abstraction to an auto scrubbing and const time eq, memory chunk
-dev-haskell/selective 0.3: Selective applicative functors
+dev-haskell/selective 0.5: Selective applicative functors
 dev-haskell/semialign 1.2.0.1: Align and Zip type-classes from the common Semialign ancestor
 dev-haskell/semigroupoid-extras 5: Semigroupoids that depend on PolyKinds
 dev-haskell/semigroupoids 5.3.4 5.3.7: Semigroupoids: Category sans id
@@ -4976,7 +4977,7 @@ dev-haskell/servant-server 0.19.1: A family of combinators for defining webservi
 dev-haskell/setenv 0.1.1.3: A cross-platform library for setting environment variables
 dev-haskell/setlocale 1.0.0.9: Haskell bindings to setlocale
 dev-haskell/sha 1.6.4.4: Implementations of the SHA suite of message digest functions
-dev-haskell/shakespeare 2.0.25: A toolkit for making compile-time interpolated templates
+dev-haskell/shakespeare 2.0.30: A toolkit for making compile-time interpolated templates
 dev-haskell/shakespeare-css 1.1.0: Stick your haskell variables into css at compile time. (deprecated)
 dev-haskell/shakespeare-i18n 1.1.0: A type-based approach to internationalization. (deprecated)
 dev-haskell/shakespeare-js 1.3.0: Stick your haskell variables into javascript/coffeescript at compile time
@@ -5133,7 +5134,7 @@ dev-haskell/wai-conduit 3.0.0.4: conduit wrappers for WAI
 dev-haskell/wai-extra 3.1.4.1: Provides some basic WAI handlers and middleware
 dev-haskell/wai-logger 2.3.6: A logging system for WAI
 dev-haskell/wai-test 3.0.0: Unit test framework (built on HUnit) for WAI applications. (deprecated)
-dev-haskell/warp 3.3.13: A fast, light-weight web server for WAI applications
+dev-haskell/warp 3.3.21: A fast, light-weight web server for WAI applications
 dev-haskell/warp-tls 3.2.12: HTTP over TLS support for Warp via the TLS package
 dev-haskell/wavy 0.1.0.0: Process WAVE files in Haskell
 dev-haskell/wcwidth 0.0.2: Native wcwidth
@@ -5244,18 +5245,18 @@ dev-java/cglib 3.3.0-r1: cglib is a powerful, high performance and quality Code
 dev-java/checker-framework-qual 3.14.0: Annotations for type-checking by the Checker Framework
 dev-java/commons-beanutils 1.9.4-r1: Provides easy-to-use wrappers around Reflection and Introspection APIs
 dev-java/commons-cli 1.5.0: A Java library for working with the command line arguments and options
-dev-java/commons-codec 1.15: Implementations of common encoders and decoders in Java
-dev-java/commons-collections 3.2.2 4.4: Extends the JCF classes with new interfaces, implementations and utilities
+dev-java/commons-codec 1.15 1.15-r1: Implementations of common encoders and decoders in Java
+dev-java/commons-collections 3.2.2 4.4 4.4-r1: Extends the JCF classes with new interfaces, implementations and utilities
 dev-java/commons-compress 1.21: Java API for working with archive files
 dev-java/commons-csv 1.9.0: Simple interface for reading and writing CSV files of various types
 dev-java/commons-daemon 1.3.1: Tools to allow Java programs to run as UNIX daemons
 dev-java/commons-digester 2.1-r2 3.2-r3: Reads XML configuration files to provide initialization of various Java objects
 dev-java/commons-httpclient 3.1-r2: The Jakarta Commons HttpClient library
 dev-java/commons-imaging 1.0_alpha2: Apache Commons Imaging (previously Sanselan) is a pure-Java image library.
-dev-java/commons-io 2.11.0: Utility classes, stream implementations, file filters, and much more
+dev-java/commons-io 2.11.0 2.11.0-r1: Utility classes, stream implementations, file filters, and much more
 dev-java/commons-lang 2.6-r2 3.12.0: Commons components to manipulate core java classes
 dev-java/commons-logging 1.2-r5: An ultra-thin bridge between different Java logging libraries
-dev-java/commons-math 3.6.1-r1: Lightweight, self-contained mathematics and statistics components
+dev-java/commons-math 3.6.1-r1 3.6.1-r2: Lightweight, self-contained mathematics and statistics components
 dev-java/commons-net 3.8.0: Client-oriented Java library to implement many Internet protocols
 dev-java/commons-text 1.9: Apache Commons Text is a library focused on algorithms working on strings
 dev-java/commons-validator 1.7: Commons component to validate user input, or data input
@@ -5270,7 +5271,7 @@ dev-java/eclipse-ecj 4.15 4.22-r1: Eclipse Compiler for Java
 dev-java/emma 2.0.5312-r4: Free Java code coverage tool
 dev-java/error-prone-annotations 2.7.1: Java annotations for the Error Prone static analysis tool
 dev-java/failureaccess 30.1.1: Guava's InternalFutureFailureAccess and InternalFutures classes.
-dev-java/fastinfoset 2.1.0: Open Source implementation of the Fast Infoset Standard for Binary XML
+dev-java/fastinfoset 2.1.0-r1: Open Source implementation of the Fast Infoset Standard for Binary XML
 dev-java/fec 1.0.4-r4: Forward Error Correction library in Java
 dev-java/findbugs-annotations 3.0.1: Annotation defined by the FindBugs tool
 dev-java/fontbox 2.0.26: An open source Java library for parsing font files
@@ -5340,8 +5341,8 @@ dev-java/javax-inject 1-r4: Dependency injection for Java (JSR-330)
 dev-java/javax-jms-api 2.0.3: Jakarta Messaging
 dev-java/javax-mail 1.6.7-r1: Jakarta Mail API
 dev-java/jaxb-api 2.3.3-r1 3.0.1-r1 4.0.0: Jakarta XML Binding API
-dev-java/jaxb-runtime 4.0.0: JAXB (JSR 222) Reference Implementation
-dev-java/jaxb-stax-ex 2.1.0: Extensions to JSR-173 StAX API.
+dev-java/jaxb-runtime 4.0.0-r1: JAXB (JSR 222) Reference Implementation
+dev-java/jaxb-stax-ex 2.1.0-r1: Extensions to JSR-173 StAX API.
 dev-java/jaxen 1.2.0-r1: Jaxen is a universal XPath engine for Java
 dev-java/jbig2-imageio 3.0.3: PDFBox JBIG2 ImageIO plugin
 dev-java/jbitcollider-core 0.8-r1: Core classes of jBitcollider: org.bitpedia.collider.core
@@ -5439,7 +5440,7 @@ dev-java/pdf-renderer 1.0.5-r1: a 100% Java PDF renderer and viewer
 dev-java/pdfbox 2.0.26: Java library and utilities for working with PDF documents
 dev-java/picocli 4.6.3-r1: Java command line parser with both an annotations API and a programmatic API
 dev-java/plexus-classworlds 2.2.3: The class loader framework of the Plexus project
-dev-java/poi 5.0.0: Maven build of Apache POI for Sonar checks
+dev-java/poi 5.0.0 5.2.2: Maven build of Apache POI for Sonar checks
 dev-java/protobuf-java 3.17.3 3.19.3 9999: Google's Protocol Buffers - Java bindings
 dev-java/qdox 1.12.1-r3: Parser for extracting class/interface/method definitions
 dev-java/randomized-runner 2.7.9 2.8.0: JUnit test runner and plugins for running JUnit tests with pseudo-randomness
@@ -5479,7 +5480,7 @@ dev-java/testng 6.9.10-r1: Testing framework inspired by JUnit and NUnit with ne
 dev-java/tomcat-native 1.2.34 1.2.35: Allows Tomcat to use certain native resources for better performance
 dev-java/tomcat-servlet-api 4.1.40 5.5.36 6.0.53-r1 7.0.109 8.5.81 9.0.64 9.0.65 10.0.22: Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 dev-java/treelayout 1.0.3-r1: Efficient and customizable TreeLayout Algorithm in Java.
-dev-java/typesafe-config 1.3.0-r3: A library of arguably useful Java utilities
+dev-java/typesafe-config 1.3.0-r3 1.4.2: A library of arguably useful Java utilities
 dev-java/univocity-parsers 2.9.1: A collection of extremely fast and reliable parsers for Java
 dev-java/validation-api 1.0.0-r1 1.1.0-r1: Bean Validation (JSR-303) API
 dev-java/velocity 2.3: Apache Velocity is a general purpose template engine
@@ -9696,7 +9697,7 @@ dev-python/simplegeneric 0.8.1-r1 0.8.1-r2: Simple generic functions for Python
 dev-python/simplejson 3.17.6: Simple, fast, extensible JSON encoder/decoder for Python
 dev-python/simplekml 1.3.6: Enables you to generate KML with as little effort as possible
 dev-python/simpy 4.0.1: Object-oriented, process-based discrete-event simulation language
-dev-python/sip 4.19.25-r1 6.6.1: Python bindings generator for C/C++ libraries
+dev-python/sip 4.19.25-r1 6.6.1 6.6.2: Python bindings generator for C/C++ libraries
 dev-python/six 1.16.0-r1: Python 2 and 3 compatibility library
 dev-python/slackclient 2.5.0: Client for Slack supporting the Slack Web and Real Time Messaging API
 dev-python/slimit 0.8.1-r1: A JavaScript minifier written in Python
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 588a099e8a74..551ff39a0b4d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 24 Jul 2022 17:01:42 +0000
+Sun, 24 Jul 2022 17:16:40 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 10c344040940..5a22a6668321 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1602,9 +1602,6 @@ dev-haskell/semirings:hashable - Enisable the use of the `hashable` package. Dis
 dev-haskell/semirings:unordered-containers - Enable the use of the `unordered-containers` package. Disabling this may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/sendfile:portable - Explicitly enable portable sendfile support (implemented in Haskell)
 dev-haskell/sha:exe - Build a sha1 and a sha384 executable similar to 'md5sum'.
-dev-haskell/shakespeare:test-coffee - Render tests through coffeescript render function.
-dev-haskell/shakespeare:test-export - Test export.
-dev-haskell/shakespeare:test-roy - Render tests through roy render function.
 dev-haskell/shelly:lifted - run the tests against Shelly.Lifted
 dev-haskell/simple-sendfile:allow-bsd - Allow use of BSD sendfile (disable on GNU/kFreeBSD)
 dev-haskell/skein:big-endian - When manually selecting the endianness, use big-endian (default is little-endian).
@@ -1646,8 +1643,8 @@ dev-haskell/vector-algorithms:unsafechecks - Enable bounds checking in unsafe op
 dev-haskell/vector-instances:hashable - use dev-haskell/hashable
 dev-haskell/void:safe - dissable effective but unsafe coersions
 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:warp-debug - Add additional debuging information
+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