diff --git a/metadata/md5-cache/app-crypt/clevis-13 b/metadata/md5-cache/app-crypt/clevis-13
index 6879da7..e529e7b 100644
--- a/metadata/md5-cache/app-crypt/clevis-13
+++ b/metadata/md5-cache/app-crypt/clevis-13
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=tpm2? ( app-crypt/tpm2-tools ) app-text/asciidoc >=sys-fs/luksmeta-8 dev-libs/openssl:0= >=dev-libs/jansson-2.10 >=dev-libs/jose-8 >=sys-fs/cryptsetup-2.0.4[pwquality] sys-apps/systemd dracut? ( sys-kernel/dracut ) udisks? ( sys-fs/udisks:2 ) >=sys-process/audit-2.7.8 bash-completion? ( app-shells/bash-completion )
 SLOT=0
 SRC_URI=https://github.com/latchset/clevis/releases/download/v13/clevis-13.tar.xz
-_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d00d497502acbce9e7ad7afd2f2fa31
diff --git a/metadata/md5-cache/app-forensics/decompyle++-0_p20210412 b/metadata/md5-cache/app-forensics/decompyle++-0_p20210412
index 165bd16..983c81a 100644
--- a/metadata/md5-cache/app-forensics/decompyle++-0_p20210412
+++ b/metadata/md5-cache/app-forensics/decompyle++-0_p20210412
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/zrax/pycdc/archive/fbf9d24de3e5322d75658c0733afd5b139280ad8.tar.gz -> decompyle++-0_p20210412.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b405703ab744967b64af0019883bf6ce
diff --git a/metadata/md5-cache/app-forensics/luadec-0_p20170106 b/metadata/md5-cache/app-forensics/luadec-0_p20170106
index f216d60..664d405 100644
--- a/metadata/md5-cache/app-forensics/luadec-0_p20170106
+++ b/metadata/md5-cache/app-forensics/luadec-0_p20170106
@@ -9,5 +9,5 @@ LICENSE=MIT
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=5.1
 SRC_URI=https://github.com/viruscamp/luadec/archive/895d92313fabaee260121c758c8320d1b21dd741.tar.gz -> luadec-0_p20170106.tar.gz https://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	20268f317853c44164a3065f1e6ff68b	lua-utils	a2553e8a65058f277bf0b2da4be361b0	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4f6b11cfa1cae72ef107b523e6259c08
diff --git a/metadata/md5-cache/app-misc/lssecret-0_p20190703 b/metadata/md5-cache/app-misc/lssecret-0_p20190703
index aa49631..f03ba81 100644
--- a/metadata/md5-cache/app-misc/lssecret-0_p20190703
+++ b/metadata/md5-cache/app-misc/lssecret-0_p20190703
@@ -9,5 +9,5 @@ LICENSE=Unlicense
 RDEPEND=app-crypt/libsecret
 SLOT=0
 SRC_URI=https://gitlab.com/GrantMoyer/lssecret/-/raw/722013dc982e56f8127d3ab0105606410d4e1744/lssecret.cpp?inline=false -> lssecret-0_p20190703.cpp
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f908bc9ba80f3f4bfbc64aefe4f46f98
diff --git a/metadata/md5-cache/dev-python/ftfy-5.5.1 b/metadata/md5-cache/dev-python/ftfy-5.5.1
index 28e5abe..68d35b1 100644
--- a/metadata/md5-cache/dev-python/ftfy-5.5.1
+++ b/metadata/md5-cache/dev-python/ftfy-5.5.1
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library that fixes text for you
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/LuminosoInsight/python-ftfy
 IUSE=python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/wcwidth python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+RDEPEND=dev-python/wcwidth python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/ftfy/ftfy-5.5.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	ab5cf7189d651fc1d8a4a8184a54cb52	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f219a6e03eeea27e128bf4e34bf6091
