diff --git a/app-emulation/81_libretro/81_libretro-1.0a_20211015.recipe b/app-emulation/81_libretro/81_libretro-1.0a_20211204.recipe
similarity index 91%
rename from app-emulation/81_libretro/81_libretro-1.0a_20211015.recipe
rename to app-emulation/81_libretro/81_libretro-1.0a_20211204.recipe
index eddbd4df3..34d694f7e 100644
--- a/app-emulation/81_libretro/81_libretro-1.0a_20211015.recipe
+++ b/app-emulation/81_libretro/81_libretro-1.0a_20211204.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/libretro/81-libretro/"
 COPYRIGHT="2008-2018 Michael D Wynne, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="30344d3499fdb301ee33de136f7b390bebe0756a"
+srcGitRev="7e8153cd5b88cd5cb23fb0c03c04e7c7d8a73159"
 SOURCE_URI="https://github.com/libretro/81-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="7d14325e34d44fc1f2dcb46ae1157fddf1bd6de988bb79020ed422eb37f73082"
+CHECKSUM_SHA256="db2266bdc6e6b552bc007cfc47b50fcf931c112321b5639a05ab014ab43035a6"
 SOURCE_FILENAME="81-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="81-libretro-$srcGitRev"
 ADDITIONAL_FILES="81_libretro.info.in"
diff --git a/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20211016.recipe b/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20211123.recipe
similarity index 91%
rename from app-emulation/cap32_libretro/cap32_libretro-4.2.0_20211016.recipe
rename to app-emulation/cap32_libretro/cap32_libretro-4.2.0_20211123.recipe
index 771972569..07cb7b0be 100644
--- a/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20211016.recipe
+++ b/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20211123.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://sourceforge.net/projects/caprice32/"
 COPYRIGHT="1997-2020 Ulrich Doewich, dantoine, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="b647a3ab1e5528050cf04b0b5114719d212e31a1"
+srcGitRev="06ba0e50b260b4f55c405a0924f33c0baaf1c987"
 SOURCE_URI="https://github.com/libretro/libretro-cap32/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="1d0e5f31fa761320b173b846e29fdc0ed8a60f03e7f13ef141d3cda33ecc7d02"
+CHECKSUM_SHA256="7f4f2e3f2ed580286a0d8129a82976fa88aef07f2f26e4e15a95e0271494ecae"
 SOURCE_FILENAME="cap32-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-cap32-$srcGitRev"
 ADDITIONAL_FILES="cap32_libretro.info.in"
diff --git a/app-emulation/fmsx_libretro/fmsx_libretro-4.9_20211016.recipe b/app-emulation/fmsx_libretro/fmsx_libretro-4.9_20211207.recipe
similarity index 90%
rename from app-emulation/fmsx_libretro/fmsx_libretro-4.9_20211016.recipe
rename to app-emulation/fmsx_libretro/fmsx_libretro-4.9_20211207.recipe
index c90a5584f..563469c1d 100644
--- a/app-emulation/fmsx_libretro/fmsx_libretro-4.9_20211016.recipe
+++ b/app-emulation/fmsx_libretro/fmsx_libretro-4.9_20211207.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://fms.komkon.org/fMSX/"
 COPYRIGHT="1993-2020 Marat Fayzullin, the libretro team"
 LICENSE="fMSX"
 REVISION="1"
-srcGitRev="060b66cb19b1b3d13be81633a790592929d2191e"
+srcGitRev="179ae738fd794ab2312671eece58defb902c02a1"
 SOURCE_URI="https://github.com/libretro/fmsx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="c7d5c120bd4c924974857dda34ae0283f694ee96663811eb0221723e57cacbf7"
+CHECKSUM_SHA256="e0496ee48cfd8abc4549ac15ca8ed0c77e39ed67ea04107685f843de528aa170"
 SOURCE_FILENAME="libretro-fmsx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="fmsx-libretro-$srcGitRev"
 ADDITIONAL_FILES="fmsx_libretro.info.in"
diff --git a/app-emulation/puae_libretro/puae_libretro-2.6.1_20211011.recipe b/app-emulation/puae_libretro/puae_libretro-2.6.1_20211127.recipe
similarity index 92%
rename from app-emulation/puae_libretro/puae_libretro-2.6.1_20211011.recipe
rename to app-emulation/puae_libretro/puae_libretro-2.6.1_20211127.recipe
index d2032944f..64eac123b 100644
--- a/app-emulation/puae_libretro/puae_libretro-2.6.1_20211011.recipe
+++ b/app-emulation/puae_libretro/puae_libretro-2.6.1_20211127.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://github.com/libretro/libretro-uae"
 COPYRIGHT="2014-2021, GnoStiC, Richard Drummond, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="a228c99aa75b7d19a0c3926e28fb4066d9d1987e"
+srcGitRev="3ec4903f23197ace99a451b77ff819eeb248da07"
 SOURCE_URI="https://github.com/libretro/libretro-uae/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a6ee1b262edf2f1082cc495a73c8ee2cc7c9335129dc971b87cec8ba59d9c9f2"
+CHECKSUM_SHA256="ce989c40f340955d9f997334d50b884b38b9dc536fd1774edabfce022221a90b"
 SOURCE_FILENAME="libretro-uae-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-uae-$srcGitRev"
 ADDITIONAL_FILES="puae_libretro.info.in"
diff --git a/games-arcade/xrick_libretro/xrick_libretro-1.0.0.6_20211008.recipe b/games-arcade/xrick_libretro/xrick_libretro-1.0.0.6_20211102.recipe
similarity index 92%
rename from games-arcade/xrick_libretro/xrick_libretro-1.0.0.6_20211008.recipe
rename to games-arcade/xrick_libretro/xrick_libretro-1.0.0.6_20211102.recipe
index 9550ad856..4c5cbb250 100644
--- a/games-arcade/xrick_libretro/xrick_libretro-1.0.0.6_20211008.recipe
+++ b/games-arcade/xrick_libretro/xrick_libretro-1.0.0.6_20211102.recipe
@@ -9,9 +9,9 @@ HOMEPAGE="http://www.xrick.net"
 COPYRIGHT="2000-2021 Bigorno.net, the libretro team"
 LICENSE="xrick"
 REVISION="1"
-srcGitRev="1feefc5d49479d9892fbef677c877bd211753da9"
+srcGitRev="f91e4c8a45d5eacf0a733af219fed33d6e7277ee"
 SOURCE_URI="https://github.com/libretro/xrick-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="30c95a08af94ed9e4e855fceab5755e472ad92ebc088529a2f095ba689b4ff05"
+CHECKSUM_SHA256="53ef5b36e73b3bc1593bfab70abd130e4677181241c6662441275a7583619c69"
 SOURCE_FILENAME="libretro-xrick-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="xrick-libretro-$srcGitRev"
 ADDITIONAL_FILES="xrick_libretro.info.in"
diff --git a/games-emulation/dosbox_pure_libretro/dosbox_pure_libretro-0.13_20211020.recipe b/games-emulation/dosbox_pure_libretro/dosbox_pure_libretro-0.13_20211129.recipe
similarity index 92%
rename from games-emulation/dosbox_pure_libretro/dosbox_pure_libretro-0.13_20211020.recipe
rename to games-emulation/dosbox_pure_libretro/dosbox_pure_libretro-0.13_20211129.recipe
index d8ce0845c..41291b1ef 100644
--- a/games-emulation/dosbox_pure_libretro/dosbox_pure_libretro-0.13_20211020.recipe
+++ b/games-emulation/dosbox_pure_libretro/dosbox_pure_libretro-0.13_20211129.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://github.com/schellingb/dosbox-pure"
 COPYRIGHT="2020-2021 Dosbox team, Bernhard Schelling, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="01f2f5f6f3b5c2c2c58fbd4be7c271542aa84155"
+srcGitRev="f6b8c46650ff60c3316b0a94868ad47d925f8d29"
 SOURCE_URI="https://github.com/schellingb/dosbox-pure/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="fc69f394b0afee84c11dce27b1cc91047fabac428c02d1f3d94ea836bfb8d3a4"
+CHECKSUM_SHA256="72f18cea3de7c594bcdac4cd35a8ed7cd37048553a47be0427798f8d260e7235"
 SOURCE_FILENAME="dosbox-pure-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="dosbox-pure-$srcGitRev"
 ADDITIONAL_FILES="dosbox_pure_libretro.info.in"
