2021-04-06 18:45:19 UTC

59 files changed, 273 insertions, 355 deletions

diff --git a/metadata/md5-cache/app-text/enscript-1.6.6 b/metadata/md5-cache/app-text/enscript-1.6.6
index 645256880e30..c38afa6e1d8c 100644
--- a/metadata/md5-cache/app-text/enscript-1.6.6
+++ b/metadata/md5-cache/app-text/enscript-1.6.6
@@ -3,12 +3,12 @@ DEPEND=sys-devel/flex sys-devel/bison nls? ( sys-devel/gettext )
 DESCRIPTION=Powerful text-to-postscript converter
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/enscript/enscript.html
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 IUSE=nls ruby
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/enscript/enscript-1.6.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=c7fae6f7bf72d2f7a96cd82fdcecec55
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=26584bf775c7a3ce89bc4c281f55bedf
diff --git a/metadata/md5-cache/dev-games/KXL-1.1.7-r2 b/metadata/md5-cache/dev-games/KXL-1.1.7-r2
deleted file mode 100644
index 37a486da0441..000000000000
--- a/metadata/md5-cache/dev-games/KXL-1.1.7-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Development Library for making games for X
-EAPI=5
-HOMEPAGE=http://kxl.orz.hm/
-INHERIT=eutils autotools ltprune
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://kxl.hn.org/download/KXL-1.1.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=c6ea44e79dda816c02741bbde121db75
diff --git a/metadata/md5-cache/dev-games/KXL-1.1.7-r3 b/metadata/md5-cache/dev-games/KXL-1.1.7-r3
new file mode 100644
index 000000000000..94d6f09fa355
--- /dev/null
+++ b/metadata/md5-cache/dev-games/KXL-1.1.7-r3
@@ -0,0 +1,14 @@
+BDEPEND=>=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 install prepare
+DEPEND=x11-libs/libX11
+DESCRIPTION=Development Library for making games for X
+EAPI=7
+HOMEPAGE=http://kxl.orz.hm/
+INHERIT=autotools
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=http://kxl.hn.org/download/KXL-1.1.7.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=d2ee72d62f84b23a31c355f73d5f3b61
diff --git a/metadata/md5-cache/dev-games/newton-3.14 b/metadata/md5-cache/dev-games/newton-3.14
index 556d770892dc..1b1ed0aa0f06 100644
--- a/metadata/md5-cache/dev-games/newton-3.14
+++ b/metadata/md5-cache/dev-games/newton-3.14
@@ -1,12 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/tinyxml
 DESCRIPTION=Integrated solution for real time simulation of physics environments
-EAPI=6
+EAPI=7
 HOMEPAGE=http://newtondynamics.com/forum/newton.php
-INHERIT=cmake-utils toolchain-funcs
+INHERIT=cmake
 KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://github.com/MADEAPPS/newton-dynamics/archive/newton-3.14.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=0d478901a9b64a1a30f25299d1ca16aa
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
+_md5_=bcae931276691256e96f12d64414624a
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
index a36f08f0e598..86a609c5d689 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++-bindings for qt_gui and creates bindings for every generator available
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	da71fa78ff032d77417ea27fdd3651f0
-_md5_=fad4e15b24e1444a0347549b09a3fb64
+_md5_=62e991395e57eab69cc4f93edad58785
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
index 4ef0562c9c45..383793ad13f3 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=C++-bindings for qt_gui and creates bindings for every generator available
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	da71fa78ff032d77417ea27fdd3651f0
-_md5_=fad4e15b24e1444a0347549b09a3fb64
+_md5_=62e991395e57eab69cc4f93edad58785
diff --git a/metadata/md5-cache/dev-ros/roslint-0.12.0 b/metadata/md5-cache/dev-ros/roslint-0.12.0
index 52ed742f5499..133d7466b3f2 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.12.0
+++ b/metadata/md5-cache/dev-ros/roslint-0.12.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Static checking of Python or C++ source code for errors and standards compliance
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roslint/archive/0.12.0.tar.gz -> roslint-0.12.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	da71fa78ff032d77417ea27fdd3651f0
-_md5_=3d6c6ddd55d56216d89f088c7264b23a
+_md5_=aeaaade39d278de7b6567f1e61fad1f8
diff --git a/metadata/md5-cache/dev-ros/roslint-9999 b/metadata/md5-cache/dev-ros/roslint-9999
index 6e317bbc9332..0be5ecf93a85 100644
--- a/metadata/md5-cache/dev-ros/roslint-9999
+++ b/metadata/md5-cache/dev-ros/roslint-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=Static checking of Python or C++ source code for errors and standards compliance
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	da71fa78ff032d77417ea27fdd3651f0
-_md5_=3d6c6ddd55d56216d89f088c7264b23a
+_md5_=aeaaade39d278de7b6567f1e61fad1f8
diff --git a/metadata/md5-cache/dev-ros/urg_node-0.1.15 b/metadata/md5-cache/dev-ros/urg_node-0.1.15
index 9be54f441036..c8a909d995d9 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.15
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.15
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=ROS wrapper for the Hokuyo urg_c library
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.15.tar.gz -> urg_node-0.1.15.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	da71fa78ff032d77417ea27fdd3651f0
-_md5_=bf0269c79b8accc183ead044866e9d0d
+_md5_=0cbce7a540fe7cc5b53ccb961abf79a7
diff --git a/metadata/md5-cache/dev-ros/urg_node-9999 b/metadata/md5-cache/dev-ros/urg_node-9999
index 3786e479a560..9e64edc9e90c 100644
--- a/metadata/md5-cache/dev-ros/urg_node-9999
+++ b/metadata/md5-cache/dev-ros/urg_node-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=ROS wrapper for the Hokuyo urg_c library
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	da71fa78ff032d77417ea27fdd3651f0
-_md5_=3d45d963661bf7a5c0155e5d7fc7f2fa
+_md5_=0cbce7a540fe7cc5b53ccb961abf79a7
diff --git a/metadata/md5-cache/games-action/atanks-6.4-r1 b/metadata/md5-cache/games-action/atanks-6.4-r1
deleted file mode 100644
index e41f12a76729..000000000000
--- a/metadata/md5-cache/games-action/atanks-6.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=media-libs/allegro:0[X]
-DESCRIPTION=Worms and Scorched Earth-like game
-EAPI=6
-HOMEPAGE=https://atanks.sourceforge.io/
-INHERIT=desktop gnome2-utils toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/allegro:0[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/atanks/atanks-6.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=ed0768e816d185e2fc491a470cc360b2
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.7.4 b/metadata/md5-cache/games-action/extreme-tuxracer-0.7.4
deleted file mode 100644
index 1ede860d9f7b..000000000000
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=media-libs/libsfml-2.2:0= virtual/glu virtual/opengl virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High speed arctic racing game based on Tux Racer
-EAPI=6
-HOMEPAGE=http://extremetuxracer.sourceforge.net/
-INHERIT=autotools desktop gnome2-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/libsfml-2.2:0= virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/extremetuxracer/etr-0.7.4.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=0229d3c673d3c18a1a472818a27874e4
diff --git a/metadata/md5-cache/games-action/solar2-1.10 b/metadata/md5-cache/games-action/solar2-1.10-r1
index a90f6f84d956..1f529fdcb618 100644
--- a/metadata/md5-cache/games-action/solar2-1.10
+++ b/metadata/md5-cache/games-action/solar2-1.10-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare
 DESCRIPTION=An open-world, sandbox game set in an infinite abstract universe
-EAPI=5
+EAPI=7
 HOMEPAGE=http://murudai.com/solar/
-INHERIT=eutils gnome2-utils games
+INHERIT=desktop gnome2-utils wrapper
 IUSE=bundled-libs
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=virtual/opengl amd64? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,sound,video,joystick,abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] !bundled-libs? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] >=media-libs/sdl-mixer-1.2.12-r4[flac,mikmod,mad,mp3,vorbis,abi_x86_32(-)] >=media-libs/libmikmod-3.2.0[abi_x86_32(-)] ) ) x86? ( media-libs/flac media-libs/libsdl[X,sound,video,joystick] media-libs/libvorbis !bundled-libs? ( dev-lang/mono media-libs/libmad media-libs/libmikmod media-libs/openal media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis] ) ) games-misc/games-envd
+RDEPEND=virtual/opengl amd64? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,sound,video,joystick,abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] !bundled-libs? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] >=media-libs/sdl-mixer-1.2.12-r4[flac,mikmod,mad,mp3,vorbis,abi_x86_32(-)] >=media-libs/libmikmod-3.2.0[abi_x86_32(-)] ) ) x86? ( media-libs/flac media-libs/libsdl[X,sound,video,joystick] media-libs/libvorbis !bundled-libs? ( dev-lang/mono media-libs/libmad media-libs/libmikmod media-libs/openal media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis] ) )
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=solar2-linux-1.10.tar.gz https://dev.gentoo.org/~chewi/distfiles/solar2.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=d99222fdb99181f959cd00238241d9d3
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
+_md5_=18f428078737eb9c80c9282a8440623d
diff --git a/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1 b/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
index c96fe17dbb72..2483f395c5c1 100644
--- a/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
+++ b/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-cpp/yaml-cpp media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,j
 SLOT=0
 SRC_URI=https://github.com/mmatyas/supermariowar/archive/v2.0-beta.1.tar.gz -> supermariowar-2.0_beta1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=147fa847eee8113b5a40500a4cd626e8