diff --git a/metadata/md5-cache/dev-python/ftfy-5.7 b/metadata/md5-cache/dev-python/ftfy-5.7
deleted file mode 100644
index 0de92c8..0000000
--- a/metadata/md5-cache/dev-python/ftfy-5.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library that fixes text for you
-EAPI=7
-HOMEPAGE=https://github.com/LuminosoInsight/python-ftfy
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/wcwidth python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/f/ftfy/ftfy-5.7.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b3048a7a11149812c9812851e725b5a0
diff --git a/metadata/md5-cache/dev-python/ftfy-6.0.3 b/metadata/md5-cache/dev-python/ftfy-6.0.3
new file mode 100644
index 0000000..ecdb997
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ftfy-6.0.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/wcwidth >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library that fixes text for you
+EAPI=7
+HOMEPAGE=https://github.com/LuminosoInsight/python-ftfy
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-python/wcwidth python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/ftfy/ftfy-6.0.3.tar.gz
+_eclasses_=distutils-r1	ab5cf7189d651fc1d8a4a8184a54cb52	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1ee73243a1156c15912276f29988e494
diff --git a/metadata/md5-cache/dev-python/wikipedia-1.4.0 b/metadata/md5-cache/dev-python/wikipedia-1.4.0
index ae56d73..cf8ab13 100644
--- a/metadata/md5-cache/dev-python/wikipedia-1.4.0
+++ b/metadata/md5-cache/dev-python/wikipedia-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library that makes it easy to access and parse data from Wikipedia
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/goldsmith/Wikipedia
 IUSE=python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/beautifulsoup:4 >=dev-python/requests-2.6.0 python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+RDEPEND=dev-python/beautifulsoup:4 >=dev-python/requests-2.6.0 python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wikipedia/wikipedia-1.4.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	ab5cf7189d651fc1d8a4a8184a54cb52	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9c681e1938e95c94be144af6ffcaf37b
diff --git a/metadata/md5-cache/media-fonts/twemoji-ttf-13.1.0 b/metadata/md5-cache/media-fonts/twemoji-ttf-13.1.0
new file mode 100644
index 0000000..ee6b83c
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/twemoji-ttf-13.1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/libarchive[zstd] X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=install postinst postrm setup unpack
+DESCRIPTION=Twitter Emoji for everyone
+EAPI=7
+HOMEPAGE=https://twemoji.twitter.com/
+IUSE=X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT CC-BY-4.0
+SLOT=0
+SRC_URI=https://kojipkgs.fedoraproject.org/packages/twitter-twemoji-fonts/13.1.0/1.fc35/noarch/twitter-twemoji-fonts-13.1.0-1.fc35.noarch.rpm
+_eclasses_=font	0667878c2b594871023dd1833d05996f
+_md5_=8df080d049b3e81b8f37fe0885f132ac
diff --git a/metadata/md5-cache/net-im/cawbird-1.4.1 b/metadata/md5-cache/net-im/cawbird-1.4.1
index c716530..ea6e7ed 100644
--- a/metadata/md5-cache/net-im/cawbird-1.4.1
+++ b/metadata/md5-cache/net-im/cawbird-1.4.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib x11-libs/gtk+:3 net-libs/rest:0.7 dev-libs/json-glib dev-db/sqlite net-libs/libsoup:2.4 net-libs/liboauth gstreamer? ( media-libs/gstreamer media-plugins/gst-plugins-gtk media-plugins/gst-plugins-libav media-plugins/gst-plugins-hls ) spellcheck? ( app-text/gspell )
 SLOT=0
 SRC_URI=https://github.com/IBBoard/cawbird/archive/refs/tags/v1.4.1.tar.gz -> cawbird-1.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	03f1f33473c1c770f4bffe2e342cd1df	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbe4a86a971c98a7624e6ab2ffa2c530
diff --git a/metadata/md5-cache/net-misc/ipcalc-ng-0.4.1 b/metadata/md5-cache/net-misc/ipcalc-ng-0.4.1
deleted file mode 100644
index b7e26a5..0000000
--- a/metadata/md5-cache/net-misc/ipcalc-ng-0.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=!net-misc/ipcalc geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxminddb:= )
-DESCRIPTION=an IPv4/IPv6 ipcalc tool
-EAPI=7
-HOMEPAGE=https://gitlab.com/ipcalc/ipcalc
-IUSE=geoip +geoip2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!net-misc/ipcalc geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxminddb:= )
-REQUIRED_USE=?? ( geoip geoip2 )
-SLOT=0
-SRC_URI=https://gitlab.com/ipcalc/ipcalc/repository/archive.tar.bz2?ref=0.4.1 -> ipcalc-ng-0.4.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ce3f66ff8e78fc10a97e0998733bbb92
diff --git a/metadata/md5-cache/net-misc/ipcalc-ng-1.0.0 b/metadata/md5-cache/net-misc/ipcalc-ng-1.0.0
index 9f0b3e7..72b1fe2 100644
--- a/metadata/md5-cache/net-misc/ipcalc-ng-1.0.0
+++ b/metadata/md5-cache/net-misc/ipcalc-ng-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=!!net-misc/ipcalc
 REQUIRED_USE=?? ( geoip geoip2 )
 SLOT=0
 SRC_URI=https://gitlab.com/ipcalc/ipcalc/repository/archive.tar.bz2?ref=1.0.0 -> ipcalc-ng-1.0.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f8c314cdc2d48b753c3830903dd5fa02