diff --git a/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20211024.recipe b/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20211202.recipe
similarity index 91%
rename from games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20211024.recipe
rename to games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20211202.recipe
index 6e0f53c63..c51783f6c 100644
--- a/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20211024.recipe
+++ b/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20211202.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/libretro/FBNeo"
 COPYRIGHT="2000-2019 the Final Burn team, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="714e04c4fd4146babc8ddd7a61c6326a07f4b743"
+srcGitRev="8e9f73ab28fc6176f0bde53eac0f0b561b065e16"
 SOURCE_URI="https://github.com/libretro/FBNeo/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="64066f09790e5c1cbe368c10f269be78ac3b939dcc3c57a999c9af69cee708c8"
+CHECKSUM_SHA256="03999ace4fafd68fdb540c966909b3fd97e34950b1951f97387bcca9852a7e73"
 SOURCE_FILENAME="fbneo-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="FBNeo-$srcGitRev"
 ADDITIONAL_FILES="fbneo_libretro.info.in"
diff --git a/games-emulation/fceumm_libretro/additional-files/fceumm_libretro.info.in b/games-emulation/fceumm_libretro/additional-files/fceumm_libretro.info.in
index 341b73602..fc5646943 100644
--- a/games-emulation/fceumm_libretro/additional-files/fceumm_libretro.info.in
+++ b/games-emulation/fceumm_libretro/additional-files/fceumm_libretro.info.in
@@ -30,13 +30,16 @@ disk_control = "false"
 database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 
 # BIOS / Firmware
-firmware_count = 2
+firmware_count = 3
 firmware0_desc = "disksys.rom (Family Computer Disk System BIOS)"
 firmware0_path = "disksys.rom"
 firmware0_opt = "true"
 firmware1_desc = "nes.pal (custom NES Palette)"
 firmware1_path = "nes.pal"
 firmware1_opt = "true"
-notes = "(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a|(!) nes.pal must be located in system directory."
+firmware2_desc = "gamegenie.nes (Game Genie add-on cartridge)"
+firmware2_path = "gamegenie.nes"
+firmware2_opt = "true"
+notes = "(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a|(!) gamegenie.nes (md5): 7f98d77d7a094ad7d069b74bd553ec98|(!) nes.pal must be located in system directory."
 
 description = "FCEUmm libretro is based on the FCEUmm (mappers modified) fork of the FCEU emulator. It is very fast and supports many mappers, including those for weird, obscure bootleg carts. It is tightly integrated with libretro features, which makes it a good choice for users seeking advanced frontend functionality, such as runahead and rollback netplay. While most NES emulators are lightweight, FCEUmm's particularly low resource requirements make it a good option for mobile, low-power/embedded and console targets."
diff --git a/games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20211022.recipe b/games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20211205.recipe
similarity index 91%
rename from games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20211022.recipe
rename to games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20211205.recipe
index 739d28875..00c650420 100644
--- a/games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20211022.recipe
+++ b/games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20211205.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://cah4e3.shedevr.org.ru/fceultra.php"
 COPYRIGHT="2011-2018 the FCEU team, cah4e3, the libretro team"
 LICENSE="GNU LGPL v2"
 REVISION="1"
-srcGitRev="b99ac9fe9bd71a156d5f8da557ca544d1031ab11"
+srcGitRev="02b5bbf26981b5ae0da81a9f312cb51ed64112b8"
 SOURCE_URI="https://github.com/libretro/libretro-fceumm/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="01dff167fce84c9fc02fc5bb56e0228a051959b63f433ca6337d1919bd038d47"
+CHECKSUM_SHA256="1c293933d9c949660138cc9df434fabd932bcecf557dd2588f53c338cc0e94d8"
 SOURCE_FILENAME="libretro-fceumm-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-fceumm-$srcGitRev"
 ADDITIONAL_FILES="fceumm_libretro.info.in"
diff --git a/games-emulation/flycast_libretro/flycast_libretro-0.1_20211004.recipe b/games-emulation/flycast_libretro/flycast_libretro-0.1_20211203.recipe
similarity index 92%
rename from games-emulation/flycast_libretro/flycast_libretro-0.1_20211004.recipe
rename to games-emulation/flycast_libretro/flycast_libretro-0.1_20211203.recipe
index 7aa379a94..f1f58f8ea 100644
--- a/games-emulation/flycast_libretro/flycast_libretro-0.1_20211004.recipe
+++ b/games-emulation/flycast_libretro/flycast_libretro-0.1_20211203.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/libretro/flycast"
 COPYRIGHT="2013-2021, drk||Raziel, PsyMan, gb_away, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="4a913e063c95d1fae98afc64645831de0bcad57e"
+srcGitRev="041297cc6c266b1185a4414271a10732c946239c"
 SOURCE_URI="https://github.com/libretro/flycast/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="86ce45324d60fa0d328496645dcb0244e4c88b06826c29c5ac65b6f9ac5a629f"
+CHECKSUM_SHA256="ca8b8335f4d10bcfa4b65e5415240aec32194dd2ccc1e21e315a05a27aaca686"
 SOURCE_FILENAME="flycast-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="flycast-$srcGitRev"
 ADDITIONAL_FILES="flycast_libretro.info.in"
diff --git a/games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20211010.recipe b/games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20211203.recipe
similarity index 91%
rename from games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20211010.recipe
rename to games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20211203.recipe
index c44f11fe4..e9faa7d8e 100644
--- a/games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20211010.recipe
+++ b/games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20211203.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="https://github.com/sinamas/gambatte"
 COPYRIGHT="2007-2018 Sindre Aamås, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="9ae0cdfb368d02665a6d9d478a9418b2e199b218"
+srcGitRev="eb6f26a57ff6c35154950da20f83ddf1d44d4ca6"
 SOURCE_URI="https://github.com/libretro/gambatte-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="620b8e34a76a7f5f595b0671c63d65cea98a4ddad0c250017907dde89a8e6831"
+CHECKSUM_SHA256="0a0882e6fa282400bed64c320b0bd7d475d55e3a6e5a2b86acd1ee7ae0bc7f49"
 SOURCE_FILENAME="gambatte-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="gambatte-libretro-$srcGitRev"
 ADDITIONAL_FILES="gambatte_libretro.info.in"
diff --git a/games-emulation/gearboy_libretro/additional-files/gearboy_libretro.info.in b/games-emulation/gearboy_libretro/additional-files/gearboy_libretro.info.in
index ed51a3c25..9e2df7179 100644
--- a/games-emulation/gearboy_libretro/additional-files/gearboy_libretro.info.in
+++ b/games-emulation/gearboy_libretro/additional-files/gearboy_libretro.info.in
@@ -1,13 +1,20 @@
+# Software Information
 display_name = "Nintendo - Game Boy / Color (Gearboy)"
 authors = "Ignacio Sanchez"
 supported_extensions = "gb|dmg|gbc|cgb|sgb"
 corename = "Gearboy"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Game Boy/Game Boy Color"
-systemid = "game_boy"
-database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv3"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy/Game Boy Color"
+systemid = "game_boy"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
+
+description = "A port of the Gearboy Game Boy emulator to libretro. Gearboy is a new and highly accurate Game Boy emulator from indie/homebrew dev and all-around smart guy, drhelius. It supports both Game Boy and Game Boy Color games and is an excellent choice for playing these games on a modern system."
diff --git a/games-emulation/gearboy_libretro/gearboy_libretro-3.4_20210906.recipe b/games-emulation/gearboy_libretro/gearboy_libretro-3.4_20211203.recipe
similarity index 91%
rename from games-emulation/gearboy_libretro/gearboy_libretro-3.4_20210906.recipe
rename to games-emulation/gearboy_libretro/gearboy_libretro-3.4_20211203.recipe
index a4b564300..a9e439dc2 100644
--- a/games-emulation/gearboy_libretro/gearboy_libretro-3.4_20210906.recipe
+++ b/games-emulation/gearboy_libretro/gearboy_libretro-3.4_20211203.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://www.ignaciosanchez.me/projects/gearboy/"
 COPYRIGHT="2012-2020 Ignacio Sánchez, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="cd9c5f76145ee7063fd1708d51f98a6d2d373b9d"
+srcGitRev="14da785758e6bc7d3c4535319c0cc7eb8d9fd0a8"
 SOURCE_URI="https://github.com/drhelius/Gearboy/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="7030a9647f11ab0667e9074b1006d143b416ce22803e586b2beea3ee0347a787"
+CHECKSUM_SHA256="475f3c16be1a217e39d80d3e70ed894abf1b2a4bf02e5fceeb9935561d59d875"
 SOURCE_FILENAME="gearboy-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="Gearboy-$srcGitRev"
 ADDITIONAL_FILES="gearboy_libretro.info.in"
