diff --git a/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20220918.recipe b/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20221003.recipe
similarity index 91%
rename from app-emulation/cap32_libretro/cap32_libretro-4.2.0_20220918.recipe
rename to app-emulation/cap32_libretro/cap32_libretro-4.2.0_20221003.recipe
index 892d7badc..fb5d7ba6a 100644
--- a/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20220918.recipe
+++ b/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20221003.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="1b0fbccc13547552682090489bc267fa47b1d0cf"
+srcGitRev="3c6fc81ea4193132d363985cd6616a4b844587a1"
 SOURCE_URI="https://github.com/libretro/libretro-cap32/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="6a7720de0c2554f24cab5d6d696feec67e262efd6c0ddd1b8b9f74085e36e0da"
+CHECKSUM_SHA256="ccd4fcd007d0bf67f71b5f19f9c7d8282ccdf23851237407bc314bdaea9c5476"
 SOURCE_FILENAME="cap32-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-cap32-$srcGitRev"
 ADDITIONAL_FILES="cap32_libretro.info.in"
diff --git a/app-emulation/puae_libretro/puae_libretro-2.6.1_20220915.recipe b/app-emulation/puae_libretro/puae_libretro-2.6.1_20221004.recipe
similarity index 92%
rename from app-emulation/puae_libretro/puae_libretro-2.6.1_20220915.recipe
rename to app-emulation/puae_libretro/puae_libretro-2.6.1_20221004.recipe
index 2951dec52..b893ea5d3 100644
--- a/app-emulation/puae_libretro/puae_libretro-2.6.1_20220915.recipe
+++ b/app-emulation/puae_libretro/puae_libretro-2.6.1_20221004.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="1b7dd443ff89d667d99f8c44454a91ed59bcabd9"
+srcGitRev="4d8ebafe3f91c4998e8d73940e9558d863ecf93b"
 SOURCE_URI="https://github.com/libretro/libretro-uae/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="8a0944a80e9f8f7862ba82c87bc80266606f151f50c59d5f87e0cf9b535446b3"
+CHECKSUM_SHA256="c56496335513f7942387f569c39ee4726d4074a90a4eafb22143abceb78b22e5"
 SOURCE_FILENAME="libretro-uae-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-uae-$srcGitRev"
 ADDITIONAL_FILES="puae_libretro.info.in"
diff --git a/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20220925.recipe b/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20221003.recipe
similarity index 91%
rename from games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20220925.recipe
rename to games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20221003.recipe
index db187b159..b004c45b9 100644
--- a/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20220925.recipe
+++ b/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20221003.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="8678b0fcd02c4049c0cfa40a0ab87fded1bbedd8"
+srcGitRev="cdb1362ee336f1b5edb1f610c585a149b3c45644"
 SOURCE_URI="https://github.com/libretro/FBNeo/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="e395e951418fb5ae94563c3378de5abaed623b3ef3c79ac0bdbf8bb5ff7d8718"
+CHECKSUM_SHA256="679411aeff6a918bbf5fa476912d6c7dcd96b86a2a74fdcfb2b52e2614c45bcb"
 SOURCE_FILENAME="fbneo-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="FBNeo-$srcGitRev"
 ADDITIONAL_FILES="fbneo_libretro.info.in"
diff --git a/games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20220929.recipe b/games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20221002.recipe
similarity index 92%
rename from games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20220929.recipe
rename to games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20221002.recipe
index c851f8b7c..18e981c27 100644
--- a/games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20220929.recipe
+++ b/games-emulation/mame2003_plus_libretro/mame2003_plus_libretro-1.0_20221002.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="982db57b325b54aa90a60bd2e512b624d3b6642c"
+srcGitRev="36d6eb427dd44beb25d689e4d7173252d4715837"
 SOURCE_URI="https://github.com/libretro/mame2003-plus-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="5e98568a3233865964888a9108c078dadce415a0cc327a9695ec65d8b39544ff"
+CHECKSUM_SHA256="7becce6fdd28736d2e524fb5507012414553f57ef43e6681be0e3719f61b9554"
 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_saturn_libretro/additional-files/mednafen_saturn_libretro.info.in b/games-emulation/mednafen_saturn_libretro/additional-files/mednafen_saturn_libretro.info.in
index c89f59bf9..f113c09e5 100644
--- a/games-emulation/mednafen_saturn_libretro/additional-files/mednafen_saturn_libretro.info.in
+++ b/games-emulation/mednafen_saturn_libretro/additional-files/mednafen_saturn_libretro.info.in
@@ -20,7 +20,7 @@ hw_render = "false"
 needs_fullpath = "true"
 disk_control = "true"
 savestate = "true"
-savestate_features = "serialized"
+savestate_features = "deterministic"
 cheats = "true"
 input_descriptors = "true"
 memory_descriptors = "true"