diff --git a/metadata/md5-cache/net-misc/ipcalc-ng-1.0.1 b/metadata/md5-cache/net-misc/ipcalc-ng-1.0.1
new file mode 100644
index 0000000..0e6ea7b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ipcalc-ng-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/ronn >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxminddb:= )
+DESCRIPTION=an IPv4/IPv6 ipcalc tool
+EAPI=7
+HOMEPAGE=https://gitlab.com/ipcalc/ipcalc
+IUSE=geoip +geoip2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!!net-misc/ipcalc
+REQUIRED_USE=?? ( geoip geoip2 )
+SLOT=0
+SRC_URI=https://gitlab.com/ipcalc/ipcalc/-/archive/1.0.1/ipcalc-1.0.1.tar.bz2 -> ipcalc-ng-1.0.1.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d5328d823a33135ce79a168e010a001e
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.90.9 b/metadata/md5-cache/sys-auth/fprintd-1.90.9
index e59b263..6469b65 100644
--- a/metadata/md5-cache/sys-auth/fprintd-1.90.9
+++ b/metadata/md5-cache/sys-auth/fprintd-1.90.9
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 || ( >=sys-auth/libfprint-1.90.1 >=sys-auth/libfprint-tod-1.90.1 ) sys-auth/polkit pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.90.9/fprintd-v1.90.9.tar.bz2 -> fprintd-1.90.9.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f2d87d3ab2e7f1a0dec1a4e978361e51
diff --git a/metadata/md5-cache/sys-auth/libfprint-tod-1.90.6 b/metadata/md5-cache/sys-auth/libfprint-tod-1.90.6
index 993e4c7..e32278c 100644
--- a/metadata/md5-cache/sys-auth/libfprint-tod-1.90.6
+++ b/metadata/md5-cache/sys-auth/libfprint-tod-1.90.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/nss >=dev-libs/libgusb-0.3.1 !sys-auth/libfprint virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/3v1n0/libfprint/-/archive/v1.90.6+tod1/libfprint-v1.90.6+tod1.tar.bz2 -> libfprint-tod-1.90.6.tar.bz2
-_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=ac55838486063d1ca1178ccb3bdd3405
diff --git a/metadata/md5-cache/sys-auth/libfprint-tod-1.90.7_p20210222 b/metadata/md5-cache/sys-auth/libfprint-tod-1.90.7_p20210222
index 5c27597..b6c3399 100644
--- a/metadata/md5-cache/sys-auth/libfprint-tod-1.90.7_p20210222
+++ b/metadata/md5-cache/sys-auth/libfprint-tod-1.90.7_p20210222
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/nss >=dev-libs/libgusb-0.3.1 !sys-auth/libfprint virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/3v1n0/libfprint/-/archive/v1.90.7+git20210222+tod1/libfprint-v1.90.7+git20210222+tod1.tar.bz2 -> libfprint-tod-1.90.7_p20210222.tar.bz2
-_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=0f6a4b01c8e3d3b07b80df228db9f2ea
diff --git a/metadata/md5-cache/sys-auth/libfprint-tod-goodix-drivers-0.0.4 b/metadata/md5-cache/sys-auth/libfprint-tod-goodix-drivers-0.0.4
index 61fe01a..aef145c 100644
--- a/metadata/md5-cache/sys-auth/libfprint-tod-goodix-drivers-0.0.4
+++ b/metadata/md5-cache/sys-auth/libfprint-tod-goodix-drivers-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=sys-auth/libfprint-tod acct-group/plugdev
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/plain/usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.4.so
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=2e13c864df0daff7ac4a6ba12ff4278f
diff --git a/metadata/md5-cache/sys-auth/libfprint-tod-goodix-drivers-0.0.6 b/metadata/md5-cache/sys-auth/libfprint-tod-goodix-drivers-0.0.6
index aa15e96..21d0a81 100644
--- a/metadata/md5-cache/sys-auth/libfprint-tod-goodix-drivers-0.0.6
+++ b/metadata/md5-cache/sys-auth/libfprint-tod-goodix-drivers-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=sys-auth/libfprint-tod acct-group/plugdev
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/plain/usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so?&id=f17770af882d9b13832f16c77d739aa5387e2545 -> libfprint-tod-goodix-53xc-0.0.6.so
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=9770022967f54cbc40076df4acad4e1b
diff --git a/metadata/md5-cache/www-servers/tang-7 b/metadata/md5-cache/www-servers/tang-7
index d56e5ba..ddde900 100644
--- a/metadata/md5-cache/www-servers/tang-7
+++ b/metadata/md5-cache/www-servers/tang-7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/asciidoc >=net-libs/http-parser-2.8.0 sys-apps/systemd >=dev-libs/jose-8
 SLOT=0
 SRC_URI=https://github.com/latchset/tang/releases/download/v7/tang-7.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=623958d408184a316e8046ca8ae0c123
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
index 863891b..f18a8e3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=xspice? ( app-emulation/spice python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 >=app-emulation/spice-protocol-0.12.0 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+DEPEND=xspice? ( app-emulation/spice python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 >=app-emulation/spice-protocol-0.12.0 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=QEMU QXL paravirt video driver
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
 IUSE=xspice python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=xspice? ( app-emulation/spice python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+RDEPEND=xspice? ( app-emulation/spice python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
 _md5_=22c150b899c9fe40a9d40507b22fb7a9
diff --git a/metadata/md5-cache/x11-libs/bamf-0.5.4-r1 b/metadata/md5-cache/x11-libs/bamf-0.5.4-r1
index da64bc6..552398a 100644
--- a/metadata/md5-cache/x11-libs/bamf-0.5.4-r1
+++ b/metadata/md5-cache/x11-libs/bamf-0.5.4-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/dbus-glib dev-util/gdbus-codegen >=dev-libs/glib-2.38.0:2 gnome-base/libgtop:2 x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libwnck-3.4.7:3
 SLOT=0
 SRC_URI=http://launchpad.net/bamf/0.5/0.5.4/+download/bamf-0.5.4.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	03f1f33473c1c770f4bffe2e342cd1df	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9a824f7dfd30cac10207b36d3a61936
diff --git a/metadata/md5-cache/x11-libs/bamf-0.5.5 b/metadata/md5-cache/x11-libs/bamf-0.5.5
index 012f096..15faaf9 100644
--- a/metadata/md5-cache/x11-libs/bamf-0.5.5
+++ b/metadata/md5-cache/x11-libs/bamf-0.5.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/dbus-glib dev-util/gdbus-codegen >=dev-libs/glib-2.38.0:2 gnome-base/libgtop:2 x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libwnck-3.4.7:3
 SLOT=0
 SRC_URI=http://launchpad.net/bamf/0.5/0.5.5/+download/bamf-0.5.5.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	03f1f33473c1c770f4bffe2e342cd1df	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68ddec48a051600c837254ec67b57433
diff --git a/metadata/md5-cache/x11-misc/desktopfolder-1.1.3 b/metadata/md5-cache/x11-misc/desktopfolder-1.1.3
index a46a348..966f424 100644
--- a/metadata/md5-cache/x11-misc/desktopfolder-1.1.3
+++ b/metadata/md5-cache/x11-misc/desktopfolder-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgee:0.8 x11-libs/cairo[X] dev-libs/json-glib x11-libs/gdk-pixbuf x11-libs/libwnck:3 x11-libs/gtksourceview:4
 SLOT=0
 SRC_URI=https://github.com/spheras/desktopfolder/archive/v1.1.3.tar.gz -> desktopfolder-1.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	03f1f33473c1c770f4bffe2e342cd1df	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bf812ff2b34805c394c30b1d46a7e7c
diff --git a/metadata/md5-cache/x11-misc/gpaste-3.38.6 b/metadata/md5-cache/x11-misc/gpaste-3.38.6
index 3cd352d..a810a66 100644
--- a/metadata/md5-cache/x11-misc/gpaste-3.38.6
+++ b/metadata/md5-cache/x11-misc/gpaste-3.38.6
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=d
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.38.6.tar.gz -> gpaste-3.38.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	03f1f33473c1c770f4bffe2e342cd1df	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cafadaae2781f18ede228e70894400e
diff --git a/metadata/md5-cache/x11-misc/gpaste-3.40.2 b/metadata/md5-cache/x11-misc/gpaste-3.40.2
index cb25a87..d522d4b 100644
--- a/metadata/md5-cache/x11-misc/gpaste-3.40.2
+++ b/metadata/md5-cache/x11-misc/gpaste-3.40.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=d
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.40.2.tar.gz -> gpaste-3.40.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	977ed3240c7c676eb18a277e65663c1c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	03f1f33473c1c770f4bffe2e342cd1df	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c77f8ca4d0fdf38350f039036123c2b1
diff --git a/metadata/md5-cache/x11-misc/plank-0.11.89 b/metadata/md5-cache/x11-misc/plank-0.11.89
index 6d773a1..1535466 100644
--- a/metadata/md5-cache/x11-misc/plank-0.11.89
+++ b/metadata/md5-cache/x11-misc/plank-0.11.89
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8 x11-libs/gtk+:3 x11-libs/bamf x11-libs/libX11 dev-libs/libdbusmenu x11-libs/libwnck:3
 SLOT=0
 SRC_URI=http://launchpad.net/plank/1.0/0.11.89/+download/plank-0.11.89.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	03f1f33473c1c770f4bffe2e342cd1df	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5c4faa8cd98ec66dcee8fc7d7b8c357