diff --git a/games-emulation/gearcoleco_libretro/gearcoleco_libretro-1.0.0_20210906.recipe b/games-emulation/gearcoleco_libretro/gearcoleco_libretro-1.0.0_20211204.recipe
similarity index 91%
rename from games-emulation/gearcoleco_libretro/gearcoleco_libretro-1.0.0_20210906.recipe
rename to games-emulation/gearcoleco_libretro/gearcoleco_libretro-1.0.0_20211204.recipe
index a34d48df1..e354ea7e3 100644
--- a/games-emulation/gearcoleco_libretro/gearcoleco_libretro-1.0.0_20210906.recipe
+++ b/games-emulation/gearcoleco_libretro/gearcoleco_libretro-1.0.0_20211204.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/drhelius/Gearcoleco"
 COPYRIGHT="2020-2021 Ignacio Sánchez"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="223b96c6f92fe2ece238df8a463334e2dfadaa7d"
+srcGitRev="1046724cb5fe02a588d019a53a2e938e36c620f5"
 SOURCE_URI="https://github.com/drhelius/Gearcoleco/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="36684b0d60e9f9edd203931e4ce8c31f6e95da75e074619ead55a73cc063337e"
+CHECKSUM_SHA256="94d1892aa20d71ba5877b9ff8d09bf426057165b40f3d6a40cd37c1b27dd6374"
 SOURCE_FILENAME="Gearcoleco-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="Gearcoleco-$srcGitRev"
 ADDITIONAL_FILES="gearcoleco_libretro.info.in"
diff --git a/games-emulation/gearsystem_libretro/gearsystem_libretro-3.4.1_20211021.recipe b/games-emulation/gearsystem_libretro/gearsystem_libretro-3.4.1_20211205.recipe
similarity index 91%
rename from games-emulation/gearsystem_libretro/gearsystem_libretro-3.4.1_20211021.recipe
rename to games-emulation/gearsystem_libretro/gearsystem_libretro-3.4.1_20211205.recipe
index 42ad7de7d..e10a72be8 100644
--- a/games-emulation/gearsystem_libretro/gearsystem_libretro-3.4.1_20211021.recipe
+++ b/games-emulation/gearsystem_libretro/gearsystem_libretro-3.4.1_20211205.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://www.ignaciosanchez.me/projects/gearsystem/"
 COPYRIGHT="2012-2021 Ignacio Sánchez, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="ae1beb2f2ec33a3fac996b75f82951a005c58107"
+srcGitRev="a5fba108cce0abac4bcb431b9da628cea5e61411"
 SOURCE_URI="https://github.com/drhelius/Gearsystem/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="3b6aec1767ecc94eae2f22789fbb9ce0263bacc6096bf6f976294e74a2db072d"
+CHECKSUM_SHA256="6261006ecd2a7ac128cd348428825935e0e23342bf8a4a1db15e207272512e8d"
 SOURCE_FILENAME="gearsystem-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="Gearsystem-$srcGitRev"
 ADDITIONAL_FILES="gearsystem_libretro.info.in"
diff --git a/games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20211025.recipe b/games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20211203.recipe
similarity index 92%
rename from games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20211025.recipe
rename to games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20211203.recipe
index cf4959a86..57af537bd 100644
--- a/games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20211025.recipe
+++ b/games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20211203.recipe
@@ -11,9 +11,9 @@ LICENSE="GenesisPlusGX
 	Xiph
 	Zlib"
 REVISION="1"
-srcGitRev="2ef6f58cffbb526e6c9f6210b32e6771e8dd341e"
+srcGitRev="8a7d4c87d2e6936d64c1251c6f968a93cc87cce5"
 SOURCE_URI="https://github.com/libretro/Genesis-Plus-GX/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="158f41d851b5053beba2beb083026e43f114d187f464c36e75c8fc51bce85b4b"
+CHECKSUM_SHA256="cba25da3d7ea25ea70f6a88f30accc31c03f78b7140eade4351ecafcd43db7f1"
 SOURCE_FILENAME="libretro-genesis-plus-gx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="Genesis-Plus-GX-$srcGitRev"
 ADDITIONAL_FILES="genesis_plus_gx_libretro.info.in"
diff --git a/games-emulation/gpsp_libretro/gpsp_libretro-0.91_20211019.recipe b/games-emulation/gpsp_libretro/gpsp_libretro-0.91_20211130.recipe
similarity index 91%
rename from games-emulation/gpsp_libretro/gpsp_libretro-0.91_20211019.recipe
rename to games-emulation/gpsp_libretro/gpsp_libretro-0.91_20211130.recipe
index 5e1a75d85..6ec23e0a9 100644
--- a/games-emulation/gpsp_libretro/gpsp_libretro-0.91_20211019.recipe
+++ b/games-emulation/gpsp_libretro/gpsp_libretro-0.91_20211130.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://gpsp-dev.blogspot.com/"
 COPYRIGHT="2007-2018 Exophase, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="8da094d7e04a08e5e2b9f916174d962071f91bf0"
+srcGitRev="be3fdfd0b4e0529d7e00c4e16eb26d92fe0559a6"
 SOURCE_URI="https://github.com/libretro/gpsp/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a704d605b34a805e046e6d8f4cd79aaaf1c239f6c5b0cf4ab7e107958f547dc6"
+CHECKSUM_SHA256="e6586d042b1b2646e05eb1a7d525dfa957c3d590319de49fd84ce2a9aea4313b"
 SOURCE_FILENAME="gpsp-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="gpsp-$srcGitRev"
 ADDITIONAL_FILES="gpsp_libretro.info.in"
diff --git a/games-emulation/handy_libretro/handy_libretro-0.95_20211012.recipe b/games-emulation/handy_libretro/handy_libretro-0.95_20211203.recipe
similarity index 90%
rename from games-emulation/handy_libretro/handy_libretro-0.95_20211012.recipe
rename to games-emulation/handy_libretro/handy_libretro-0.95_20211203.recipe
index 0af1102de..e59068373 100644
--- a/games-emulation/handy_libretro/handy_libretro-0.95_20211012.recipe
+++ b/games-emulation/handy_libretro/handy_libretro-0.95_20211203.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://handy.sourceforge.net/"
 COPYRIGHT="1997-2018 Keith Wilkins, the libretro team"
 LICENSE="Zlib"
 REVISION="1"
-srcGitRev="3b605908943c9a60314366fb00b07689b2529605"
+srcGitRev="ebcbb8be5d174306ffb091b7657637b910fc35d2"
 SOURCE_URI="https://github.com/libretro/libretro-handy/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="224d88392dc74914c84388e57a23874a251c62a08b3b1ba47e48eddea3d8b622"
+CHECKSUM_SHA256="97077c4b7b9b25893ea028322326ba2b36094fed805454f28ce0a6a1bb291d96"
 SOURCE_FILENAME="handy-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-handy-$srcGitRev"
 ADDITIONAL_FILES="handy_libretro.info.in"
diff --git a/games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20211019.recipe b/games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20211207.recipe
similarity index 92%
rename from games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20211019.recipe
rename to games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20211207.recipe
index 489ac064f..aa6fd132a 100644
--- a/games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20211019.recipe
+++ b/games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20211207.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://github.com/libretro/mame2003-plus-libretro"
 COPYRIGHT="2019-2021 the MAME 2003-Plus team, the libretro team"
 LICENSE="MAME Non-Commercial"
 REVISION="1"
-srcGitRev="1fd30e32ec948da4227b5eb7af327fddd6c7115b"
+srcGitRev="b14db73bef159e84a20338c405828a4098af9e76"
 SOURCE_URI="https://github.com/libretro/mame2003-plus-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="bf48f3a69679e542ab73a98d0f32641fd719badd77606cf0998d5d7a657b5d98"
+CHECKSUM_SHA256="b241c120ceb69adb948f3b321eff31ee7d89746d2598526593d4e9b991bf4ee8"
 SOURCE_FILENAME="mame2003-plus-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="mame2003-plus-libretro-$srcGitRev"
 ADDITIONAL_FILES="mame2003_plus_libretro.info.in"
diff --git a/games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20211001.recipe b/games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20211206.recipe
similarity index 91%
rename from games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20211001.recipe
rename to games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20211206.recipe
index 1433632ac..f8eca3669 100644
--- a/games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20211001.recipe
+++ b/games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20211206.recipe
@@ -6,9 +6,9 @@ COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2
 	Zlib"
 REVISION="1"
-srcGitRev="b84c79b2f185482f9cec2b10f33cbe1bc5732dd9"
+srcGitRev="cd470e4233b37489bb62ad397790880d8a15b58c"
 SOURCE_URI="https://github.com/libretro/beetle-lynx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="391c3a7858c11fea745e825993a80504783479f5e96523eb57c62437581c2849"