diff --git a/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20220829.recipe b/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20220829.recipe
index 68e3ab7aa..ad9dc37cb 100644
--- a/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20220829.recipe
+++ b/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20220829.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="ae30f29e340a00b33e38df85ceaa599151a47cd7"
+srcGitRev="054862a4ccb9b2f1bad9e5b075fc3d1116dc8055"
 SOURCE_URI="https://github.com/libretro/beetle-saturn-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="32abf768d707f0fb4ba75201c41db52af784c9828f3efebf2a09a4b26aaa28c2"
+CHECKSUM_SHA256="de8cecbca299dd7bf185983a00307cb3bd429a6c80222a9377063c8e35400d03"
 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/additional-files/mednafen_supergrafx_libretro.info.in b/games-emulation/mednafen_supergrafx_libretro/additional-files/mednafen_supergrafx_libretro.info.in
index 68896ff5c..ee81113c0 100644
--- a/games-emulation/mednafen_supergrafx_libretro/additional-files/mednafen_supergrafx_libretro.info.in
+++ b/games-emulation/mednafen_supergrafx_libretro/additional-files/mednafen_supergrafx_libretro.info.in
@@ -20,7 +20,7 @@ hw_render = "false"
 needs_fullpath = "true"
 disk_control = "true"
 savestate = "true"
-savestate_features = "serialized"
+savestate_features = "deterministic"
 cheats = "true"
 input_descriptors = "true"
 memory_descriptors = "true"
diff --git a/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20220218.recipe b/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20220716.recipe
similarity index 91%
rename from games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20220218.recipe
rename to games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20220716.recipe
index 0ee68d8cb..972459211 100644
--- a/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20220218.recipe
+++ b/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20220716.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="59991a98c232b1a8350a9d67ac554c5b22771d3c"
+srcGitRev="3cfafe8c684a2f4f4532bcf18e25d2f8760ca45d"
 SOURCE_URI="https://github.com/libretro/beetle-supergrafx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="5ab78bc66ab428154b1403895173d43793574794ed1b763c63e45761f31662c7"
+CHECKSUM_SHA256="c825b4cd0d4b03246c33a35ad09b58a64795d7953e58f634e781f978b7cf8e08"
 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_20220409.recipe b/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20220828.recipe
similarity index 91%
rename from games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20220409.recipe
rename to games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20220828.recipe
index 9ca6b045e..3197cee87 100644
--- a/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20220409.recipe
+++ b/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20220828.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="246555f8ed7e0b9e5748b2ee2ed6743187c61393"
+srcGitRev="162918f06d9a705330b2ba128e0d3b65fd1a1bcc"
 SOURCE_URI="https://github.com/libretro/beetle-vb-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="af8a5424b4ba61385db8e100aca36227ca585ab0ba0b98666acd7d4afc5d8962"
+CHECKSUM_SHA256="9763153d0e5d60b7356f115bc9fee60b60597e44c040d4aa89088e026ca019c8"
 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/additional-files/mednafen_wswan_libretro.info.in b/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in
index b278d88a0..2cfe8bf93 100644
--- a/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in
+++ b/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in
@@ -16,5 +16,7 @@ systemid = "wonderswan"
 # Libretro Features
 supports_no_game = "false"
 database = "Bandai - WonderSwan|Bandai - WonderSwan Color"
+savestate = "true"
+savestate_features = "deterministic"
 
 description = "A port of Mednafen's WonderSwan Color emulation core to libretro."
diff --git a/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20220409.recipe b/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20220618.recipe
similarity index 91%
rename from games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20220409.recipe
rename to games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20220618.recipe
index d9ee86fbd..3fa415284 100644
--- a/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20220409.recipe
+++ b/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20220618.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="d1fb3f399a2bc16b9ad0f2e8c8ba9f7051cd26bd"
+srcGitRev="16d96f64a32cbe1fa89c40b142298dbd007f2f4d"
 SOURCE_URI="https://github.com/libretro/beetle-wswan-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="18df2d0810705c09a00948d311b2e147e32ea9d0e3cdc1e860b434dac19e8f45"
+CHECKSUM_SHA256="9b67dab8b496ce321d21d87032697cf0e0b5616811ca3848506d14214eee65f3"
 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/melonds_libretro-0.8.3_20220308.recipe b/games-emulation/melonds_libretro/melonds_libretro-0.8.3_20220930.recipe