+_md5_=a91d9e4ab6a745c93771af38bdced48a
diff --git a/metadata/md5-cache/games-arcade/cavezofphear-0.5.1 b/metadata/md5-cache/games-arcade/cavezofphear-0.5.1
deleted file mode 100644
index 63f382ccc5de..000000000000
--- a/metadata/md5-cache/games-arcade/cavezofphear-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5:0 virtual/pkgconfig
-DESCRIPTION=A boulder dash / digger-like game for console using ncurses
-EAPI=5
-HOMEPAGE=http://www.x86.no/cavezofphear/
-INHERIT=eutils games
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5:0 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gentoo/phear-0.5.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=d28c4000888eecedb7701d44cb1d06d7
diff --git a/metadata/md5-cache/games-arcade/cavezofphear-0.5.1-r1 b/metadata/md5-cache/games-arcade/cavezofphear-0.5.1-r1
new file mode 100644
index 000000000000..40524951288d
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/cavezofphear-0.5.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5:0=
+DESCRIPTION=A boulder dash / digger-like game for console using ncurses
+EAPI=7
+HOMEPAGE=http://www.x86.no/cavezofphear/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5:0=
+SLOT=0
+SRC_URI=mirror://gentoo/phear-0.5.1.tar.bz2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=28345df7db2cc1308fb3c5fe22040a00
diff --git a/metadata/md5-cache/games-arcade/gish-demo-1.6-r1 b/metadata/md5-cache/games-arcade/gish-demo-1.6-r1
index d57b33dc0071..79572a8f8989 100644
--- a/metadata/md5-cache/games-arcade/gish-demo-1.6-r1
+++ b/metadata/md5-cache/games-arcade/gish-demo-1.6-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install
 DESCRIPTION=Play as an amorphous ball of tar that rolls and squishes around
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.chroniclogic.com/gish.htm
-INHERIT=eutils
+INHERIT=wrapper
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=media-libs/libsdl media-libs/libvorbis virtual/opengl x11-libs/libX11 >=media-libs/openal-1.6.372
+RDEPEND=>=media-libs/openal-1.6.372 media-libs/libsdl media-libs/libvorbis virtual/opengl x11-libs/libX11
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://www.chroniclogic.com/demos/gishdemo.tar.gz -> gish-demo-1.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=880a00b48c69ccc07d6290fba4f1bc7f
+_eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=43301100e27707d8fbca5b3a7ba938f5
diff --git a/metadata/md5-cache/games-arcade/jumpnbump-1.50-r2 b/metadata/md5-cache/games-arcade/jumpnbump-1.50-r2
deleted file mode 100644
index a13b2455429c..000000000000
--- a/metadata/md5-cache/games-arcade/jumpnbump-1.50-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/sdl-mixer media-libs/libsdl[sound,joystick,video] media-libs/sdl-net X? ( x11-libs/libXext ) kde? ( kde-apps/kdialog ) music? ( media-libs/sdl-mixer[mod] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A funny multiplayer game about cute little fluffy bunnies
-EAPI=6
-HOMEPAGE=http://www.jumpbump.mine.nu/
-INHERIT=autotools desktop
-IUSE=X fbcon kde svga tk +music
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/sdl-mixer media-libs/libsdl[sound,joystick,video] media-libs/sdl-net X? ( x11-libs/libXext ) kde? ( kde-apps/kdialog ) music? ( media-libs/sdl-mixer[mod] ) tk? ( dev-lang/tcl:0= dev-lang/tk:0= )
-SLOT=0
-SRC_URI=http://www.jumpbump.mine.nu/port/jumpnbump-1.50.tar.gz mirror://gentoo/jumpnbump-1.50-autotool.patch.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=605870343dfe7821b219f9eb98ee0390
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
index 781e8867a41c..b024b3c4f06b 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/0dbe8fb2eaa608a6540df3d269648a596c29cf4b.tar.gz -> dolphin-5.0_p20200705.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=fb38f5f2a35e0bbbec63b919d01d527f
+_md5_=975c9caed1349a28087eff8a3f10eea2
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index b3dcff5aa405..1a9f1626f3d5 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=0a056137155f4102acbf56b1a56c4437
+_md5_=07808dd5444101820da3ec5522430a38
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r8 b/metadata/md5-cache/games-emulation/zsnes-1.51-r8
deleted file mode 100644
index e18cff55c780..000000000000
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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=compile configure install prepare
-DEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] ) dev-lang/nasm debug? ( virtual/pkgconfig )
-DESCRIPTION=SNES (Super Nintendo) emulator that uses x86 assembly
-EAPI=7
-HOMEPAGE=https://www.zsnes.com/ http://ipherswipsite.com/zsnes/
-INHERIT=autotools desktop flag-o-matic toolchain-funcs pax-utils
-IUSE=ao custom-cflags +debug opengl png
-KEYWORDS=-* ~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
-SLOT=0
-SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2 -> zsnes-1.51-20071031.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=c1849e6bafd47d7f282c788236667f81
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r9 b/metadata/md5-cache/games-emulation/zsnes-1.51-r9
index e37636513e67..9c5ac560a461 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r9
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r9
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-lang/nasm debug? ( virtual/pkgconfig ) >=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=compile configure install prepare
-DEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] ) dev-lang/nasm debug? ( virtual/pkgconfig )
+DEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
 DESCRIPTION=SNES (Super Nintendo) emulator that uses x86 assembly
 EAPI=7
 HOMEPAGE=https://www.zsnes.com/ http://ipherswipsite.com/zsnes/