+CHECKSUM_SHA256="585ba053bc21111e392504b9669770acde586bbf2d6f09a2baac0de9bf03385a"
 SOURCE_FILENAME="libretro-mednafen-lynx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-lynx-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_lynx_libretro.info.in"
diff --git a/games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20211015.recipe b/games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20211117.recipe
similarity index 91%
rename from games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20211015.recipe
rename to games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20211117.recipe
index 404fe35d5..a4a4c6257 100644
--- a/games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20211015.recipe
+++ b/games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20211117.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/ngp.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="f969af2b52f20642aea7e800e3cfcce728f3aee9"
+srcGitRev="f7c393184e5228c3d3807ee74c951c4c549107d8"
 SOURCE_URI="https://github.com/libretro/beetle-ngp-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="59aaf724f29224885a9b1695fed99ea5208933d577e7c58f17e54796c19ebb5c"
+CHECKSUM_SHA256="0b30eefcd62a956534f02a51357e2af073a6d150e0d7ad563ec351d1b2d7465b"
 SOURCE_FILENAME="libretro-mednafen-ngp-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-ngp-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_ngp_libretro.info.in"
diff --git a/games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20211019.recipe b/games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20211124.recipe
similarity index 91%
rename from games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20211019.recipe
rename to games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20211124.recipe
index d140dcba2..2712e41f6 100644
--- a/games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20211019.recipe
+++ b/games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20211124.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/pce_fast.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="81d4c9d07a76c89c32ad0e7450b69bde6403836f"
+srcGitRev="6f63eab86abab335c1e337d4e8c1582bceda5708"
 SOURCE_URI="https://github.com/libretro/beetle-pce-fast-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="da3caa6fdd4fe449ba7d2b34eb4f190e407ee1147b12c339b8c72a4709757350"
+CHECKSUM_SHA256="9d78e1b0e11ebb7852b683c0f1e7a4e750be9bca1de944f59f086f49a1efdc5b"
 SOURCE_FILENAME="libretro-mednafen-pce-fast-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-pce-fast-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_pce_fast_libretro.info.in"
diff --git a/games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20211019.recipe b/games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20211124.recipe
similarity index 91%
rename from games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20211019.recipe
rename to games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20211124.recipe
index 920082c7d..eff6ce2f1 100644
--- a/games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20211019.recipe
+++ b/games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20211124.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/pce.html"
 COPYRIGHT="2005-2020 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="b04ae2f88eef3bd65397f2d656d969fb8153324e"
+srcGitRev="d1fe47b1e8f2a34e890cab0cd76a707e2fb81d6f"
 SOURCE_URI="https://github.com/libretro/beetle-pce-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="9eb803f457ec7b783fcc8a5f32c6d4949eb370f01f8dc5c6de82302f6f18e701"
+CHECKSUM_SHA256="0d1482dd3601daf685b6b9c2284fb0206db6dcbc8b60f0ff301a07d14e8abd31"
 SOURCE_FILENAME="libretro-mednafen-pce-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-pce-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_pce_libretro.info.in"
diff --git a/games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20211003.recipe b/games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20211124.recipe
similarity index 91%
rename from games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20211003.recipe
rename to games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20211124.recipe
index 6a217ea32..c847eb209 100644
--- a/games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20211003.recipe
+++ b/games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20211124.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/pcfx.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="a1f1734509dd6acb11269f118d61f480ae8dbacf"
+srcGitRev="6d2b11e17ad5a95907c983e7c8a70e75508c2d41"
 SOURCE_URI="https://github.com/libretro/beetle-pcfx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="76f22fc238748fb7c63d260f725cae6fa3bd7797ad595ab8116a5c15b7c05e04"
+CHECKSUM_SHA256="b5a0d170aa1944aa47726e42c230550294d44ecd5565d460bc943a68dc781b5a"
 SOURCE_FILENAME="libretro-mednafen-pcfx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-pcfx-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_pcfx_libretro.info.in"
diff --git a/games-emulation/mednafen_psx_hw_libretro/mednafen_psx_hw_libretro-0.9.44.1_20211011.recipe b/games-emulation/mednafen_psx_hw_libretro/mednafen_psx_hw_libretro-0.9.44.1_20211205.recipe
similarity index 89%
rename from games-emulation/mednafen_psx_hw_libretro/mednafen_psx_hw_libretro-0.9.44.1_20211011.recipe
rename to games-emulation/mednafen_psx_hw_libretro/mednafen_psx_hw_libretro-0.9.44.1_20211205.recipe
index 2c0bcb054..873f50bb9 100644
--- a/games-emulation/mednafen_psx_hw_libretro/mednafen_psx_hw_libretro-0.9.44.1_20211011.recipe
+++ b/games-emulation/mednafen_psx_hw_libretro/mednafen_psx_hw_libretro-0.9.44.1_20211205.recipe
@@ -8,12 +8,12 @@ HOMEPAGE="https://mednafen.github.io/documentation/psx.html"
 COPYRIGHT="2005-2020 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="e8609eb9b452e82eb8a5893c73d4ce50af55720c"
+srcGitRev="39be47bc9958258cf3b6f3c68d9485ea99971cf8"
 SOURCE_URI="https://github.com/libretro/beetle-psx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="249dd5ae26896545e356f01933c3a02e37160db2f3f7c6bbbdc5c7a2f946035b"
+CHECKSUM_SHA256="160bac5b5d0bf282f5739f620823ba143e34b139ac76d0b2bcb8b46f81c675b6"
 SOURCE_FILENAME="libretro-mednafen-psx-hw-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-psx-libretro-$srcGitRev"
-PATCHES="mednafen_psx_hw_libretro-0.9.44.1_20211011.patchset"
+PATCHES="mednafen_psx_hw_libretro-0.9.44.1_20211205.patchset"
 ADDITIONAL_FILES="mednafen_psx_hw_libretro.info.in"
 
 ARCHITECTURES="all !x86_gcc2"
diff --git a/games-emulation/mednafen_psx_hw_libretro/patches/mednafen_psx_hw_libretro-0.9.44.1_20211011.patchset b/games-emulation/mednafen_psx_hw_libretro/patches/mednafen_psx_hw_libretro-0.9.44.1_20211205.patchset
similarity index 100%
rename from games-emulation/mednafen_psx_hw_libretro/patches/mednafen_psx_hw_libretro-0.9.44.1_20211011.patchset
rename to games-emulation/mednafen_psx_hw_libretro/patches/mednafen_psx_hw_libretro-0.9.44.1_20211205.patchset
diff --git a/games-emulation/mednafen_psx_libretro/mednafen_psx_libretro-0.9.44.1_20211011.recipe b/games-emulation/mednafen_psx_libretro/mednafen_psx_libretro-0.9.44.1_20211205.recipe
similarity index 92%
rename from games-emulation/mednafen_psx_libretro/mednafen_psx_libretro-0.9.44.1_20211011.recipe
rename to games-emulation/mednafen_psx_libretro/mednafen_psx_libretro-0.9.44.1_20211205.recipe
index d0485ae7e..19f826923 100644
--- a/games-emulation/mednafen_psx_libretro/mednafen_psx_libretro-0.9.44.1_20211011.recipe
+++ b/games-emulation/mednafen_psx_libretro/mednafen_psx_libretro-0.9.44.1_20211205.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/psx.html"
 COPYRIGHT="2005-2020 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="e8609eb9b452e82eb8a5893c73d4ce50af55720c"
+srcGitRev="39be47bc9958258cf3b6f3c68d9485ea99971cf8"
 SOURCE_URI="https://github.com/libretro/beetle-psx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="249dd5ae26896545e356f01933c3a02e37160db2f3f7c6bbbdc5c7a2f946035b"
+CHECKSUM_SHA256="160bac5b5d0bf282f5739f620823ba143e34b139ac76d0b2bcb8b46f81c675b6"
 SOURCE_FILENAME="libretro-mednafen-psx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-psx-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_psx_libretro.info.in"
diff --git a/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20211019.recipe b/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20211205.recipe
similarity index 91%
rename from games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20211019.recipe
rename to games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20211205.recipe
index 99572acca..0dc83da83 100644
--- a/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20211019.recipe
+++ b/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20211205.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/ss.html"
 COPYRIGHT="2005-2020 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="e1119e91a4e3f4b30971455aeb3c1a6f4cd05e59"
+srcGitRev="e6ba71f8bcc647b646d94dec812b24d00c41cf3f"
 SOURCE_URI="https://github.com/libretro/beetle-saturn-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="9d8b54c2de226e0fd9916a331b7fb7f5dfd29dcad02375bde0b840b54bbca335"