similarity index 91%
rename from games-emulation/melonds_libretro/melonds_libretro-0.8.3_20220308.recipe
rename to games-emulation/melonds_libretro/melonds_libretro-0.8.3_20220930.recipe
index 573aca1b8..402fa5316 100644
--- a/games-emulation/melonds_libretro/melonds_libretro-0.8.3_20220308.recipe
+++ b/games-emulation/melonds_libretro/melonds_libretro-0.8.3_20220930.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://melonds.kuribo64.net/"
 COPYRIGHT="2016-2020 StapleButter, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="e93ec3e462d3dfc1556781510a3cee113f02abb2"
+srcGitRev="6a03f3f11a729dbf698ec53954c735a0680aca01"
 SOURCE_URI="https://github.com/libretro/melonDS/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a9034e8d3fa070ea138e71c249d05d653ac1f1633001ac79d3d7341ac1d4652a"
+CHECKSUM_SHA256="fe968a6a6e850c0b8b638f48d649702251ca2d630357165a8c043b947e33482d"
 SOURCE_FILENAME="melonds-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="melonDS-$srcGitRev"
 ADDITIONAL_FILES="melonds_libretro.info.in"
diff --git a/games-emulation/mesen_libretro/mesen_libretro-0.9.4_20220407.recipe b/games-emulation/mesen_libretro/mesen_libretro-0.9.4_20220829.recipe
similarity index 92%
rename from games-emulation/mesen_libretro/mesen_libretro-0.9.4_20220407.recipe
rename to games-emulation/mesen_libretro/mesen_libretro-0.9.4_20220829.recipe
index 153307f5c..e5df1a827 100644
--- a/games-emulation/mesen_libretro/mesen_libretro-0.9.4_20220407.recipe
+++ b/games-emulation/mesen_libretro/mesen_libretro-0.9.4_20220829.recipe
@@ -10,9 +10,9 @@ HOMEPAGE="https://www.mesen.ca/"
 COPYRIGHT="2016-2021 Sour, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="bb9ea02eba28682986044a6f49329ec533aa26ba"
+srcGitRev="9b412c1533a6d7eec7b2904775cbd26c21f02119"
 SOURCE_URI="https://github.com/libretro/Mesen/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="ff1b5b567d5e11c1ea63c2d58b1e7c8d7b673bb425908f115f516b1faa446e5f"
+CHECKSUM_SHA256="9a321c90c82c15158511b3df7a1b6ee8269b42083afa3de33f9947cceb925e7c"
 SOURCE_FILENAME="Mesen-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="Mesen-$srcGitRev"
 ADDITIONAL_FILES="mesen_libretro.info.in"
diff --git a/games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20220104.recipe b/games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20220825.recipe
similarity index 92%
rename from games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20220104.recipe
rename to games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20220825.recipe
index 4ead5342e..63676707f 100644
--- a/games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20220104.recipe
+++ b/games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20220825.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mupen64plus.org/"
 COPYRIGHT="2001-2020 Hacktarux, richard42g, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="b76ea63eeeba4c3b0364504a7cea01f1b826c3ae"
+srcGitRev="29717c0b6e1be8c7b46dbd2801a275a72208ffea"
 SOURCE_URI="https://github.com/libretro/mupen64plus-libretro-nx/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a538e5b6698a4221936972d83767300adfdeceb13c97fd7294c682b3c3bd40e0"
+CHECKSUM_SHA256="f788690339a82a166708c61648f7ffc41af9f8c8c67ef63bb88002da6946ee51"
 SOURCE_FILENAME="mupen64plus-libretro-nx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="mupen64plus-libretro-nx-$srcGitRev"
 ADDITIONAL_FILES="mupen64plus_next_libretro.info.in"
diff --git a/games-emulation/neocd_libretro/neocd_libretro-0.5_20220325.recipe b/games-emulation/neocd_libretro/neocd_libretro-0.5_20220515.recipe
similarity index 91%
rename from games-emulation/neocd_libretro/neocd_libretro-0.5_20220325.recipe
rename to games-emulation/neocd_libretro/neocd_libretro-0.5_20220515.recipe
index 12a237f45..e380715d4 100644
--- a/games-emulation/neocd_libretro/neocd_libretro-0.5_20220325.recipe
+++ b/games-emulation/neocd_libretro/neocd_libretro-0.5_20220515.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="327aeceecdf71c8a0c0af3d6dc53686c94fe44ad"
+srcGitRev="b7d96e794f2dfa500cba46c78cbc3c28349cfd05"
 SOURCE_URI="https://github.com/libretro/neocd_libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="401078b4fc2d00b633d6ae0fd44d747dcde4afa79b857953ec1f51b523adc55f"
+CHECKSUM_SHA256="2526d0fe4ee33f57db5f272f72f722211c746e190a35a103c49326d17e8dd33a"
 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/additional-files/nestopia_libretro.info.in b/games-emulation/nestopia_libretro/additional-files/nestopia_libretro.info.in