@@ -12,4 +12,4 @@ RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[ab
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2 -> zsnes-1.51-20071031.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=72d7eeff5d03b6117df4963ab08925de
+_md5_=088061c3020343ef5a4d83132ae9c8e9
diff --git a/metadata/md5-cache/games-fps/etqw-bin-1.5-r2 b/metadata/md5-cache/games-fps/etqw-bin-1.5-r2
deleted file mode 100644
index 54726fa677cb..000000000000
--- a/metadata/md5-cache/games-fps/etqw-bin-1.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Enemy Territory: Quake Wars
-EAPI=5
-HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/
-INHERIT=eutils games
-IUSE=cdinstall
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=ETQW
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] cdinstall? ( games-fps/etqw-data ) games-misc/games-envd
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://ftp.jeuxlinux.fr/files/ETQW-client-1.5-full.x86.run
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=5e6f3b8768e5cda24e38525ac12c4186
diff --git a/metadata/md5-cache/games-fps/etqw-bin-1.5-r3 b/metadata/md5-cache/games-fps/etqw-bin-1.5-r3
new file mode 100644
index 000000000000..6433d69b05e5
--- /dev/null
+++ b/metadata/md5-cache/games-fps/etqw-bin-1.5-r3
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=Enemy Territory: Quake Wars
+EAPI=7
+HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/
+INHERIT=desktop wrapper
+IUSE=cdinstall
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ETQW
+RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] sys-libs/glibc >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_32(-)] amd64? ( sys-libs/glibc[multilib] ) cdinstall? ( games-fps/etqw-data )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=http://ftp.jeuxlinux.fr/files/ETQW-client-1.5-full.x86.run
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=63de591f129c7c551aa4667291c11fec
diff --git a/metadata/md5-cache/games-fps/ezquake-bin-2.2 b/metadata/md5-cache/games-fps/ezquake-bin-2.2
deleted file mode 100644
index ea1a10c1b37b..000000000000
--- a/metadata/md5-cache/games-fps/ezquake-bin-2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=cdinstall? ( games-fps/quake1-data )
-DESCRIPTION=Quakeworld client with mqwcl functionality and many more features
-EAPI=5
-HOMEPAGE=http://ezquake.sf.net/
-INHERIT=games
-IUSE=cdinstall
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=cdinstall? ( games-fps/quake1-data ) virtual/opengl x11-libs/libXxf86dga x11-libs/libXxf86vm games-misc/games-envd
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=amd64? ( mirror://sourceforge/ezquake/ezquake_linux-x86_64.1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux64_2.2.tar.gz ) x86? ( mirror://sourceforge/ezquake/ezquake_linux-x86_1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux32_2.2.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=d80fd4804e5779995cc4eb782e61adda
diff --git a/metadata/md5-cache/games-fps/ezquake-bin-2.2-r1 b/metadata/md5-cache/games-fps/ezquake-bin-2.2-r1
new file mode 100644
index 000000000000..618f3637ad17
--- /dev/null
+++ b/metadata/md5-cache/games-fps/ezquake-bin-2.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=cdinstall? ( games-fps/quake1-data )
+DESCRIPTION=Quakeworld client with mqwcl functionality and many more features
+EAPI=7
+HOMEPAGE=http://ezquake.sf.net/
+INHERIT=wrapper
+IUSE=cdinstall
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=cdinstall? ( games-fps/quake1-data ) virtual/opengl x11-libs/libXxf86dga x11-libs/libXxf86vm
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=amd64? ( mirror://sourceforge/ezquake/ezquake_linux-x86_64.1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux64_2.2.tar.gz ) x86? ( mirror://sourceforge/ezquake/ezquake_linux-x86_1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux32_2.2.tar.gz )
+_eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f34955942d46b7e64adbd10e665cb773
diff --git a/metadata/md5-cache/games-fps/glxquake-bin-0-r2 b/metadata/md5-cache/games-fps/glxquake-bin-0-r2
deleted file mode 100644
index d2ba17c0f3e9..000000000000
--- a/metadata/md5-cache/games-fps/glxquake-bin-0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=A binary that works with any 3D-graphics-card that supports the glx X-extension
-EAPI=5
-HOMEPAGE=http://mfcn.ilo.de/glxquake/
-INHERIT=games
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=42875a9f9b5043a8ef7456eded0670f6
diff --git a/metadata/md5-cache/games-fps/glxquake-bin-0-r3 b/metadata/md5-cache/games-fps/glxquake-bin-0-r3
new file mode 100644
index 000000000000..46ebe7e9c1da
--- /dev/null
+++ b/metadata/md5-cache/games-fps/glxquake-bin-0-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=A binary that works with any 3D-graphics-card that supports the glx X-extension
+EAPI=7
+HOMEPAGE=http://mfcn.ilo.de/glxquake/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz
+_md5_=f45375e0e7abb57808e030fcf0a6893b
diff --git a/metadata/md5-cache/games-fps/quake1-rally-1.2 b/metadata/md5-cache/games-fps/quake1-rally-1.2
deleted file mode 100644
index 596e5b1a2195..000000000000
--- a/metadata/md5-cache/games-fps/quake1-rally-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=TC which turns Quake into a Rally racing game
-EAPI=5
-HOMEPAGE=http://wiki.quakeworld.nu/Quake_Rally
-INHERIT=eutils games
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=games-misc/games-envd
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=http://ehall.freeshell.org/quake/qr12.zip http://ehall.freeshell.org/quake/qrlo1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=2d6dae53a2bacb17e41261ea10382a7a
diff --git a/metadata/md5-cache/games-fps/quake1-rally-1.2-r1 b/metadata/md5-cache/games-fps/quake1-rally-1.2-r1
new file mode 100644
index 000000000000..ccc52422d578
--- /dev/null
+++ b/metadata/md5-cache/games-fps/quake1-rally-1.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install unpack
+DESCRIPTION=TC which turns Quake into a Rally racing game
+EAPI=7
+HOMEPAGE=http://wiki.quakeworld.nu/Quake_Rally
+INHERIT=edos2unix
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://ehall.freeshell.org/quake/qr12.zip http://ehall.freeshell.org/quake/qrlo1.zip
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773
+_md5_=5a5967924111e333094f153c0c26a78c
diff --git a/metadata/md5-cache/games-fps/yamagi-quake2-7.43 b/metadata/md5-cache/games-fps/yamagi-quake2-7.43
deleted file mode 100644
index 7b476a2d7eb0..000000000000
--- a/metadata/md5-cache/games-fps/yamagi-quake2-7.43
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=client? ( media-libs/libsdl2[video] !openal? ( media-libs/libsdl2[sound] ) opengl? ( media-libs/libsdl2[opengl] virtual/opengl ) )
-DESCRIPTION=Quake 2 engine focused on single player
-EAPI=7
-HOMEPAGE=https://www.yamagi.org/quake2/
-IUSE=+client ctf dedicated openal +opengl rogue softrender xatrix
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=client? ( media-libs/libsdl2[video] !openal? ( media-libs/libsdl2[sound] ) opengl? ( media-libs/libsdl2[opengl] virtual/opengl ) ) client? ( openal? ( media-libs/openal ) )
-REQUIRED_USE=|| ( client dedicated ) client? ( || ( opengl softrender ) )
-SLOT=0
-SRC_URI=https://deponie.yamagi.org/quake2/quake2-7.43.tar.xz ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-1.07.tar.xz ) rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-2.07.tar.xz ) xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-2.08.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f03d357d6583970002a3feeda71eaca1
diff --git a/metadata/md5-cache/games-misc/cowsay-3.04 b/metadata/md5-cache/games-misc/cowsay-3.04-r1
index 713d63739cd6..a3205561dcc7 100644
--- a/metadata/md5-cache/games-misc/cowsay-3.04
+++ b/metadata/md5-cache/games-misc/cowsay-3.04-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Configurable talking ASCII cow (and other characters)
 EAPI=7
 HOMEPAGE=https://github.com/tnalpgge/rank-amateur-cowsay
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86 ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/perl-5
 SLOT=0
 SRC_URI=https://github.com/tnalpgge/rank-amateur-cowsay/archive/cowsay-3.04.tar.gz
-_md5_=298d5afe403b75d4faf94e70a7bb2193
+_md5_=6b5c942a5256e33aca53103498722631
diff --git a/metadata/md5-cache/games-misc/little-inferno-20130509 b/metadata/md5-cache/games-misc/little-inferno-20130509
deleted file mode 100644
index 9b93a3fe9a59..000000000000
--- a/metadata/md5-cache/games-misc/little-inferno-20130509
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Throw your toys into your fire, and play with them as they burn
-EAPI=5
-HOMEPAGE=http://tomorrowcorporation.com/
-INHERIT=eutils gnome2-utils unpacker games
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Gameplay-Group-EULA
-RDEPEND=>=net-misc/curl-7.37.0-r1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] !bundled-libs? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/openal-1.15.1-r1[abi_x86_32(-)] ) games-misc/games-envd
-RESTRICT=bindist fetch bundled-libs? ( splitdebug )
-SLOT=0
-SRC_URI=LittleInferno-20130509.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	unpacker	517f16af48ee3ab88180dd58b5143213	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=a8c20f1ad3f3b1e373e303234fe70229
diff --git a/metadata/md5-cache/games-misc/little-inferno-20130509-r1 b/metadata/md5-cache/games-misc/little-inferno-20130509-r1
new file mode 100644
index 000000000000..3d7a99a7ac80
--- /dev/null
+++ b/metadata/md5-cache/games-misc/little-inferno-20130509-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DESCRIPTION=Throw your toys into your fire, and play with them as they burn
+EAPI=7
+HOMEPAGE=http://tomorrowcorporation.com/
+INHERIT=desktop gnome2-utils unpacker wrapper
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Gameplay-Group-EULA
+RDEPEND=>=net-misc/curl-7.37.0-r1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] !bundled-libs? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/openal-1.15.1-r1[abi_x86_32(-)] )
+RESTRICT=bindist fetch bundled-libs? ( splitdebug )
+SLOT=0
+SRC_URI=LittleInferno-20130509.sh
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	unpacker	517f16af48ee3ab88180dd58b5143213
+_md5_=6918cba286f2b26ce709124c584b4108
diff --git a/metadata/md5-cache/games-mud/powwow-1.2.16-r1 b/metadata/md5-cache/games-mud/powwow-1.2.16-r1
deleted file mode 100644
index af99bcb9ec7b..000000000000
--- a/metadata/md5-cache/games-mud/powwow-1.2.16-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=PowWow Console MUD Client
-EAPI=6
-HOMEPAGE=https://www.hoopajoo.net/projects/powwow.html
-INHERIT=autotools eutils
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0
-SLOT=0
-SRC_URI=https://www.hoopajoo.net/static/projects/powwow-1.2.16.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=e509e7d5634bc64c8cbe083c2a7cb3f0
diff --git a/metadata/md5-cache/games-puzzle/nightsky-20111222 b/metadata/md5-cache/games-puzzle/nightsky-20111222
deleted file mode 100644
index fc77fbbb141f..000000000000
--- a/metadata/md5-cache/games-puzzle/nightsky-20111222
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
-DESCRIPTION=Puzzle game that puts you inside and ambient and mysterious universe
-EAPI=5
-HOMEPAGE=http://www.nicalis.com/nightsky/
-INHERIT=eutils gnome2-utils games
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm !bundled-libs? ( media-libs/freealut media-libs/freeglut media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib ) games-misc/games-envd
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=nightskyhd-linux-1324519044.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=913dcb79f779359fefcfde1d1d3f9520
diff --git a/metadata/md5-cache/games-puzzle/nightsky-20111222-r1 b/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
new file mode 100644
index 000000000000..a9ec6ed7b161
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare
+DESCRIPTION=Puzzle game that puts you inside and ambient and mysterious universe
+EAPI=7
+HOMEPAGE=http://www.nicalis.com/nightsky/
+INHERIT=desktop gnome2-utils
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm !bundled-libs? ( media-libs/freealut media-libs/freeglut media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib )
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=nightskyhd-linux-1324519044.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
+_md5_=2b5fe8f57a0ed64786b2b06d3cad0553
diff --git a/metadata/md5-cache/games-puzzle/splice-20121120 b/metadata/md5-cache/games-puzzle/splice-20121120
deleted file mode 100644
index c113c6c77bde..000000000000
--- a/metadata/md5-cache/games-puzzle/splice-20121120
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DESCRIPTION=An experimental and artistic puzzler set in a microbial world
-EAPI=5
-HOMEPAGE=http://www.cipherprime.com/games/splice/
-INHERIT=eutils games
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext games-misc/games-envd
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=splice-linux-1353389454.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=eb9a5270e1a48e98df3bfa81f1bd2457
diff --git a/metadata/md5-cache/games-puzzle/splice-20121120-r1 b/metadata/md5-cache/games-puzzle/splice-20121120-r1
new file mode 100644
index 000000000000..f961e42226f1
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/splice-20121120-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch prepare
+DESCRIPTION=An experimental and artistic puzzler set in a microbial world
+EAPI=7
+HOMEPAGE=http://www.cipherprime.com/games/splice/
+INHERIT=desktop wrapper
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=splice-linux-1353389454.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5292e20a0ce4d839047314387ffbba31
diff --git a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1 b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1
deleted file mode 100644
index d24da45126a3..000000000000
--- a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DEPEND=app-arch/bzip2
-DESCRIPTION=Combines elements of adventure, jump&run and physical puzzles
-EAPI=5
-HOMEPAGE=http://www.tinyandbig.com/
-INHERIT=eutils games
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/opengl media-libs/openal x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit ) games-misc/games-envd
-RESTRICT=bindist fetch bundled-libs? ( splitdebug )
-SLOT=0
-SRC_URI=tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=725f13227d4e56b670f4c2da36201147
diff --git a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r1 b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r1
new file mode 100644
index 000000000000..d8dd56bbd8fc
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/bzip2
+DEFINED_PHASES=install nofetch prepare
+DESCRIPTION=Combines elements of adventure, jump&run and physical puzzles
+EAPI=7
+HOMEPAGE=http://www.tinyandbig.com/
+INHERIT=desktop wrapper
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/openal virtual/opengl x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit )
+RESTRICT=bindist fetch bundled-libs? ( splitdebug )
+SLOT=0
+SRC_URI=tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e780514d162917d69174e598a4f4abc0
diff --git a/metadata/md5-cache/games-roguelike/FTL-1.5.13 b/metadata/md5-cache/games-roguelike/FTL-1.5.13
deleted file mode 100644
index 59f5536f25e3..000000000000
--- a/metadata/md5-cache/games-roguelike/FTL-1.5.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DESCRIPTION=Faster Than Light: A spaceship simulation real-time roguelike-like game
-EAPI=5
-HOMEPAGE=http://www.ftlgame.com/
-INHERIT=eutils games
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved Boost-1.0 free-noncomm MIT bundled-libs? ( FTL LGPL-2.1 ZLIB libpng )
-RDEPEND=sys-devel/gcc[cxx] virtual/opengl !bundled-libs? ( media-libs/devil[png] media-libs/freetype:2 media-libs/libsdl[X,sound,joystick,opengl,video] sys-libs/zlib ) games-misc/games-envd
-RESTRICT=fetch bindist splitdebug
-SLOT=0
-SRC_URI=FTL.1.5.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=221977a1f098dbf84a9b773aee96d67b
diff --git a/metadata/md5-cache/games-roguelike/FTL-1.5.13-r1 b/metadata/md5-cache/games-roguelike/FTL-1.5.13-r1
new file mode 100644
index 000000000000..68725fde481c
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/FTL-1.5.13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch prepare
+DESCRIPTION=Faster Than Light: A spaceship simulation real-time roguelike-like game
+EAPI=7
+HOMEPAGE=http://www.ftlgame.com/
+INHERIT=desktop wrapper
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved Boost-1.0 free-noncomm MIT bundled-libs? ( FTL LGPL-2.1 ZLIB libpng )
+RDEPEND=sys-devel/gcc[cxx] virtual/opengl !bundled-libs? ( media-libs/devil[png] media-libs/freetype:2 media-libs/libsdl[X,sound,joystick,opengl,video] sys-libs/zlib )
+RESTRICT=fetch bindist splitdebug
+SLOT=0
+SRC_URI=FTL.1.5.13.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc544a644b12091e520421722df06910
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608 b/metadata/md5-cache/games-rpg/dear-esther-20130608
deleted file mode 100644
index 2df2dd34a41b..000000000000
--- a/metadata/md5-cache/games-rpg/dear-esther-20130608
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Ghost story, told using first-person gaming technologies
-EAPI=5
-HOMEPAGE=http://dear-esther.com/
-INHERIT=eutils gnome2-utils unpacker games
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=dearesther-linux-06082013-bin
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	unpacker	517f16af48ee3ab88180dd58b5143213	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=084f7f23b5d0c53c7935efcb6c5721ac
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608-r1 b/metadata/md5-cache/games-rpg/dear-esther-20130608-r1
new file mode 100644
index 000000000000..433c4c8d0b81
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/dear-esther-20130608-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install nofetch postinst postrm preinst unpack
+DESCRIPTION=Ghost story, told using first-person gaming technologies
+EAPI=7
+HOMEPAGE=http://dear-esther.com/
+INHERIT=desktop gnome2-utils unpacker wrapper
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=dearesther-linux-06082013-bin
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	unpacker	517f16af48ee3ab88180dd58b5143213
+_md5_=2ee8e77d02e96d1cc172d42af34b4493
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0 b/metadata/md5-cache/games-rpg/to-the-moon-0
deleted file mode 100644
index cd49aef13bfe..000000000000
--- a/metadata/md5-cache/games-rpg/to-the-moon-0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
-DESCRIPTION=Two doctors traversing the memories of a dying man to fulfill his last wish
-EAPI=5
-HOMEPAGE=http://freebirdgames.com/games/to-the-moon
-INHERIT=eutils unpacker gnome2-utils games
-IUSE=bundled-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )
-RDEPEND=!bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video] media-libs/openal media-libs/sdl2-image[png] media-libs/sdl2-ttf ) sys-libs/zlib virtual/opengl games-misc/games-envd
-RESTRICT=fetch bindist splitdebug
-SLOT=0
-SRC_URI=ToTheMoon_linux_1389114090.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	unpacker	517f16af48ee3ab88180dd58b5143213	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	base	a3f380d8a13f148f16d76fe39e90f451	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	games	0951ae20fe104aff185fd39b62648612
-_md5_=d796de3135b68c4476d2dd1126a87fa2
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0-r1 b/metadata/md5-cache/games-rpg/to-the-moon-0-r1
new file mode 100644
index 000000000000..98a09ecf3976
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/to-the-moon-0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst unpack
+DEPEND=sys-apps/coreutils sys-apps/grep
+DESCRIPTION=Two doctors traversing the memories of a dying man to fulfill his last wish
+EAPI=7
+HOMEPAGE=http://freebirdgames.com/games/to-the-moon
+INHERIT=desktop gnome2-utils unpacker wrapper
+IUSE=bundled-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )
+RDEPEND=sys-libs/zlib virtual/opengl !bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video] media-libs/openal media-libs/sdl2-image[png] media-libs/sdl2-ttf )
+RESTRICT=fetch bindist splitdebug
+SLOT=0
+SRC_URI=ToTheMoon_linux_1389114090.sh
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	unpacker	517f16af48ee3ab88180dd58b5143213
+_md5_=8ae23c87afce4a75ebf2f7512c215462
diff --git a/metadata/md5-cache/games-simulation/openttd-1.10.3 b/metadata/md5-cache/games-simulation/openttd-1.10.3
index 6e1d3e7b6aef..2c1c31f984ca 100644
--- a/metadata/md5-cache/games-simulation/openttd-1.10.3
+++ b/metadata/md5-cache/games-simulation/openttd-1.10.3
@@ -4,6 +4,7 @@ DEPEND=!dedicated? ( media-libs/libsdl2[sound,video] icu? ( dev-libs/icu-layoute
 DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
 EAPI=7
 HOMEPAGE=https://www.openttd.org/
+INHERIT=toolchain-funcs xdg
 IUSE=aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ RDEPEND=!dedicated? ( media-libs/libsdl2[sound,video] icu? ( dev-libs/icu-layout
 RESTRICT=test
 SLOT=0
 SRC_URI=https://proxy.binaries.openttd.org/openttd-releases/1.10.3/openttd-1.10.3-source.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4a3b624f01ca0d1db4b61fc084cdfb6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=1044078d45155c57c0c734706a644fb7
diff --git a/metadata/md5-cache/games-simulation/openttd-9999 b/metadata/md5-cache/games-simulation/openttd-9999
index 167354661c42..dbc0288ac101 100644
--- a/metadata/md5-cache/games-simulation/openttd-9999
+++ b/metadata/md5-cache/games-simulation/openttd-9999
@@ -13,4 +13,4 @@ RDEPEND=!dedicated? ( media-libs/libsdl2[sound,video] icu? ( dev-libs/icu-layout
 RESTRICT=test
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=cc1875ce7eb66492aa0191cdcec15009
+_md5_=ab4812215b62b4a060a963c592974abb
diff --git a/metadata/md5-cache/games-sports/billardgl-1.75-r2 b/metadata/md5-cache/games-sports/billardgl-1.75-r2
index 1f5fa8f01060..9a39e8c2531f 100644
--- a/metadata/md5-cache/games-sports/billardgl-1.75-r2
+++ b/metadata/md5-cache/games-sports/billardgl-1.75-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
 DEPEND=media-libs/freeglut x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu
-DESCRIPTION=an OpenGL billards game
-EAPI=6
+DESCRIPTION=An OpenGL billards game
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/billardgl/
-INHERIT=eutils
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=mirror://sourceforge/billardgl/BillardGL-1.75.tar.gz mirror://gentoo/billardgl.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=6fcf8ac0fae6ef32b30f4d077133842f
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=2a8fcf2a3b82d562aba8dcee0ce2752c
diff --git a/metadata/md5-cache/games-strategy/galaxyhack-1.74-r1 b/metadata/md5-cache/games-strategy/galaxyhack-1.74-r1
index f872485906a9..3fb8eb45da76 100644
--- a/metadata/md5-cache/games-strategy/galaxyhack-1.74-r1
+++ b/metadata/md5-cache/games-strategy/galaxyhack-1.74-r1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install postinst prepare
+DEFINED_PHASES=configure install postinst prepare
 DESCRIPTION=Multiplayer AI script based strategy game
-EAPI=6
+EAPI=7
 HOMEPAGE=http://galaxyhack.sourceforge.net/
-INHERIT=eutils flag-o-matic readme.gentoo-r1
+INHERIT=desktop edos2unix toolchain-funcs readme.gentoo-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 galaxyhack
 SLOT=0
 SRC_URI=mirror://sourceforge/galaxyhack/galaxyhack-1.74.tar.bz2 mirror://gentoo/galaxyhack.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=1a55687f7b06c1ad126b5116cc553b86
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=2f4b43ae373feb429e51562ccd27a929
diff --git a/metadata/md5-cache/games-strategy/warmux-11.04.1-r1 b/metadata/md5-cache/games-strategy/warmux-11.04.1-r1
index dd9659e08ad0..c86653d098b3 100644
--- a/metadata/md5-cache/games-strategy/warmux-11.04.1-r1
+++ b/metadata/md5-cache/games-strategy/warmux-11.04.1-r1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxml2 media-libs/libsdl[joystick,video,X] media-libs/sdl-image
 DESCRIPTION=A free Worms clone
 EAPI=6
 HOMEPAGE=http://gna.org/projects/warmux/
-INHERIT=autotools eutils
+INHERIT=autotools desktop
 IUSE=debug nls unicode
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx media-fonts/dejavu net-misc/curl x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi )
 SLOT=0
 SRC_URI=http://download.gna.org/warmux/warmux-11.04.1.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=2eee56a9699f2af24dc8e305dbb668eb
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=c36a7fa32ca97e7e74e9394ee36c9acb
diff --git a/metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2 b/metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2
index 383c6a087e3d..d5687277b8f6 100644
--- a/metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2
+++ b/metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2
@@ -3,11 +3,9 @@ DEPEND=dev-lang/tcl:0 dev-lang/tk:0 x11-libs/libX11 x11-libs/libXext !games-stra
 DESCRIPTION=A multi-player game of strategy and coordination
 EAPI=6
 HOMEPAGE=https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=xbattle
 RDEPEND=dev-lang/tcl:0 dev-lang/tk:0 x11-libs/libX11 x11-libs/libXext !games-strategy/xbattle
 SLOT=0
 SRC_URI=https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/xbattleai-1.2.2.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=eeb33682008afa8a840736614266eddf
+_md5_=6e99eafc18d69bdc72a576b88d950c2d
diff --git a/metadata/md5-cache/games-util/datutil-2.46 b/metadata/md5-cache/games-util/datutil-2.46
index 19e0dd902eb2..0db4d82aded2 100644
--- a/metadata/md5-cache/games-util/datutil-2.46
+++ b/metadata/md5-cache/games-util/datutil-2.46
@@ -1,12 +1,13 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=Converter for dat files for Rom Managers
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.logiqx.com/Tools/DatUtil/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.logiqx.com/Tools/DatUtil/dutil246.zip http://www.logiqx.com/Tools/DatLib/datlib236.zip
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=237a484f705be12365e8a5981843662d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=550feb080acd66cf4fcf24b07ddb9ff5
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224 b/metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224
index 1f020c30c7f9..0d21bbc58db0 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224
@@ -12,4 +12,4 @@ RDEPEND=aalib? ( >=media-libs/aalib-1.4_rc5-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi
 SLOT=0
 SRC_URI=https://github.com/libsdl-org/SDL-1.2/archive/99d7f1d1c5492f0fb3c799255042ca7a3f4a5de4.tar.gz -> SDL-1.2.15_p20210224.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=05f9da3959d6a5d9beb65454c9d0503c
+_md5_=2d60e13bc46f7978d369dfd3d1d6390f
diff --git a/metadata/md5-cache/net-fs/openafs-1.8.7 b/metadata/md5-cache/net-fs/openafs-1.8.7
index 468e0aa3a052..6a45cb3e8075 100644
--- a/metadata/md5-cache/net-fs/openafs-1.8.7
+++ b/metadata/md5-cache/net-fs/openafs-1.8.7
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl sys-devel/flex virtual/yacc apidoc? ( app-doc/doxygen[dot] media-gfx/graphviz ) doc? ( dev-libs/libxslt || ( dev-java/fop app-text/dblatex app-text/docbook-sgml-utils[jadetex] ) ) perl? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare pretend setup
-DEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=The OpenAFS distributed file system
 EAPI=7
 HOMEPAGE=https://www.openafs.org/
 INHERIT=autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs
-IUSE=apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write kernel_linux kernel_linux dist-kernel
+IUSE=apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write kernel_linux kernel_linux dist-kernel modules
 KEYWORDS=amd64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) virtual/tmpfiles
+RDEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.8.7/openafs-1.8.7-src.tar.bz2 https://openafs.org/dl/openafs/1.8.7/openafs-1.8.7-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20210116.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=dfac90b7fc7b8024d5ff74667d270923
+_md5_=508237a0ef8b0699fc1c97b29ec7e404
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index f0d59b4ad0dd..9a0a6d67ccb8 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -3811,7 +3811,7 @@ dev-erlang/stringprep 1.0.20 1.0.22: Fast Stringprep implementation for Erlang a
 dev-erlang/stun 1.0.33 1.0.38: STUN and TURN library for Erlang and Elixir
 dev-erlang/xmpp 1.4.7 1.4.9: XMPP parsing and serialization library on top of Fast XML
 dev-erlang/yconf 1.0.1 1.0.4 1.0.7: YAML configuration processor
-dev-games/KXL 1.1.7-r2: Development Library for making games for X
+dev-games/KXL 1.1.7-r3: Development Library for making games for X
 dev-games/aseprite 1.1.6 1.1.9: Animated sprite editor & pixel art tool
 dev-games/cardpics 0.4-r1: set of free cards sets
 dev-games/cegui 0.8.7-r100: Crazy Eddie's GUI System
@@ -11134,7 +11134,7 @@ games-action/apotheon 1.26v: Heroic action game set within the vibrant world of
 games-action/armagetronad 0.2.8.3.3-r1: Fast-paced 3D lightcycle game based on Tron
 games-action/assault-android-cactus+ 200507: Arcade style twin stick shooter set in a vivid sci-fi universe
 games-action/astromenace 1.4.1-r1: Hardcore 3D space scroll-shooter with spaceship upgrade possibilities
-games-action/atanks 6.4-r1 6.5: Worms and Scorched Earth-like game
+games-action/atanks 6.5: Worms and Scorched Earth-like game
 games-action/badland 121-r1: Atmospheric side-scrolling action adventure platformer set in a gorgeous forest
 games-action/barrage 1.0.4-r1: A violent point-and-click shooting game
 games-action/battalion 1.4b-r1: Be a rampaging monster and destroy the city
@@ -11157,7 +11157,7 @@ games-action/descent2-vertigo 1.0: Data files for Descent 2: The Vertigo Series
 games-action/descent3 1.4.0b-r2: Descent 3 - 3-Dimensional indoor/outdoor spaceship combat
 games-action/descent3-demo 1.4.0a-r1: Indoor/outdoor 3D combat with evil robotic mining spacecraft
 games-action/dxx-rebirth 0.61.0_pre20200615 9999: Descent Rebirth - enhanced Descent 1 & 2 engine
-games-action/extreme-tuxracer 0.7.4 0.7.5: High speed arctic racing game based on Tux Racer
+games-action/extreme-tuxracer 0.7.5: High speed arctic racing game based on Tux Racer
 games-action/fakk2 1.02-r1: 3D third-person action shooter based on the Heavy Metal comics/movies
 games-action/formido 1.0.1-r2: A shooting game in the spirit of Phobia games
 games-action/garden 1.0.9-r2: Multiplatform vertical shoot-em-up with non-traditional elements
@@ -11187,7 +11187,7 @@ games-action/shadowgrounds-bin 0_p1: an epic action experience combining modern
 games-action/shadowgrounds-survivor-bin 0_p1: human survivors who battle against the ongoing alien onslaught
 games-action/shootingstar 1.2.0-r1: A topdown shooter
 games-action/snipes 1.0.4-r1: 2D scrolling shooter, resembles the old DOS game of same name
-games-action/solar2 1.10: An open-world, sandbox game set in an infinite abstract universe
+games-action/solar2 1.10-r1: An open-world, sandbox game set in an infinite abstract universe
 games-action/spacearyarya-kxl 1.0.2-r2: A 2D/3D shooting game
 games-action/super-hexagon 20160217: A minimal action game by Terry Cavanagh, with music by Chipzel
 games-action/supermariowar 2.0_beta1-r1: Fan-made multiplayer Super Mario Bros. style deathmatch game
@@ -11227,7 +11227,7 @@ games-arcade/bomns 0.99.2-r1: A fast-paced multiplayer deathmatch arcade game
 games-arcade/briquolo 0.5.7: Breakout with 3D representation based on OpenGL
 games-arcade/bumprace 1.5.3-r1: simple arcade racing game
 games-arcade/burgerspace 1.9.2-r1: Clone of the 1982 BurgerTime video game by Data East
-games-arcade/cavezofphear 0.5.1: A boulder dash / digger-like game for console using ncurses
+games-arcade/cavezofphear 0.5.1-r1: A boulder dash / digger-like game for console using ncurses
 games-arcade/cdogs-sdl 0.10.1: Classic overhead run-and-gun game
 games-arcade/ceferino 0.97.8-r2: Super-Pang clone (destroy bouncing balloons with your grapnel)
 games-arcade/circuslinux 1.0.3-r1: clone of the Atari 2600 game "Circus Atari"
@@ -11259,7 +11259,7 @@ games-arcade/insaneodyssey 000311-r1: Help West Muldune escape from a futuristic
 games-arcade/jardinains 2.0-r1: Arkanoid with Gnomes
 games-arcade/jazz2 0.6.6: Open source reimplementation of Jazz Jackrabbit 2
 games-arcade/jazz2-data 0-r20200327: Jazz Jackrabbit 2 data files imported for games-arcade/jazz2
-games-arcade/jumpnbump 1.50-r2 1.61: A funny multiplayer game about cute little fluffy bunnies
+games-arcade/jumpnbump 1.61: A funny multiplayer game about cute little fluffy bunnies
 games-arcade/jvgs 0.5-r100: An open-source platform game with a sketched and minimalistic look
 games-arcade/kajaani-kombat 0.7-r1: A rampart-like game set in space
 games-arcade/kobodeluxe 0.5.1-r2: An SDL port of xkobo, a addictive space shoot-em-up
@@ -11447,7 +11447,7 @@ games-emulation/vbam 2.1.4 9999: Game Boy, GBC, and GBA emulator forked from Vis
 games-emulation/vgba 4.8-r1: Gameboy Advance (GBA) emulator for Linux
 games-emulation/yabause 0.9.15: Sega Saturn emulator
 games-emulation/zinc 1.1-r1: An x86 binary-only emulator for Sony ZN-1, ZN-2, and Namco System 11 arcades
-games-emulation/zsnes 1.51-r8 1.51-r9: SNES (Super Nintendo) emulator that uses x86 assembly
+games-emulation/zsnes 1.51-r9: SNES (Super Nintendo) emulator that uses x86 assembly
 games-engines/box2d 2.4.1: C++ engine for simulating rigid bodies in 2D games
 games-engines/dMagnetic 0.30: A Magnetic Scrolls Interpreter for playing a collection of old text adventures
 games-engines/devilutionx 1.1.0-r2 1.2.0 9999: Diablo engine for modern operating systems
@@ -11477,15 +11477,15 @@ games-fps/doom-data 1.9: The IWAD used by the shareware version of Doom
 games-fps/doomsday 2.1.1-r1 2.3.0: A modern gaming engine for Doom, Heretic, and Hexen
 games-fps/duke3d-data 1.0-r5: Duke Nukem 3D (Atomic Edition) data files
 games-fps/eduke32 20210221.9314: An open source engine port of the classic PC first person shooter Duke Nukem 3D
-games-fps/etqw-bin 1.5-r2: Enemy Territory: Quake Wars
+games-fps/etqw-bin 1.5-r3: Enemy Territory: Quake Wars
 games-fps/etqw-data 1.0-r1: Enemy Territory: Quake Wars data files
 games-fps/etqw-demo 2.0_p1-r2: Enemy Territory: Quake Wars demo
-games-fps/ezquake-bin 2.2: Quakeworld client with mqwcl functionality and many more features
+games-fps/ezquake-bin 2.2-r1: Quakeworld client with mqwcl functionality and many more features
 games-fps/freedm 0.12.1: A 32-level game designed for competitive deathmatch play.
 games-fps/freedm-data 0.12.1: Game resources for FreeDM
 games-fps/freedoom 0.12.1: A complete free-content single-player focused game based on the Doom engine
 games-fps/freedoom-data 0.12.1: Game resources for Freedoom: Phase 1+2
-games-fps/glxquake-bin 0-r2: A binary that works with any 3D-graphics-card that supports the glx X-extension
+games-fps/glxquake-bin 0-r3: A binary that works with any 3D-graphics-card that supports the glx X-extension
 games-fps/gzdoom 4.5.0: A modder-friendly OpenGL source port based on the DOOM engine
 games-fps/industri 1.01: Quake/Tenebrae based, single player game
 games-fps/legends 0.4.1.43-r2: Fast-paced first-person-shooter online multiplayer game, similar to Tribes
@@ -11494,7 +11494,7 @@ games-fps/prboom-plus 2.6: An enhanced clone of the classic first-person shooter
 games-fps/quake1-data 2.40: iD Software's Quake 1 ... the data files
 games-fps/quake1-demodata 1.06: Demo data for Quake 1
 games-fps/quake1-killer 2.2z-r1: The Killer Quake Patch
-games-fps/quake1-rally 1.2: TC which turns Quake into a Rally racing game
+games-fps/quake1-rally 1.2-r1: TC which turns Quake into a Rally racing game
 games-fps/quake1-teamfortress 2.9: The classic Team Fortress Quake World mod
 games-fps/quake1-textures 20050820: Collection of graphical improvements for Quake 1
 games-fps/quake2-data 3.20: iD Software's Quake 2 ... the data files
@@ -11531,7 +11531,7 @@ games-fps/ut2004-demo 3334-r1: Demo for the critically-acclaimed first-person sh
 games-fps/wolfgl 0.93-r2: Wolfenstein and Spear of Destiny port using OpenGL
 games-fps/worldofpadman 1.6-r1: A cartoon style multiplayer first-person shooter
 games-fps/xonotic 0.8.2: Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine
-games-fps/yamagi-quake2 7.43 7.45: Quake 2 engine focused on single player
+games-fps/yamagi-quake2 7.45: Quake 2 engine focused on single player
 games-kids/gcompris 1.0: Full featured educational application for children from 2 to 10
 games-kids/gmult 8.0-r1: Multiplication Puzzle emulates the multiplication game found in Emacs
 games-kids/lletters 0.1.95-r4: Game that helps young kids learn their letters and numbers
@@ -11543,7 +11543,7 @@ games-misc/ballerburg 1.2.0-r1: Linux port of the classical Atari ST game Baller
 games-misc/bsd-games 2.17_p28-r1 3.1-r1: collection of games from NetBSD
 games-misc/bsod 0.1-r1: This program will let you experience the authentic Microsoft Windows experience
 games-misc/c++robots 0-r1: ongoing 'King of the Hill' (KotH) tournament
-games-misc/cowsay 3.04: Configurable talking ASCII cow (and other characters)
+games-misc/cowsay 3.04-r1: Configurable talking ASCII cow (and other characters)
 games-misc/doge 3.6.0: wow very terminal doge
 games-misc/exult-sound 0-r2: Sound data for games-engines/exult
 games-misc/fortune-mod 1.99.1-r3: The notorious fortune program
@@ -11569,7 +11569,7 @@ games-misc/funny-manpages 1.3_rc5-r1 2.3: funny manpages collected from various
 games-misc/gBhed 0.17-r1: An Al Bhed translator
 games-misc/games-envd 0: Environment file for gentoo games
 games-misc/gtklife 5.2: A Conway's Life simulator for Unix
-games-misc/little-inferno 20130509: Throw your toys into your fire, and play with them as they burn
+games-misc/little-inferno 20130509-r1: Throw your toys into your fire, and play with them as they burn
 games-misc/lolcat 90.8.8-r1 100.0.1 100.0.1-r1: Rainbows and unicorns!
 games-misc/lucidlife 0.9.2-r1: A Conway's Life simulator written in GTK+2 - fork from Gtklife
 games-misc/nyancat 1.5.1: Nyan Cat Telnet Server
@@ -11596,7 +11596,7 @@ games-mud/gmudix 1.0-r1: GTK+ MUD client with many features and an easy scriptin
 games-mud/gnome-mud 0.11.2-r2 9999: GNOME MUD client
 games-mud/kildclient 3.0.1-r1: Powerful MUD client with a built-in PERL interpreter
 games-mud/mudix 4.3-r2: A small, stable MUD client for the console
-games-mud/powwow 1.2.16-r1 1.2.22: PowWow Console MUD Client
+games-mud/powwow 1.2.22: PowWow Console MUD Client
 games-mud/tf 5.0_beta8_p8: A small, flexible, screen-oriented MUD client (aka TinyFugue)
 games-mud/tintin 2.01.8: (T)he k(I)cki(N) (T)ickin d(I)kumud clie(N)t
 games-mud/tkmoo 0.3.32-r1: MOO Client written in Tcl/Tk
@@ -11658,7 +11658,7 @@ games-puzzle/mirrormagic 2.0.2-r2: A game like Deflektor (C 64) or Mindbender (A
 games-puzzle/monsterz 0.7.1_p11: A little puzzle game, similar to the famous Bejeweled or Zookeeper
 games-puzzle/mures 0.5-r1: A clone of Sega's Chu Chu Rocket
 games-puzzle/neverball 1.6.0-r1: Clone of Super Monkey Ball using SDL/OpenGL
-games-puzzle/nightsky 20111222: Puzzle game that puts you inside and ambient and mysterious universe
+games-puzzle/nightsky 20111222-r1: Puzzle game that puts you inside and ambient and mysterious universe
 games-puzzle/nudoku 2.1.0: ncurses based sudoku game
 games-puzzle/numptyphysics 0.3.5 9999: Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
 games-puzzle/pathological 1.1.3_p16-r1: An enriched clone of the game 'Logical' by Rainbow Arts
@@ -11675,13 +11675,13 @@ games-puzzle/scramble 0.9.5-r1: Create as many words as you can before the time
 games-puzzle/sdl-jewels 1.1.1-r1: Swap and match 3 or more jewels in a line in order to score points
 games-puzzle/seatris 0.0.14-r1: A color ncurses tetris clone
 games-puzzle/sgt-puzzles 20190415 99999999: Simon Tatham's Portable Puzzle Collection
-games-puzzle/splice 20121120: An experimental and artistic puzzler set in a microbial world
+games-puzzle/splice 20121120-r1: An experimental and artistic puzzler set in a microbial world
 games-puzzle/swell-foop 3.34.1: Clear the screen by removing groups of colored and shaped tiles
 games-puzzle/tanglet 1.5.3: Single player word finding game based on Boggle
 games-puzzle/tetrinet 0.11-r2: Console based tetrinet inc. standalone server
 games-puzzle/textmaze 1.2-r1: An ncurses-based maze solving game written in Perl
 games-puzzle/tint 0.03b-r1: Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game
-games-puzzle/tiny-and-big 1.4.1: Combines elements of adventure, jump&run and physical puzzles
+games-puzzle/tiny-and-big 1.4.1-r1: Combines elements of adventure, jump&run and physical puzzles
 games-puzzle/tod 0-r2: Tetanus On Drugs simulates playing Tetris under the influence of drugs
 games-puzzle/tong 1.2-r1: Tetris and Pong in the same place at the same time
 games-puzzle/toppler 1.1.6-r1: Reimplementation of Nebulous using SDL
@@ -11702,7 +11702,7 @@ games-puzzle/xtris 1.15-r1: A networked Tetris-like game
 games-puzzle/xwelltris 1.0.1: 2.5D tetris like game
 games-puzzle/xye 0.12.2: Free version of the classic game Kye
 games-puzzle/zaz 1.0.0-r1: A puzzle game where the player has to arrange balls in triplets
-games-roguelike/FTL 1.5.13: Faster Than Light: A spaceship simulation real-time roguelike-like game
+games-roguelike/FTL 1.5.13-r1: Faster Than Light: A spaceship simulation real-time roguelike-like game
 games-roguelike/FTL-gog 1.6.9.25330: Top-down roguelike space ship simulator
 games-roguelike/adom 1.1.1-r1 1.1.1-r2 3.3.3: Ancient Domains Of Mystery rogue-like game
 games-roguelike/angband 4.2.1 4.2.1-r1: A roguelike dungeon exploration game based on the books of J.R.R. Tolkien
@@ -11729,7 +11729,7 @@ games-rpg/coe2 2007-r2: Precursor to the Dominions series
 games-rpg/comi 1: The Curse of Monkey Island, the third game in the series
 games-rpg/costume-quest 2.0.0.3: A Halloween adventure from Tim Schafer's Double Fine Productions
 games-rpg/daimonin-client 0.10.8: A graphical 2D tile-based MMORPG
-games-rpg/dear-esther 20130608: Ghost story, told using first-person gaming technologies
+games-rpg/dear-esther 20130608-r1: Ghost story, told using first-person gaming technologies
 games-rpg/deponia-doomsday 1.2.0267: The fourth and final instalment of the Deponia point-and-click adventures
 games-rpg/deponia-tcj 3.3.0156: The Complete Journey: The first three Deponia point-and-click adventures
 games-rpg/draci-historie 2012-r1: Bert the little dragon searches for his father
@@ -11755,7 +11755,7 @@ games-rpg/pcgen 6.04.01-r1: D&D character generator
 games-rpg/queen 1-r1: Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s
 games-rpg/soltys 1.0-r2: Classic adventure game
 games-rpg/sumwars 0.5.8-r100: a multi-player, 3D action role-playing game
-games-rpg/to-the-moon 0: Two doctors traversing the memories of a dying man to fulfill his last wish
+games-rpg/to-the-moon 0-r1: Two doctors traversing the memories of a dying man to fulfill his last wish
 games-rpg/vendetta-online-bin 1.8.296-r1: Space-based MMORPG
 games-rpg/wasteland2 1.9.0.13: Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout
 games-rpg/wastesedge 0.3.8: Role playing game to showcase the adonthell engine
@@ -11793,7 +11793,7 @@ games-simulation/singularity 1.0_alpha1-r2 1.00: Simulation of a true AI. Go fro
 games-simulation/sky-rogue 1.3: A fwooshy rogue-lite action flight simulator
 games-simulation/slime-rancher 1.4.1c_p34605: Cute game where you cultivate slimes on a distant planet
 games-simulation/train-valley 1.3.31403: Build railroads in order to connect cities, tunnels, and bridges
-games-sports/billardgl 1.75-r2: an OpenGL billards game
+games-sports/billardgl 1.75-r2: An OpenGL billards game
 games-sports/bygfoot 2.3.2-r1: GTK+2 Soccer Management Game
 games-sports/dustrac 1.13.0: Tile-based, cross-platform 2D racing game
 games-sports/foobillard 3.0a-r1: 8ball, 9ball, snooker and carambol game
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7734dc08fa9e..7c250615ea54 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Apr 2021 18:20:16 +0000
+Tue, 06 Apr 2021 18:45:20 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9bbed2fd17c5..306c8970223a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2987,7 +2987,6 @@ games-arcade/jazz2-data:cc - Install The Christmas Chronicles additional data
 games-arcade/jazz2-data:demo - Use the free demo data instead of the full retail game data
 games-arcade/jazz2-data:gles2-only - Use GLES 2.0 or later instead of full OpenGL 2.1
 games-arcade/jumpnbump:gtk - Install Python-based GTK menu
-games-arcade/jumpnbump:music - Enable playing of background music
 games-arcade/lbreakout2:themes - Install additional themes
 games-arcade/moleinvasion:music - Download and install the music files
 games-arcade/oshu:osu-skin - Include more complete osu-skin (other is minimal)