+CHECKSUM_SHA256="4e47ba49ac1a6609285921831bf8d91c48ece1293f949ac602f9f29e172b06b4"
 SOURCE_FILENAME="libretro-mednafen-saturn-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-saturn-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_saturn_libretro.info.in"
diff --git a/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20211002.recipe b/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20211124.recipe
similarity index 91%
rename from games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20211002.recipe
rename to games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20211124.recipe
index c15c34406..8d7038e08 100644
--- a/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20211002.recipe
+++ b/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20211124.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/pce_fast.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="59062662d6e925ad512fcbb9c1a0db97d1592bc1"
+srcGitRev="cd800d701f0b8f4dcb1654a5cb5b24ee09dd9257"
 SOURCE_URI="https://github.com/libretro/beetle-supergrafx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="bcde5480323c6aaf0764998517c73f9e66e891de13f450eaefb33304716be547"
+CHECKSUM_SHA256="94cb3e209e28268124470df0d6dde5d4d2f9ba202671b258cc8e77352a6d9c79"
 SOURCE_FILENAME="libretro-mednafen-supergrafx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-supergrafx-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_supergrafx_libretro.info.in"
diff --git a/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20210925.recipe b/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20211117.recipe
similarity index 91%
rename from games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20210925.recipe
rename to games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20211117.recipe
index 9ebb0ab3f..ad6af2ca1 100644
--- a/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20210925.recipe
+++ b/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20211117.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/vb.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="aeb8e0793b2b05c112b9e73ca8f7f26fd762f8f6"
+srcGitRev="aa77198c6c60b935503b5ea2149b8ff7598344da"
 SOURCE_URI="https://github.com/libretro/beetle-vb-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="8e92f72edd172d7ceb7725f1be7aa2681a2a80f8b0df17dcfcc7eee34b17a1b5"
+CHECKSUM_SHA256="7ca5a7025b1cfb76bf59ed9debbf53119a42638d68873cf4f7ea2f3355e667ea"
 SOURCE_FILENAME="libretro-mednafen-vb-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-vb-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_vb_libretro.info.in"
diff --git a/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20211015.recipe b/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20211125.recipe
similarity index 91%
rename from games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20211015.recipe
rename to games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20211125.recipe
index a068e8480..464f57fe5 100644
--- a/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20211015.recipe
+++ b/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20211125.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/wswan.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="0c7faaf7f70b72ebb68e310530cd46a69e680d40"
+srcGitRev="ea00c1d8eb9894538dd8758975cd9d6ae99ead1e"
 SOURCE_URI="https://github.com/libretro/beetle-wswan-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="b2fd6fa062f72ab14ee261e7fef991b823e7219b9bb72c2d6f98e8dddd07fab5"
+CHECKSUM_SHA256="b61c5794aa89a18ef9dd5006b3964b7f9969d84060814a8e8f7df1b3de548395"
 SOURCE_FILENAME="libretro-mednafen-wswan-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-wswan-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_wswan_libretro.info.in"
diff --git a/games-emulation/melonds_libretro/additional-files/melonds_libretro.info.in b/games-emulation/melonds_libretro/additional-files/melonds_libretro.info.in
index fecd178ed..745814096 100644
--- a/games-emulation/melonds_libretro/additional-files/melonds_libretro.info.in
+++ b/games-emulation/melonds_libretro/additional-files/melonds_libretro.info.in
@@ -1,12 +1,12 @@
 display_name = "Nintendo - DS (melonDS)"
 authors = "Arisotura"
-supported_extensions = "nds"
+supported_extensions = "nds|dsi"
 corename = "melonDS"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo DS"
 systemid = "nds"
-database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
+database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS (Download Play)|Nintendo - Nintendo DSi|Nintendo - Nintendo DSi Decrypted|Nintendo - Nintendo DSi (Digital)"
 license = "GPLv3"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
@@ -15,16 +15,31 @@ hw_render = "true"
 required_hw_api = "OpenGL Core >= 3.1"
 
 # Firmware / BIOS
-firmware_count = 3
+firmware_count = 8
 firmware0_desc = "firmware.bin (NDS Firmware)"
 firmware0_path = "firmware.bin"
-firmware0_opt = "false"
+firmware0_opt = "true"
 firmware1_desc = "bios7.bin (ARM7 BIOS)"
 firmware1_path = "bios7.bin"
-firmware1_opt = "false"
+firmware1_opt = "true"
 firmware2_desc = "bios9.bin (ARM9 BIOS)"
 firmware2_path = "bios9.bin"
-firmware2_opt = "false"
+firmware2_opt = "true"
+firmware3_desc = "dsi_firmware.bin (DSi Firmware)"
+firmware3_path = "dsi_firmware.bin"
+firmware3_opt = "true"
+firmware4_desc = "dsi_bios7.bin (DSi ARM7 BIOS)"
+firmware4_path = "dsi_bios7.bin"
+firmware4_opt = "true"
+firmware5_desc = "dsi_bios9.bin (DSi ARM9 BIOS)"
+firmware5_path = "dsi_bios9.bin"
+firmware5_opt = "true"
+firmware6_desc = "dsi_nand.bin (DSi NAND)"
+firmware6_path = "dsi_nand.bin"
+firmware6_opt = "true"
+firmware7_desc = "dsi_sd_card.bin (DSi SD card)"
+firmware7_path = "dsi_sd_card.bin"
+firmware7_opt = "true"
 notes = "(!) firmware.bin (md5): 145eaef5bd3037cbc247c213bb3da1b3|(!) bios7.bin (md5): df692a80a5b1bc90728bc3dfc76cd948|(!) bios9.bin (md5): a392174eb3e572fed6447e956bde4b25"
 
 description = "A port of the melonDS emulator to libretro. This core supports a variety of modern features, like hardware-accelerated internal res increases, as well as increased accuracy for some popular games. While not as mature as Desmume--and therefore not as compatible with the DS library as a whole--this core is a good first choice to try, with the Desmume core(s) as a fallback."
diff --git a/games-emulation/melonds_libretro/melonds_libretro-0.8.3_20211024.recipe b/games-emulation/melonds_libretro/melonds_libretro-0.8.3_20211104.recipe
similarity index 91%
rename from games-emulation/melonds_libretro/melonds_libretro-0.8.3_20211024.recipe
rename to games-emulation/melonds_libretro/melonds_libretro-0.8.3_20211104.recipe
index 91ba1f675..a6a28bb2e 100644
--- a/games-emulation/melonds_libretro/melonds_libretro-0.8.3_20211024.recipe
+++ b/games-emulation/melonds_libretro/melonds_libretro-0.8.3_20211104.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://melonds.kuribo64.net/"
 COPYRIGHT="2016-2020 StapleButter, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="b1d8c44095b2bbca56ac119efe3d9afc61c421cc"
+srcGitRev="1ad65728476d7b9594c4ff91a1ba60460a0a30e7"
 SOURCE_URI="https://github.com/libretro/melonDS/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="7065b9756d3d30c127d1d4c0d098b59ed33f03b44e00aa9869862c25117f79c1"
+CHECKSUM_SHA256="485ab6f64d31b800bfb7c2484140bc09e2542ca3048bfaceef5f3c6de977fb51"
 SOURCE_FILENAME="melonds-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="melonDS-$srcGitRev"
 ADDITIONAL_FILES="melonds_libretro.info.in"
diff --git a/games-emulation/mgba_libretro/mgba_libretro-0.6.1_20211016.recipe b/games-emulation/mgba_libretro/mgba_libretro-0.6.1_20211203.recipe
similarity index 91%
rename from games-emulation/mgba_libretro/mgba_libretro-0.6.1_20211016.recipe
rename to games-emulation/mgba_libretro/mgba_libretro-0.6.1_20211203.recipe
index 31dba9a7b..63cfe2edf 100644
--- a/games-emulation/mgba_libretro/mgba_libretro-0.6.1_20211016.recipe
+++ b/games-emulation/mgba_libretro/mgba_libretro-0.6.1_20211203.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://mgba.io/"
 COPYRIGHT="2014-2018 Endrift, the libretro team"
 LICENSE="MPL v2.0"
 REVISION="1"
-srcGitRev="fda6556195b0f6a3cc70c3b64297ad31a064f275"
+srcGitRev="c33adfa66b4b3f72c939c27ff0668ebeada75086"
 SOURCE_URI="https://github.com/libretro/mgba/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="2ee90e3eb81c12191d4c3ee7b479d78bc677634390beaa0632a01b13883f5fae"