index 9cdce252e..9a12a8b4e 100644
--- a/games-emulation/nestopia_libretro/additional-files/nestopia_libretro.info.in
+++ b/games-emulation/nestopia_libretro/additional-files/nestopia_libretro.info.in
@@ -18,13 +18,10 @@ supports_no_game = "false"
 database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 
 # Firmware / BIOS
-firmware_count = 2
-firmware0_desc = "NstDatabase.xml (Nestopia UE Database file)"
-firmware0_path = "NstDatabase.xml"
+firmware_count = 1
+firmware0_desc = "disksys.rom (Family Computer Disk System BIOS)"
+firmware0_path = "disksys.rom"
 firmware0_opt = "true"
-firmware1_desc = "disksys.rom (Family Computer Disk System BIOS)"
-firmware1_path = "disksys.rom"
-firmware1_opt = "true"
-notes = "Get NstDatabase.xml from https://github.com/0ldsk00l/nestopia|(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a|Press Retropad L1 to switch disk side."
+notes = "(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a|Press Retropad L1 to switch disk side."
 
-description = "Nestopia is based on the most up-to-date code from the Nestopia-Undead emulator. This core strikes a good balance between performance and accuracy, with support for a wide variety of games and mappers. However, it needs the NstDatabase.xml to determine which games support the Zapper light gun and various other peripherals, as well as to pick certain mappers, so make sure you have that file in place to avoid unnecessary problems. In general, this core is a good choice for most users on desktop and mobile platforms."
+description = "Nestopia is based on the most up-to-date code from the Nestopia-Undead emulator. This core strikes a good balance between performance and accuracy, with support for a wide variety of games and mappers. In general, this core is a good choice for most users on desktop and mobile platforms."
diff --git a/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20220409.recipe b/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20220822.recipe
similarity index 91%
rename from games-emulation/nestopia_libretro/nestopia_libretro-1.49_20220409.recipe
rename to games-emulation/nestopia_libretro/nestopia_libretro-1.49_20220822.recipe
index 8e8a58083..2f29c9c73 100644
--- a/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20220409.recipe
+++ b/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20220822.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="a9e197f2583ef4f36e9e77d930a677e63a2c2f62"
+srcGitRev="a9ee6ca84f04990e209880fe47144e62b14253db"
 SOURCE_URI="https://github.com/libretro/nestopia/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="1372bb29a02c4366039479d1115c890d84cddd07fa443843050692435c3876cb"
+CHECKSUM_SHA256="5d2ce2c19ad5b0e6618a669926a3615ecb0688715cbf268439692cc254eb5d4c"
 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/additional-files/o2em_libretro.info.in b/games-emulation/o2em_libretro/additional-files/o2em_libretro.info.in
index 95297abad..4db60311f 100644
--- a/games-emulation/o2em_libretro/additional-files/o2em_libretro.info.in
+++ b/games-emulation/o2em_libretro/additional-files/o2em_libretro.info.in
@@ -16,6 +16,8 @@ systemid = "odyssey2"
 
 # Libretro Features
 supports_no_game = "false"
+savestate = "true"
+savestate_features = "basic"
 
 # Firmware / BIOS
 firmware_count = 4
diff --git a/games-emulation/o2em_libretro/o2em_libretro-1.18_20220409.recipe b/games-emulation/o2em_libretro/o2em_libretro-1.18_20220726.recipe
similarity index 91%
rename from games-emulation/o2em_libretro/o2em_libretro-1.18_20220409.recipe
rename to games-emulation/o2em_libretro/o2em_libretro-1.18_20220726.recipe
index 4aef5f0ab..4ca6c086d 100644
--- a/games-emulation/o2em_libretro/o2em_libretro-1.18_20220409.recipe
+++ b/games-emulation/o2em_libretro/o2em_libretro-1.18_20220726.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="641f06d67d192a0677ec861fcb731d3ce8da0f87"
+srcGitRev="3303cc15e4323280084471f694f6d34c78199725"
 SOURCE_URI="https://github.com/libretro/libretro-o2em/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="5df321db5b5359fd11fd97926f5a7ee8cb64f1a747732943f5a8391625489064"
+CHECKSUM_SHA256="b01b126c12e193042ccc13b0c44a6d570962ea4c4256da37512b8137c26bb7e8"
 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_20211214.recipe b/games-emulation/opera_libretro/opera_libretro-1.0.0_20220725.recipe
similarity index 91%
rename from games-emulation/opera_libretro/opera_libretro-1.0.0_20211214.recipe
rename to games-emulation/opera_libretro/opera_libretro-1.0.0_20220725.recipe
index b5ec89d37..0f6f2c924 100644
--- a/games-emulation/opera_libretro/opera_libretro-1.0.0_20211214.recipe
+++ b/games-emulation/opera_libretro/opera_libretro-1.0.0_20220725.recipe
@@ -8,9 +8,9 @@ COPYRIGHT="2011-2020 the 4DO/FreeDO team, the libretro team"
 LICENSE="FreeDO
 	GNU LGPL v3"
 REVISION="1"
