diff --git a/metadata/md5-cache/dev-util/cdecl-9.10 b/metadata/md5-cache/dev-util/cdecl-9.10
new file mode 100644
index 0000000000..5f506801be
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cdecl-9.10
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex 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
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/ncurses:0= readline? ( sys-libs/readline:0= )
+DESCRIPTION=Composing and deciphering C (or C++) declarations or casts, aka "gibberish."
+EAPI=7
+HOMEPAGE=https://github.com/paul-j-lucas/cdecl
+INHERIT=autotools
+IUSE=+readline
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0= readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://github.com/paul-j-lucas/cdecl/archive/cdecl-9.10.tar.gz
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=e3d9882d25c7cbe75e5d61ba3974c6cd
diff --git a/metadata/md5-cache/net-vpn/riseup-vpn-0.21.2 b/metadata/md5-cache/net-vpn/riseup-vpn-0.21.2
deleted file mode 100644
index 823949d147..0000000000
--- a/metadata/md5-cache/net-vpn/riseup-vpn-0.21.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-qt/linguist-tools test? ( dev-qt/qttest ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/alabaster[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) >=dev-lang/go-1.12 app-arch/unzip test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile install postinst postrm preinst prepare test unpack
-DEPEND=dev-go/go-text dev-libs/libappindicator:3 dev-util/debhelper sys-apps/fakeroot x11-libs/gtk+:3 dev-qt/qtdeclarative[widgets] dev-qt/qtquickcontrols2[widgets] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Anonymous encrypted VPN client powered by Bitmask
-EAPI=7
-HOMEPAGE=https://bitmask.net https://0xacab.org/leap/bitmask-vpn https://riseup.net/en/vpn
-INHERIT=desktop python-r1 docs go-module l10n virtualx xdg
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 BSD-2 CC0-1.0 MIT BSD
-RDEPEND=dev-go/go-text dev-libs/libappindicator:3 dev-util/debhelper sys-apps/fakeroot x11-libs/gtk+:3 dev-qt/qtdeclarative[widgets] dev-qt/qtquickcontrols2[widgets] net-vpn/openvpn sys-auth/polkit python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=mirror !test? ( test )
-SLOT=0
-SRC_URI=https://0xacab.org/leap/bitmask-vpn/-/archive/0.21.2/bitmask-vpn-0.21.2.tar.gz -> riseup-vpn-0.21.2.tar.gz mirror://goproxy//0xacab.org/leap/shapeshifter/@v/v0.0.0-20191029173606-85d3e8ac43e2.zip -> 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.zip mirror://goproxy//0xacab.org/leap/shapeshifter/@v/v0.0.0-20191029173606-85d3e8ac43e2.mod -> 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.mod mirror://goproxy//github.com/!operator!foundation/obfs4/@v/v0.0.0-20161108041644-17f2cb99c264.zip -> github.com%2F!operator!foundation%2Fobfs4%2F@v%2Fv0.0.0-20161108041644-17f2cb99c264.zip mirror://goproxy//github.com/!operator!foundation/obfs4/@v/v0.0.0-20161108041644-17f2cb99c264.mod -> github.com%2F!operator!foundation%2Fobfs4%2F@v%2Fv0.0.0-20161108041644-17f2cb99c264.mod mirror://goproxy//github.com/!operator!foundation/shapeshifter-ipc/@v/v0.0.0-20170814234159-11746ba927e0.zip -> github.com%2F!operator!foundation%2Fshapeshifter-ipc%2F@v%2Fv0.0.0-20170814234159-11746ba927e0.zip mirror://goproxy//github.com/!operator!foundation/shapeshifter-ipc/@v/v0.0.0-20170814234159-11746ba927e0.mod -> github.com%2F!operator!foundation%2Fshapeshifter-ipc%2F@v%2Fv0.0.0-20170814234159-11746ba927e0.mod mirror://goproxy//github.com/!operator!foundation/shapeshifter-transports/@v/v0.0.0-20191101030951-7a751b0500f4.zip -> github.com%2F!operator!foundation%2Fshapeshifter-transports%2F@v%2Fv0.0.0-20191101030951-7a751b0500f4.zip mirror://goproxy//github.com/!operator!foundation/shapeshifter-transports/@v/v0.0.0-20191101030951-7a751b0500f4.mod -> github.com%2F!operator!foundation%2Fshapeshifter-transports%2F@v%2Fv0.0.0-20191101030951-7a751b0500f4.mod mirror://goproxy//github.com/!proton!mail/go-autostart/@v/v0.0.0-20181114175602-c5272053443a.zip -> github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.zip mirror://goproxy//github.com/!proton!mail/go-autostart/@v/v0.0.0-20181114175602-c5272053443a.mod -> github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.mod mirror://goproxy//github.com/agl/ed25519/@v/v0.0.0-20170116200512-5312a6153412.zip -> github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip mirror://goproxy//github.com/agl/ed25519/@v/v0.0.0-20170116200512-5312a6153412.mod -> github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod mirror://goproxy//github.com/apparentlymart/go-openvpn-mgmt/@v/v0.0.0-20161009010951-9a305aecd7f2.zip -> github.com%2Fapparentlymart%2Fgo-openvpn-mgmt%2F@v%2Fv0.0.0-20161009010951-9a305aecd7f2.zip mirror://goproxy//github.com/apparentlymart/go-openvpn-mgmt/@v/v0.0.0-20161009010951-9a305aecd7f2.mod -> github.com%2Fapparentlymart%2Fgo-openvpn-mgmt%2F@v%2Fv0.0.0-20161009010951-9a305aecd7f2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.zip -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.mod -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod mirror://goproxy//github.com/keybase/go-ps/@v/v0.0.0-20190827175125-91aafc93ba19.zip -> github.com%2Fkeybase%2Fgo-ps%2F@v%2Fv0.0.0-20190827175125-91aafc93ba19.zip mirror://goproxy//github.com/keybase/go-ps/@v/v0.0.0-20190827175125-91aafc93ba19.mod -> github.com%2Fkeybase%2Fgo-ps%2F@v%2Fv0.0.0-20190827175125-91aafc93ba19.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.7.zip -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.7.zip mirror://goproxy//github.com/rakyll/statik/@v/v0.1.7.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/sevlyar/go-daemon/@v/v0.1.5.zip -> github.com%2Fsevlyar%2Fgo-daemon%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/sevlyar/go-daemon/@v/v0.1.5.mod -> github.com%2Fsevlyar%2Fgo-daemon%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191105034135-c7e5f84aec59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191105034135-c7e5f84aec59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191105034135-c7e5f84aec59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191105034135-c7e5f84aec59.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	docs	1541edddf7c7971612b5b9cec370f875	go-module	92660621959e7fab813173772987588b	l10n	8cdd85e169b835d518bc2fd59f780d8e	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=3301ebbffdd2354326f0dd1c45475b12
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 62653d8f32..407b0034a7 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -370,6 +370,7 @@ dev-scheme/guile-gi 0.3.1 9999: Bindings for GObject Introspection and libgirepo
 dev-scheme/owl-lisp 0.2 9999: Purely functional dialect of Scheme
 dev-util/FoBiS 3.0.5: FoBiS.py, a Fortran Building System for poor men
 dev-util/beautysh 6.0.1 6.1.0: Bash beautifier for the masses
+dev-util/cdecl 9.10: Composing and deciphering C (or C++) declarations or casts, aka "gibberish."
 dev-util/codespell 1.17.1 2.0.0: Check text files for common misspellings
 dev-util/devscripts 2.21.2: Scripts to make the life of a Debian Package maintainer easier
 dev-util/gammaray 2.11.2: High-level runtime introspection tool for Qt applications
@@ -579,7 +580,6 @@ net-p2p/monero 0.17.2.0 9999: The secure, private, untraceable cryptocurrency
 net-p2p/nuxhash 1.0.0_beta2_p20191013: NiceHash cryptocurrency mining client for Linux
 net-p2p/trezord-go 2.0.29-r1 2.0.30: TREZOR Communication Daemon
 net-p2p/yggdrasil-go 0.3.13-r1 0.3.14 0.3.15: An experiment in scalable routing as an encrypted IPv6 overlay network
-net-vpn/riseup-vpn 0.21.2: Anonymous encrypted VPN client powered by Bitmask
 net-wireless/rtl8192eu 0_pre20210403: Realtek 8192EU driver module for Linux kernel
 net-wireless/rtl8821ce 0_pre20210321: Realtek RTL8821CE Driver module for Linux kernel
 net-wireless/rtl8821cu 0_pre20210327: Realtek 8821CU/RTL8811CU module for Linux kernel
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 707cfff9f5..f8e3f8ae05 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 22 May 2021 13:20:03 +0000
+Sat, 22 May 2021 15:20:19 +0000