+CHECKSUM_SHA256="25b17766b47c6f74b01df5b9cb6b5d70616eae558fe25c1704de436ce87712ad"
 SOURCE_FILENAME="libretro-mgba-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="mgba-$srcGitRev"
 ADDITIONAL_FILES="mgba_libretro.info.in"
diff --git a/games-emulation/neocd_libretro/neocd_libretro-0.5_20211010.recipe b/games-emulation/neocd_libretro/neocd_libretro-0.5_20211116.recipe
similarity index 91%
rename from games-emulation/neocd_libretro/neocd_libretro-0.5_20211010.recipe
rename to games-emulation/neocd_libretro/neocd_libretro-0.5_20211116.recipe
index 12ccd5417..6b1e8a8ac 100644
--- a/games-emulation/neocd_libretro/neocd_libretro-0.5_20211010.recipe
+++ b/games-emulation/neocd_libretro/neocd_libretro-0.5_20211116.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://github.com/libretro/neocd_libretro"
 COPYRIGHT="2005-2021, Fabrice Martinez, the libretro team"
 LICENSE="GNU LGPL v3"
 REVISION="1"
-srcGitRev="33b8f9c28671104047b1993b097a4ddcf3040e55"
+srcGitRev="83d10f3be10fff2f28aa56fc674c687528cb7f5c"
 SOURCE_URI="https://github.com/libretro/neocd_libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="ab05aea26f5b9d4ee89f9d48b4cbf2bfe36b7fa74f6ba6e891d6859d8148c3f1"
+CHECKSUM_SHA256="0951342e93f856f9fc2d8baa385273e43794e6fee1b40680d69814039b054b03"
 SOURCE_FILENAME="neocd-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="neocd_libretro-$srcGitRev"
 ADDITIONAL_FILES="neocd_libretro.info.in"
diff --git a/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20211010.recipe b/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20211205.recipe
similarity index 91%
rename from games-emulation/nestopia_libretro/nestopia_libretro-1.49_20211010.recipe
rename to games-emulation/nestopia_libretro/nestopia_libretro-1.49_20211205.recipe
index 97e94fb07..780b86f17 100644
--- a/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20211010.recipe
+++ b/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20211205.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="http://nestopia.sourceforge.net/"
 COPYRIGHT="2012-2020 Martin Freij, 0ldSk00l, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="ea6f1c0631bb62bf15ab96493127dd9cfaf74d1c"
+srcGitRev="21e2cec7a13f0a09f493637de289e59386e2fd36"
 SOURCE_URI="https://github.com/libretro/nestopia/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="d8c84a8fdf24cf80875b67b47d844690ea78c6b7c25e9b3cf2394c0dae20289b"
+CHECKSUM_SHA256="f35bcb703229a96068bb159fd79fa7ff8f5052d43908a47a208315bb4253e822"
 SOURCE_FILENAME="nestopia-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="nestopia-$srcGitRev"
 ADDITIONAL_FILES="nestopia_libretro.info.in"
diff --git a/games-emulation/o2em_libretro/o2em_libretro-1.18_20211015.recipe b/games-emulation/o2em_libretro/o2em_libretro-1.18_20211130.recipe
similarity index 91%
rename from games-emulation/o2em_libretro/o2em_libretro-1.18_20211015.recipe
rename to games-emulation/o2em_libretro/o2em_libretro-1.18_20211130.recipe
index 2d4fce636..10878c99b 100644
--- a/games-emulation/o2em_libretro/o2em_libretro-1.18_20211015.recipe
+++ b/games-emulation/o2em_libretro/o2em_libretro-1.18_20211130.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://o2em.sourceforge.net/"
 COPYRIGHT="1996-2018 Daniel Boris, the O2EM team, the libretro team"
 LICENSE="Artistic"
 REVISION="1"
-srcGitRev="1a663a11e0a95bcd60a198c9a19d63f5ca4689a4"
+srcGitRev="f1050243e0d5285e7769e94a882b0cf39d2b7370"
 SOURCE_URI="https://github.com/libretro/libretro-o2em/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="b510b84b331a1e464cca479fa382f2d6e4197b3d3fb181b926a7d479f0fa9e0c"
+CHECKSUM_SHA256="a6347907481e044140daf4f7bb15fd59908258e00b0a28de43917140ebcf4be7"
 SOURCE_FILENAME="libretro-o2em-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-o2em-$srcGitRev"
 ADDITIONAL_FILES="o2em_libretro.info.in"
diff --git a/games-emulation/opera_libretro/opera_libretro-1.0.0_20211023.recipe b/games-emulation/opera_libretro/opera_libretro-1.0.0_20211118.recipe
similarity index 91%
rename from games-emulation/opera_libretro/opera_libretro-1.0.0_20211023.recipe
rename to games-emulation/opera_libretro/opera_libretro-1.0.0_20211118.recipe
index 7edf65ded..8a982598b 100644
--- a/games-emulation/opera_libretro/opera_libretro-1.0.0_20211023.recipe
+++ b/games-emulation/opera_libretro/opera_libretro-1.0.0_20211118.recipe
@@ -8,9 +8,9 @@ COPYRIGHT="2011-2020 the 4DO/FreeDO team, the libretro team"
 LICENSE="FreeDO
 	GNU LGPL v3"
 REVISION="1"
-srcGitRev="fef06b06127736544f6ebb4f703efd01b6e018dd"
+srcGitRev="aa868e656b518567a95b11b2f14c5db8001b11a0"
 SOURCE_URI="https://github.com/libretro/opera-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="415c1aab5466e663fbf12ac80de06b6d3a69520db11440b7f2473f62d043f1d3"
+CHECKSUM_SHA256="373e59a9a59feb26e04b90eaa7ffadcc0d3c4c043a8e501817d1bfb921e8433d"
 SOURCE_FILENAME="libretro-opera-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="opera-libretro-$srcGitRev"
 ADDITIONAL_FILES="opera_libretro.info.in"
diff --git a/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20211023.recipe b/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20211110.recipe
similarity index 92%
rename from games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20211023.recipe
rename to games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20211110.recipe
index ca077ec18..762249d7a 100644
--- a/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20211023.recipe
+++ b/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20211110.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://notaz.gp2x.de/pcsx_rearmed.php"
 COPYRIGHT="2012-2018, notaz, Exophase, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="ce085a823118a1ebccf860f4a6d550dd340a0ce4"
+srcGitRev="589bd99ba31de8216624dbf0cbbc016f0663ce3d"
 SOURCE_URI="https://github.com/libretro/pcsx_rearmed/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="59304ea0a2a95bed9555e8ee8c3764c1b3db292ad8161c59ce81c961dc5c178f"
+CHECKSUM_SHA256="1a190ebc5df71abcf3d59516e6e75e4db38acfa952f031c04e34c8b56545856f"
 SOURCE_FILENAME="pcsx-rearmed-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="pcsx_rearmed-$srcGitRev"
 ADDITIONAL_FILES="pcsx_rearmed_libretro.info.in"
diff --git a/games-emulation/picodrive_libretro/additional-files/picodrive_libretro.info.in b/games-emulation/picodrive_libretro/additional-files/picodrive_libretro.info.in
index cc4eb89ae..075f48a3e 100644
--- a/games-emulation/picodrive_libretro/additional-files/picodrive_libretro.info.in
+++ b/games-emulation/picodrive_libretro/additional-files/picodrive_libretro.info.in
@@ -1,7 +1,7 @@
 # Software Information
-display_name = "Sega - MS/MD/CD/32X (PicoDrive)"
+display_name = "Sega - GG/MS/MD/CD/32X (PicoDrive)"
 authors = "notaz|fdave|irixxxx"
-supported_extensions = "bin|gen|smd|md|32x|chd|cue|iso|sms|68k|sgd|m3u"
+supported_extensions = "bin|gen|gg|smd|md|32x|chd|cue|iso|sms|68k|sgd|m3u"
 corename = "PicoDrive"
 license = "MAME"
 permissions = "dynarec_optional"
@@ -14,7 +14,7 @@ systemname = "Sega 8/16-bit + 32X (Various)"
 systemid = "mega_drive"
 
 # Libretro Features