-srcGitRev="3849c969c64b82e622a7655b327fa94bc5a4c7cc"
+srcGitRev="8a49bb8877611037438aeb857cb182f41ee0e3a1"
 SOURCE_URI="https://github.com/libretro/opera-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="730ccb27aa733b7b16669e58b49188c097b09867117d67bdbfad404d9f76d904"
+CHECKSUM_SHA256="48f94380633808ea01f4608f03ceb6b4b10709ba18abf1df6665f06ae839e7a7"
 SOURCE_FILENAME="libretro-opera-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="opera-libretro-$srcGitRev"
 ADDITIONAL_FILES="opera_libretro.info.in"
diff --git a/games-emulation/parallel_n64_libretro/additional-files/parallel_n64_libretro.info.in b/games-emulation/parallel_n64_libretro/additional-files/parallel_n64_libretro.info.in
index 4492c9722..ddae606f6 100644
--- a/games-emulation/parallel_n64_libretro/additional-files/parallel_n64_libretro.info.in
+++ b/games-emulation/parallel_n64_libretro/additional-files/parallel_n64_libretro.info.in
@@ -19,6 +19,8 @@ hw_render = "true"
 required_hw_api = "OpenGL >= 3.0 | OpenGL ES >= 2.0 | Vulkan >= 1.0"
 database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
 is_experimental = "false"
+savestate = "true"
+savestate_features = "serialized"
 
 # Firmware / BIOS
 firmware_count = 1
diff --git a/games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20220406.recipe b/games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20220823.recipe
similarity index 92%
rename from games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20220406.recipe
rename to games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20220823.recipe
index 77e374584..920de7b6a 100644
--- a/games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20220406.recipe
+++ b/games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20220823.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://github.com/libretro/parallel-n64"
 COPYRIGHT="2019-2020 the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="b804ab1a199d6ff1f8fef4aa7dfcf663990e430b"
+srcGitRev="a03fdcba6b2e9993f050b50112f597ce2f44fa2c"
 SOURCE_URI="https://github.com/libretro/parallel-n64/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="918a949deabd9e5025ca5667cbce40a47bd48eb17909dd6af42fb79baf9b05d4"
+CHECKSUM_SHA256="8ac94a0515bac7aeda51ef5cbb5c042d69d4f73960ca0ae8961e7ecbe3d182fa"
 SOURCE_FILENAME="parallel-n64-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="parallel-n64-$srcGitRev"
 ADDITIONAL_FILES="parallel_n64_libretro.info.in"
diff --git a/games-emulation/pcsx_rearmed_libretro/additional-files/pcsx_rearmed_libretro.info.in b/games-emulation/pcsx_rearmed_libretro/additional-files/pcsx_rearmed_libretro.info.in
index 2b0c04a0e..ef1c64ae3 100644
--- a/games-emulation/pcsx_rearmed_libretro/additional-files/pcsx_rearmed_libretro.info.in
+++ b/games-emulation/pcsx_rearmed_libretro/additional-files/pcsx_rearmed_libretro.info.in
@@ -16,7 +16,7 @@ systemid = "playstation"
 database = "Sony - PlayStation"
 supports_no_game = "false"
 savestate = "true"
-savestate_features = "serialized"
+savestate_features = "deterministic"
 cheats = "true"
 input_descriptors = "true"
 memory_descriptors = "true"
diff --git a/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20220409.recipe b/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20221002.recipe
similarity index 92%
rename from games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20220409.recipe
rename to games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20221002.recipe
index 71008e283..522d74c78 100644
--- a/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20220409.recipe
+++ b/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20221002.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="e24732050e902bd5402b2b7da7c391d2ca8fa799"
+srcGitRev="f94d3b198b9b7afa5b9025ba70652bed11b12052"
 SOURCE_URI="https://github.com/libretro/pcsx_rearmed/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="96b933eb2877ff224b3b00af0e9f4f3560d3d0b1c0bb18f67060e7e5598c1757"
+CHECKSUM_SHA256="f6c295a28fa771da378de88cb9573b0eaac7d03b3d413424b33981872c0ef6b4"
 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 075f48a3e..2ce5260b2 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 - GG/MS/MD/CD/32X (PicoDrive)"
+display_name = "Sega - MS/GG/MD/CD/32X (PicoDrive)"
 authors = "notaz|fdave|irixxxx"
-supported_extensions = "bin|gen|gg|smd|md|32x|chd|cue|iso|sms|68k|sgd|m3u"
+supported_extensions = "bin|gen|gg|smd|pco|md|32x|chd|cue|iso|sms|68k|sgd|m3u"
 corename = "PicoDrive"
 license = "MAME"
 permissions = "dynarec_optional"
diff --git a/games-emulation/picodrive_libretro/picodrive_libretro-1.92_20220405.recipe b/games-emulation/picodrive_libretro/picodrive_libretro-1.92_20220930.recipe
similarity index 96%
rename from games-emulation/picodrive_libretro/picodrive_libretro-1.92_20220405.recipe
rename to games-emulation/picodrive_libretro/picodrive_libretro-1.92_20220930.recipe
index 3c0dcdd70..927c1440b 100644
--- a/games-emulation/picodrive_libretro/picodrive_libretro-1.92_20220405.recipe
+++ b/games-emulation/picodrive_libretro/picodrive_libretro-1.92_20220930.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="bb6a52fe60e6f3bdcd17effe75e68fd0f8c44ba7"
+srcGitRev="26719f348eb579a8372e2c58ef0132d95d9dc817"
 SOURCE_URI="https://github.com/libretro/picodrive/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="d064c9f954b3cbae596994b115f9e668209852baf1f38544f8781751147926f8"
+CHECKSUM_SHA256="628568c8d81a1d6fffcf188687763586d35a5394d4c9df02a01e85d22828d119"
 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_20220321.recipe b/games-emulation/retroarch_assets/retroarch_assets-0_20220806.recipe
similarity index 85%
rename from games-emulation/retroarch_assets/retroarch_assets-0_20220321.recipe
rename to games-emulation/retroarch_assets/retroarch_assets-0_20220806.recipe
index cbb139dd7..9a0c24fee 100644
--- a/games-emulation/retroarch_assets/retroarch_assets-0_20220321.recipe
+++ b/games-emulation/retroarch_assets/retroarch_assets-0_20220806.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://libretro.com/"
 COPYRIGHT="2010-2021 The RetroArch Team"
 LICENSE="CC-BY-4.0"
 REVISION="1"
-srcGitRev="f45dd1351e6bfb9f01e12bee8d358ad22a2bb8f9"
+srcGitRev="ee33f8ef693b42a8e23ca3fd48f43f345e7cd087"
 SOURCE_URI="https://github.com/libretro/retroarch-assets/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="ba77eadf9f247fb0f2419ed27f2fa32ed70647df6bd41f2fca187dfef09f6872"
+CHECKSUM_SHA256="b110163b0898b56be5245fd77a626b69fe5624234a5bf6af22487e2c2ee50a33"
 SOURCE_FILENAME="retroarch-assets-$portVersion.tar.gz"
 SOURCE_DIR="retroarch-assets-$srcGitRev"
 
diff --git a/games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211220.recipe b/games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20220819.recipe
similarity index 92%
rename from games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211220.recipe
rename to games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20220819.recipe
index 77a11bff2..f92f892bc 100644
--- a/games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20211220.recipe
+++ b/games-emulation/sameboy_libretro/sameboy_libretro-0.9.0_20220819.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://sameboy.github.io/downloads/"
 COPYRIGHT="2016-2021 LIJI32, the libretro team"
 LICENSE="MIT"
 REVISION="1"
-srcGitRev="b154b7d3d885a3cf31203f0b8f50d3b37c8b742b"
+srcGitRev="09138330990da32362246c7034cf4de2ea0a2a2b"
 SOURCE_URI="https://github.com/libretro/SameBoy/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a8728627d7343abc097d74ff0a0f7ad6ebb5d5b70aba1f7ff81b73ce8f192806"
+CHECKSUM_SHA256="9ef470c7c6bee83bbeb1e861a1c76b722d78de5e5a3849e7132d03d40fa8828d"
 SOURCE_FILENAME="SameBoy-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="SameBoy-$srcGitRev"
 ADDITIONAL_FILES="sameboy_libretro.info.in"
diff --git a/games-emulation/snes9x_libretro/additional-files/snes9x_libretro.info.in b/games-emulation/snes9x_libretro/additional-files/snes9x_libretro.info.in
index fcebe3b08..c151f443b 100644
--- a/games-emulation/snes9x_libretro/additional-files/snes9x_libretro.info.in
+++ b/games-emulation/snes9x_libretro/additional-files/snes9x_libretro.info.in
@@ -34,7 +34,7 @@ core_options = "true"
 core_options_version = "1.3"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/games-emulation/snes9x_libretro/snes9x_libretro-1.60_20220414.recipe b/games-emulation/snes9x_libretro/snes9x_libretro-1.60_20220512.recipe