-database = "Sega - Master System - Mark III|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - 32X"
+database = "Sega - Master System - Mark III|Sega - Game Gear|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - 32X"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "deterministic"
diff --git a/games-emulation/picodrive_libretro/picodrive_libretro-1.92_20211016.recipe b/games-emulation/picodrive_libretro/picodrive_libretro-1.92_20211123.recipe
similarity index 96%
rename from games-emulation/picodrive_libretro/picodrive_libretro-1.92_20211016.recipe
rename to games-emulation/picodrive_libretro/picodrive_libretro-1.92_20211123.recipe
index 9d92de67a..54c9ffaf1 100644
--- a/games-emulation/picodrive_libretro/picodrive_libretro-1.92_20211016.recipe
+++ b/games-emulation/picodrive_libretro/picodrive_libretro-1.92_20211123.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://notaz.gp2x.de/pico.php"
 COPYRIGHT="2005-2018 notaz, the libretro team"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-srcGitRev="9cb99ce36f93871b05c5adc2790b2e33e63b50b6"
+srcGitRev="d44605c269e645a6734089ac1f95116a5ce57e0b"
 SOURCE_URI="https://github.com/libretro/picodrive/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="848bc8b9dd56e6aa9e4206b6600d46da32db3aeada80eb1c081a1e3351b7bdef"
+CHECKSUM_SHA256="4d37ff162d1aa646a41f0de9bc8549d7d1562c6182e4536d788a2c1a7ea14e96"
 SOURCE_FILENAME="libretro-picodrive-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="picodrive-$srcGitRev"
 srcGitRev_2="94a9d9a888e72cbfa4db12113cd113cf5e154f7f"
diff --git a/games-emulation/retroarch_assets/retroarch_assets-0_20211016.recipe b/games-emulation/retroarch_assets/retroarch_assets-0_20211027.recipe
similarity index 85%
rename from games-emulation/retroarch_assets/retroarch_assets-0_20211016.recipe
rename to games-emulation/retroarch_assets/retroarch_assets-0_20211027.recipe
index 1fe80389c..8742ff8b2 100644
--- a/games-emulation/retroarch_assets/retroarch_assets-0_20211016.recipe
+++ b/games-emulation/retroarch_assets/retroarch_assets-0_20211027.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://libretro.com/"
 COPYRIGHT="2010-2021 The RetroArch Team"
 LICENSE="CC-BY-4.0"
 REVISION="1"
-srcGitRev="a7deebea0b64e744d521368181f9f187f6c5a053"
+srcGitRev="9c22505bed22370d4b81d10429afc9e0d6cc11ff"
 SOURCE_URI="https://github.com/libretro/retroarch-assets/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="cd8e5bc0f35a21c185fc1984606ea0fa0fe063788e768bfd15f26abde58f1d5d"
+CHECKSUM_SHA256="c34b107325d966c67e68d3ed40571c8d4f6561b908ab92a968ad1b95fb1b22f4"
 SOURCE_FILENAME="retroarch-assets-$portVersion.tar.gz"
 SOURCE_DIR="retroarch-assets-$srcGitRev"
 
diff --git a/games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211012.recipe b/games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211128.recipe
similarity index 92%
rename from games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211012.recipe
rename to games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211128.recipe
index b908d9de7..cfbe80c2a 100644
--- a/games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211012.recipe
+++ b/games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211128.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://sameboy.github.io/downloads/"
 COPYRIGHT="2016-2021 LIJI32, the libretro team"
 LICENSE="MIT"
 REVISION="1"
-srcGitRev="c4a5a58478d64cee7029f9bb169ee3dbd67052b9"
+srcGitRev="685c6c8b497260f53a984d5c4398ef2b25253104"
 SOURCE_URI="https://github.com/libretro/SameBoy/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="3ee10ef0c59493bcb67fd7e08dde3222d59008df7649669999f0eff73c398294"
+CHECKSUM_SHA256="4cdfa28a9b73949fa94b6692e792a1d61c6bf915929f2f790d7f0799deb85876"
 SOURCE_FILENAME="SameBoy-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="SameBoy-$srcGitRev"
 ADDITIONAL_FILES="sameboy_libretro.info.in"
diff --git a/games-emulation/stella2014_libretro/stella2014_libretro-3.9.3_20211012.recipe b/games-emulation/stella2014_libretro/stella2014_libretro-3.9.3_20211116.recipe
similarity index 92%
rename from games-emulation/stella2014_libretro/stella2014_libretro-3.9.3_20211012.recipe
rename to games-emulation/stella2014_libretro/stella2014_libretro-3.9.3_20211116.recipe
index c61ba490c..b6639a936 100644
--- a/games-emulation/stella2014_libretro/stella2014_libretro-3.9.3_20211012.recipe
+++ b/games-emulation/stella2014_libretro/stella2014_libretro-3.9.3_20211116.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://stella-emu.github.io/"
 COPYRIGHT="1995-2021 the Stella team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="78d805ee25e66accfd69bea77abf74f425f39013"
+srcGitRev="934c7a2a44ef038af529b68950ddba4f7ea3478e"
 SOURCE_URI="https://github.com/libretro/stella2014-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a583b5ab8311198b70a27a141b4404298df7041374098b2fbcbe62aba4344cad"
+CHECKSUM_SHA256="8a4d10ce4646f0d474efc339e4db9211dd36bbf3089e98f236367368b231a8d9"
 SOURCE_FILENAME="stella2014-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="stella2014-libretro-$srcGitRev"
 ADDITIONAL_FILES="stella2014_libretro.info.in"
diff --git a/games-emulation/stella_libretro/stella_libretro-6.5.3_20211024.recipe b/games-emulation/stella_libretro/stella_libretro-6.5.3_20211207.recipe
similarity index 92%
rename from games-emulation/stella_libretro/stella_libretro-6.5.3_20211024.recipe
rename to games-emulation/stella_libretro/stella_libretro-6.5.3_20211207.recipe
index 5ed8b0e58..468f2e729 100644
--- a/games-emulation/stella_libretro/stella_libretro-6.5.3_20211024.recipe
+++ b/games-emulation/stella_libretro/stella_libretro-6.5.3_20211207.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://stella-emu.github.io/"
 COPYRIGHT="1995-2021 the Stella team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="c3fa1890d5bcc29652bad1e8ec1a268c3ca4c30b"
+srcGitRev="f999bd685af24f1ebc705e146d33b46a8fb0beac"
 SOURCE_URI="https://github.com/stella-emu/stella/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="121c72d00e4b3bfb734a85cda39f2a925488016d055a29347277938576dd7f8a"
+CHECKSUM_SHA256="bdbc7fe4a906f7712f2fd5bffdca1d29da4660eebc14a35268c1780beb74ccdb"
 SOURCE_FILENAME="stella-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="stella-$srcGitRev"
 ADDITIONAL_FILES="stella_libretro.info.in"
diff --git a/games-emulation/vecx_libretro/vecx_libretro-1.2_20211015.recipe b/games-emulation/vecx_libretro/vecx_libretro-1.2_20211102.recipe
similarity index 92%
rename from games-emulation/vecx_libretro/vecx_libretro-1.2_20211015.recipe
rename to games-emulation/vecx_libretro/vecx_libretro-1.2_20211102.recipe
index 83fcac044..1bc1a53a5 100644
--- a/games-emulation/vecx_libretro/vecx_libretro-1.2_20211015.recipe
+++ b/games-emulation/vecx_libretro/vecx_libretro-1.2_20211102.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://www.valavan.net/vectrex.html"
 COPYRIGHT="2002-2018 Valavan Manohararajah, John Hawthorn, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="394017df95de8c9cd18c8c0386c8ee2afbc4e99d"
+srcGitRev="28d6efc8972313903d0802a736ff8c3bc115e78f"
 SOURCE_URI="https://github.com/libretro/libretro-vecx/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="37b89a7926ab9515597e664398504eae3af8d77a7a4902e52713ebd8331483bc"
+CHECKSUM_SHA256="8584af54ce532c4bb37a20a023eda9fcfa90a5d2bea66d5d65abeeab183836eb"
 SOURCE_FILENAME="libretro-vecx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-vecx-$srcGitRev"
 ADDITIONAL_FILES="vecx_libretro.info.in"
diff --git a/games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20211014.recipe b/games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20211114.recipe
similarity index 92%
rename from games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20211014.recipe
rename to games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20211114.recipe
index 2342e4b03..c2095da75 100644
--- a/games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20211014.recipe
+++ b/games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20211114.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://icculus.org/virtualjaguar/"
 COPYRIGHT="2003-2018 Cal2, the Virtual Jaguar SDL team, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="3fd8160628295f5a21188f28548895a9a8a8955a"
+srcGitRev="d1b1b28a6ad2518b746e3f7537ec6d66db96ec57"
 SOURCE_URI="https://github.com/libretro/virtualjaguar-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="5dfde6c69860fb9dad008eb35406cba139fb97b5f81abf758dbc26b67cf7134c"