similarity index 92%
rename from games-emulation/snes9x_libretro/snes9x_libretro-1.60_20220414.recipe
rename to games-emulation/snes9x_libretro/snes9x_libretro-1.60_20220512.recipe
index 1f9ba890f..f8e0f5f26 100644
--- a/games-emulation/snes9x_libretro/snes9x_libretro-1.60_20220414.recipe
+++ b/games-emulation/snes9x_libretro/snes9x_libretro-1.60_20220512.recipe
@@ -10,9 +10,9 @@ LICENSE="Snes9x
 	GNU GPL v2
 	GNU LGPL v2.1"
 REVISION="1"
-srcGitRev="bc65c09c280cb225084099385375d3b513a43455"
+srcGitRev="ae16176a18fa2a7d642be5d66dbe1926d9d08e90"
 SOURCE_URI="https://github.com/libretro/snes9x/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="b5a2e4e1663e140bb0503b3d32d31da9428e9dd66a08d249c6a41aecb7bf71f2"
+CHECKSUM_SHA256="54bb2a593820e9445784ae01e42e4fdc69a48c1c03346aa0406aa9622eea7dfc"
 SOURCE_FILENAME="snes9x-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="snes9x-$srcGitRev"
 ADDITIONAL_FILES="snes9x_libretro.info.in"
diff --git a/games-emulation/vecx_libretro/vecx_libretro-1.2_20220327.recipe b/games-emulation/vecx_libretro/vecx_libretro-1.2_20220728.recipe
similarity index 92%
rename from games-emulation/vecx_libretro/vecx_libretro-1.2_20220327.recipe
rename to games-emulation/vecx_libretro/vecx_libretro-1.2_20220728.recipe
index 7012b486a..772bde80d 100644
--- a/games-emulation/vecx_libretro/vecx_libretro-1.2_20220327.recipe
+++ b/games-emulation/vecx_libretro/vecx_libretro-1.2_20220728.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="141af284202c86ed0d4ce9030c76954a144287cf"
+srcGitRev="b5c17bb7fd4a704f58160bc699322a16d0643396"
 SOURCE_URI="https://github.com/libretro/libretro-vecx/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="8fc8055a4f55c42d352dd2d82d3775996f604ad101f8c4f3140c20108f3d1b92"
+CHECKSUM_SHA256="2ea4e397ed0339f1cb28a0ecd0c1ab74e60f99e0923e6d6bee66aeb4ff2fa4a8"
 SOURCE_FILENAME="libretro-vecx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-vecx-$srcGitRev"
 ADDITIONAL_FILES="vecx_libretro.info.in"
diff --git a/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20220218.recipe b/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20220712.recipe
similarity index 91%
rename from games-emulation/yabause_libretro/yabause_libretro-0.9.15_20220218.recipe
rename to games-emulation/yabause_libretro/yabause_libretro-0.9.15_20220712.recipe
index e6c21af94..c0410a72e 100644
--- a/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20220218.recipe
+++ b/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20220712.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="17dfcd8de4700341d972993501d3a043925675ce"
+srcGitRev="c7e02721eddb3de0ec7ae0d61e9e3afa5f586a62"
 SOURCE_URI="https://github.com/libretro/yabause/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="591764666cd780b2367423d31cee4a30a9971ccecf5c17901f568a4ef4c2e49a"
+CHECKSUM_SHA256="bcca900ed7c5721d56b09d4c8efb97d1fbae29ace0b40a2c0fbe232ba1c79b47"
 SOURCE_FILENAME="libretro-yabause-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="yabause-$srcGitRev"
 ADDITIONAL_FILES="yabause_libretro.info.in"
diff --git a/games-fps/tyrquake_libretro/patches/tyrquake_libretro-0.62_20220409.patchset b/games-fps/tyrquake_libretro/patches/tyrquake_libretro-0.62_20220724.patchset
similarity index 100%
rename from games-fps/tyrquake_libretro/patches/tyrquake_libretro-0.62_20220409.patchset
rename to games-fps/tyrquake_libretro/patches/tyrquake_libretro-0.62_20220724.patchset
diff --git a/games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20220409.recipe b/games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20220724.recipe
similarity index 89%
rename from games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20220409.recipe
rename to games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20220724.recipe
index 9e96f1f6f..1069ef19b 100644
--- a/games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20220409.recipe
+++ b/games-fps/tyrquake_libretro/tyrquake_libretro-0.62_20220724.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="c516c1fe4266e5f982703d509cc10ceb12167894"
+srcGitRev="89f3e032757b9b56e8d62a528a4a2472e60631aa"
 SOURCE_URI="https://github.com/libretro/tyrquake/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="6925305c2b7b5b46b4174d8588af6e6be483ae8187bb550748ad496c7e683ef4"
+CHECKSUM_SHA256="b7393238453b2c117b0639f9f9f5dd9e6f34aa35ee39af109eb7e75a58b429ad"
 SOURCE_FILENAME="libretro-tyrquake-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="tyrquake-$srcGitRev"
-PATCHES="tyrquake_libretro-0.62_20220409.patchset"
+PATCHES="tyrquake_libretro-0.62_20220724.patchset"
 ADDITIONAL_FILES="tyrquake_libretro.info.in"
 
 ARCHITECTURES="all !x86_gcc2"
diff --git a/games-puzzle/2048_libretro/2048_libretro-1.0_20220327.recipe b/games-puzzle/2048_libretro/2048_libretro-1.0_20220707.recipe
similarity index 91%
rename from games-puzzle/2048_libretro/2048_libretro-1.0_20220327.recipe
rename to games-puzzle/2048_libretro/2048_libretro-1.0_20220707.recipe
index 8b2bcf54a..e377bf185 100644
--- a/games-puzzle/2048_libretro/2048_libretro-1.0_20220327.recipe
+++ b/games-puzzle/2048_libretro/2048_libretro-1.0_20220707.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://gabrielecirulli.github.io/2048/"
 COPYRIGHT="2014-2018 Gabriele Cirulli, the libretro team"
 LICENSE="Public Domain"
 REVISION="1"
-srcGitRev="a8899c960c0f8fca24f9c319cb935fe164b97bf9"
+srcGitRev="5bfb48b75f5eb3903a92a9836fab0deb14c83ff6"
 SOURCE_URI="https://github.com/libretro/libretro-2048/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="25617b2f46513f246150ba102a179590327c275093596b66f9af8d1c9f764a5a"
+CHECKSUM_SHA256="d4023295d711bf9b67c375fa5d116a09b0bed522b399e64ad8a0374ba95ecd7f"
 SOURCE_FILENAME="libretro-2048-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-2048-$srcGitRev"
 ADDITIONAL_FILES="2048_libretro.info.in"
diff --git a/games-puzzle/2048_libretro/additional-files/2048_libretro.info.in b/games-puzzle/2048_libretro/additional-files/2048_libretro.info.in
index 2bb04124c..c69c6804e 100644
--- a/games-puzzle/2048_libretro/additional-files/2048_libretro.info.in
+++ b/games-puzzle/2048_libretro/additional-files/2048_libretro.info.in
@@ -14,7 +14,9 @@ systemid = "2048"
 manufacturer = "N/A"
 
 # Libretro Features
+database = "2048"
 supports_no_game = "true"
+single_purpose = "true"
 savestate = "true"
 savestate_features = "serialized"
 cheats = "false"
diff --git a/media-sound/gme_libretro/additional-files/gme_libretro.info.in b/media-sound/gme_libretro/additional-files/gme_libretro.info.in
index ed12506c8..f646128dd 100644
--- a/media-sound/gme_libretro/additional-files/gme_libretro.info.in
+++ b/media-sound/gme_libretro/additional-files/gme_libretro.info.in
@@ -15,5 +15,6 @@ systemid = "game_music"
 
 # Libretro Features
 supports_no_game = "false"
+savestate = "false"
 
 description = "A port of blargg's classic Game Music Emu to libretro. This core allows playback of a wide variety of video game music formats and is a good first choice for this purpose, though some emulator cores will also support playback of their respective native formats and may do so with additional options (low-pass filtering, etc.) or accuracy."
diff --git a/media-sound/gme_libretro/gme_libretro-0.5.2_20220410.recipe b/media-sound/gme_libretro/gme_libretro-0.5.2_20220726.recipe
similarity index 92%
rename from media-sound/gme_libretro/gme_libretro-0.5.2_20220410.recipe
rename to media-sound/gme_libretro/gme_libretro-0.5.2_20220726.recipe
index 7c7458f3d..6b9c00222 100644
--- a/media-sound/gme_libretro/gme_libretro-0.5.2_20220410.recipe
+++ b/media-sound/gme_libretro/gme_libretro-0.5.2_20220726.recipe
@@ -11,9 +11,9 @@ COPYRIGHT="2004-2020 Blargg, the libretro team"
 LICENSE="GNU GPL v2
 	GNU LGPL v2"
 REVISION="1"
-srcGitRev="5fb30ebb8871624cecc07813212fb643fa8449f4"
+srcGitRev="635b1e9124195eeb44d8a865f258cc2c92846694"
 SOURCE_URI="https://github.com/libretro/libretro-gme/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="ea4394c28fd63b3b1f8ca2e7aa83ad4a14fb360815e4d593065466712769550a"
+CHECKSUM_SHA256="d1183d5d054d24bb43428d38b6addefc4cb69582a112197979a799fd8c30ed51"
 SOURCE_FILENAME="libretro-gme-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-gme-$srcGitRev"
 ADDITIONAL_FILES="gme_libretro.info.in"