+CHECKSUM_SHA256="d36e265e3e1409cb54de3b72b055a35c465b9f8c4f2064e77ed2d784671eb89a"
 SOURCE_FILENAME="libretro-virtualjaguar-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="virtualjaguar-libretro-$srcGitRev"
 ADDITIONAL_FILES="virtualjaguar_libretro.info.in"
diff --git a/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20210922.recipe b/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20211203.recipe
similarity index 91%
rename from games-emulation/yabause_libretro/yabause_libretro-0.9.15_20210922.recipe
rename to games-emulation/yabause_libretro/yabause_libretro-0.9.15_20211203.recipe
index e3d0c184b..a9aff07be 100644
--- a/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20210922.recipe
+++ b/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20211203.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://yabause.org/"
 COPYRIGHT="2003-2019 Guillaume Duhamel, Theo Berkau, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="12c869191cb3e7483ad63bf1d5a204d78ac996c5"
+srcGitRev="c940fe68461cb2bc6dd98cc162b46813ba12b081"
 SOURCE_URI="https://github.com/libretro/yabause/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="1da89042907222d903b6ae5128df02174b3f764713b2f72348b23dc8d922bbc6"
+CHECKSUM_SHA256="f86dbce7c1936d6ea884ba6e7f2e4247e7899caf371e17cd1b6223a047dbc4af"
 SOURCE_FILENAME="libretro-yabause-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="yabause-$srcGitRev"
 ADDITIONAL_FILES="yabause_libretro.info.in"
diff --git a/games-engines/cannonball_libretro/cannonball_libretro-0.34_20211002.recipe b/games-engines/cannonball_libretro/cannonball_libretro-0.34_20211120.recipe
similarity index 92%
rename from games-engines/cannonball_libretro/cannonball_libretro-0.34_20211002.recipe
rename to games-engines/cannonball_libretro/cannonball_libretro-0.34_20211120.recipe
index ff07b76b8..4fb8fde82 100644
--- a/games-engines/cannonball_libretro/cannonball_libretro-0.34_20211002.recipe
+++ b/games-engines/cannonball_libretro/cannonball_libretro-0.34_20211120.recipe
@@ -9,9 +9,9 @@ HOMEPAGE="https://reassembler.blogspot.com/"
 COPYRIGHT="2012-2021 Chris White, the libretro team"
 LICENSE="Cannonball"
 REVISION="1"
-srcGitRev="36f695e18ac2b3832479b3a2f6aabd9dfbb0f34d"
+srcGitRev="81f9b56381a4bd0e4ab90f81370c057b9ef46f7f"
 SOURCE_URI="https://github.com/libretro/cannonball/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="6c2255a1387c12b50458a198346b48c5a78f195023cfe6afa9332af927ff29ca"
+CHECKSUM_SHA256="35851d362e24a5235a71afa91d06786e044d2358e7f609051ac91007332c44b5"
 SOURCE_FILENAME="cannonball-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="cannonball-$srcGitRev"
 ADDITIONAL_FILES="cannonball_libretro.info.in"
diff --git a/games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20210923.recipe b/games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20211102.recipe
similarity index 91%
rename from games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20210923.recipe
rename to games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20211102.recipe
index 78128122a..665d63bf7 100644
--- a/games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20210923.recipe
+++ b/games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20211102.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://cyxdown.free.fr/reminiscence/"
 COPYRIGHT="2005-2020 Gregory Montoir, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="1ce3bb107a6c4c0ee72d63df77d8a4dc72352ca7"
+srcGitRev="dbf2f5964c21f36e045ccd2cb50ac2513fdca75d"
 SOURCE_URI="https://github.com/libretro/REminiscence/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="49c0e007fc09e919035b97470463103b14b2fe3f15e94576b12bf1fbd8773622"
+CHECKSUM_SHA256="88e039c45679b804bf70be5405a13c647ce8a0ba351e5490286401027b028c28"
 SOURCE_FILENAME="libretro-reminiscence-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="REminiscence-$srcGitRev"
 ADDITIONAL_FILES="reminiscence_libretro.info.in"
diff --git a/games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20211013.recipe b/games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20211027.recipe
similarity index 92%
rename from games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20211013.recipe
rename to games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20211027.recipe
index 67b13eaf4..a0e15409f 100644
--- a/games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20211013.recipe
+++ b/games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20211027.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://www.scummvm.org/"
 COPYRIGHT="2001-2020 the ScummVM team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="c63de10ee05bc1b6c33cc2cc32ba7b8ac48f842c"
+srcGitRev="63e57573a9ffe71a1083ff46d9cd210203b87afb"
 SOURCE_URI="https://github.com/libretro/scummvm/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="4646a23711ff4ef8602b44911f4517cc6a1f61d474462340e9350ab7d35da4c0"
+CHECKSUM_SHA256="b5be836e068caf16418d3fde87c6ba436b31d87e1d9627855ba463bb0841a5d5"
 SOURCE_FILENAME="libretro-scummvm-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="scummvm-$srcGitRev"
 ADDITIONAL_FILES="scummvm_libretro.info.in"
diff --git a/games-fps/tyrquake_libretro/patches/tyrquake_libretro-0.62_20210923.patchset b/games-fps/tyrquake_libretro/patches/tyrquake_libretro-0.62_20211207.patchset
similarity index 100%
rename from games-fps/tyrquake_libretro/patches/tyrquake_libretro-0.62_20210923.patchset
rename to games-fps/tyrquake_libretro/patches/tyrquake_libretro-0.62_20211207.patchset
diff --git a/games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20210923.recipe b/games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20211207.recipe
similarity index 86%
rename from games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20210923.recipe
rename to games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20211207.recipe
index 5499a8318..cd4cbd8a3 100644
--- a/games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20210923.recipe
+++ b/games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20211207.recipe
@@ -8,12 +8,12 @@ HOMEPAGE="https://disenchant.net/tyrquake/"
 COPYRIGHT="2003-2021 Kevin Shanahan, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="76a38bb168dfa39c6ff2b6d01efec48828f80546"
+srcGitRev="905e7d0b620061a0fc1ddafb4288ef2f251f021c"
 SOURCE_URI="https://github.com/libretro/tyrquake/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="7485c19bb9a083c5b7f1f456083d6d8fb8912baaa9732d9a06d0bc01c94f2964"
+CHECKSUM_SHA256="4d01e75dfbb439e344ea1dcdc4609e9982eaf39d8b1b7eb7fe3abb6b6e3d5f1a"
 SOURCE_FILENAME="libretro-tyrquake-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="tyrquake-$srcGitRev"
-PATCHES="tyrquake_libretro-0.62_20210923.patchset"
+PATCHES="tyrquake_libretro-0.62_20211207.patchset"
 ADDITIONAL_FILES="tyrquake_libretro.info.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -50,7 +50,7 @@ BUILD()
 INSTALL()
 {
 	install -m 0755 -d "$docDir"
-	install -m 0644 -t "$docDir" readme.txt readme-id.txt gnu.txt
+	install -m 0644 -t "$docDir" readme.txt readme-id.txt
 	install -m 0755 -d "$addOnsDir"/libretro
 	install -m 0644 -t "$addOnsDir"/libretro \
 		tyrquake_libretro.info \
diff --git a/media-sound/gme_libretro/gme_libretro-0.5.2_20211009.recipe b/media-sound/gme_libretro/gme_libretro-0.5.2_20211102.recipe
similarity index 92%
rename from media-sound/gme_libretro/gme_libretro-0.5.2_20211009.recipe
rename to media-sound/gme_libretro/gme_libretro-0.5.2_20211102.recipe
index b4c70fa0b..71ff5ad7e 100644
--- a/media-sound/gme_libretro/gme_libretro-0.5.2_20211009.recipe
+++ b/media-sound/gme_libretro/gme_libretro-0.5.2_20211102.recipe
@@ -11,9 +11,9 @@ COPYRIGHT="2004-2020 Blargg, the libretro team"
 LICENSE="GNU GPL v2
 	GNU LGPL v2"
 REVISION="1"
-srcGitRev="c6b341e8432733f75a07527594834d29884609d3"
+srcGitRev="42bff0eed05ce165c98b119bfd576d29982618e7"
 SOURCE_URI="https://github.com/libretro/libretro-gme/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="d95fc85d9c2a49bc6e9b16fc8b0717851f03a60da31c1bacc76c27790c883b8f"
+CHECKSUM_SHA256="582c023966669f956417efed7357da90cd27627135d2433208ecdad8ad257f5e"
 SOURCE_FILENAME="libretro-gme-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-gme-$srcGitRev"
 ADDITIONAL_FILES="gme_libretro.info.in"