Merge updates from master

dev-python/tempy/Manifest

@@ -1 +1 @@
-DIST tempy-1.0.8.tar.gz 1526803 BLAKE2B da6a8417ec90f2f3a7b167e8b4a38310d8729e281a57d9e05e72b7a315fb59cf308df55e8f7d380a49a191b6d20c51b95b481b33468f92b634ede23aa21678e9 SHA512 e2a43d978fae111a7dababa541fcc59eb25c22e548ea965af2a1072cc4d095e12235657a96300f37a1f92c040c6797100b7150ab80945252cc28b4e0bab29182
+DIST tempy-1.0.9.tar.gz 1526849 BLAKE2B 8cdfebb70079ad84813a5281363935e3a26179149933927f6815be0dc50b4661e969e5e2fcdfb6d0cd42d5a4f65fa91cc33750d5151a7f3f281b25f6cf7f518c SHA512 62acfa7dd27358bfed2ccb99c04d6b3b5ccde775a9c4708a1f86694d257812a6a51674977a3ea95ad1e829238303fb737d9968b7b93492e32bdfad0f8cae76f3

dev-python/tempy/tempy-1.0.9.ebuild

@@ -10,8 +10,8 @@ inherit distutils-r1
 
 DESCRIPTION="A simple, visually pleasing weather report in your terminal"
 HOMEPAGE="https://github.com/noprobelm/tempy"
-SRC_URI="https://github.com/noprobelm/tempy/archive/0af52d8.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/tempy-0af52d8c18399cd19e2f162539e4869dbc46107a"
+SRC_URI="https://github.com/noprobelm/tempy/archive/7a597ee.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/tempy-7a597ee78fc7ba2c4ced041780470f568998f3c1"
 
 LICENSE="MIT"
 SLOT="0"

games-emulation/citra-canary/citra-canary-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,19 +8,17 @@ inherit cmake git-r3 xdg
 DESCRIPTION="A Nintendo 3DS Emulator"
 HOMEPAGE="https://citra-emu.org"
 EGIT_REPO_URI="https://github.com/citra-emu/citra-canary"
-EGIT_SUBMODULES=( '*'
-	'-boost' '-catch' '-cryptopp' '-cubeb' '-enet'
-	'-inih' '-libressl' '-libusb' '-teakra' '-zstd'
-	'-externals/dynarmic/externals/fmt'
-	'-externals/dynarmic/externals/xbyak'
+EGIT_SUBMODULES=(
+	'catch2' 'discord-rpc' 'dynarmic' 'libyuv'
+	'lodepng' 'nihstro' 'soundtouch' 'xbyak'
 )
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video"
+IUSE="cubeb +hle-sound nls +qt5 sdl +system-libfmt +telemetry video"
 
-DEPEND="
+RDEPEND="
 	cubeb? ( media-libs/cubeb )
 	!hle-sound? ( media-libs/fdk-aac )
 	hle-sound? ( media-video/ffmpeg[fdk] )
@@ -34,24 +32,25 @@ DEPEND="
 		media-libs/libsdl2
 		>=dev-libs/inih-52
 	)
-	system-libfmt? ( <=dev-libs/libfmt-8 )
-	video? ( media-video/ffmpeg )
-	>=dev-libs/openssl-1.1
+	system-libfmt? ( >=dev-libs/libfmt-9:= )
+	video? ( media-video/ffmpeg:= )
+	>=dev-libs/openssl-1.1:=
 	app-arch/zstd
-	dev-cpp/catch:0
-	dev-cpp/robin-map
 	dev-libs/boost:=
-	dev-libs/crypto++
+	dev-libs/crypto++:=
 	dev-libs/teakra
-	net-libs/enet:1.3
+	net-libs/enet:1.3=
 	virtual/libusb:1
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-cpp/cpp-httplib
+	dev-cpp/cpp-jwt
+	dev-cpp/robin-map"
 REQUIRED_USE="|| ( qt5 sdl )"
 
 src_unpack() {
-	if use system-libfmt; then
-		EGIT_SUBMODULES+=( "-fmt" "-externals/dynarmic/externals/fmt" )
+	if ! use system-libfmt; then
+		EGIT_SUBMODULES+=( 'fmt' )
 	fi
 	git-r3_src_unpack
 
@@ -81,7 +80,7 @@ src_prepare() {
 	sed -i '/install/s/citra\./citra-canary./' CMakeLists.txt || die
 
 	# Dynarmic: ensure those are unbundled
-	for ext in fmt catch robin-map; do
+	for ext in fmt robin-map; do
 		rm -rf externals/dynarmic/externals/${ext} || die
 	done
 
@@ -113,10 +112,7 @@ src_prepare() {
 
 	if use system-libfmt; then # Unbundle libfmt
 		sed -i -e '/fmt/d' externals/CMakeLists.txt || die
-		sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
-			src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die
-		sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
-		sed -i -e '/^#pragma once$/a#include <algorithm>' src/common/logging/log.h || die
+		sed -i -e '/find_package(Threads/afind_package(fmt)' CMakeLists.txt || die
 	fi
 
 	# Unbundle teakra
@@ -140,14 +136,7 @@ src_prepare() {
 		-e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \
 		src/dedicated_room/CMakeLists.txt \
 		src/core/CMakeLists.txt || die
-	sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die
-
-	# Unbundle catch
-	sed -i -e '1ifind_package(Catch2)' src/tests/CMakeLists.txt externals/dynarmic/tests/CMakeLists.txt || die
-	sed -i -e '/target_link_libraries/s/catch/Catch2::Catch2/' externals/dynarmic/tests/CMakeLists.txt || die
-	sed -i -e '/target_link_libraries/s/catch-single-include/Catch2::Catch2/' src/tests/CMakeLists.txt || die
-	sed -i -e '/catch/d' externals/CMakeLists.txt externals/dynarmic/externals/CMakeLists.txt || die
-	grep -rl 'include <catch.hpp>' externals/dynarmic | xargs sed -i -e '/include/s:catch.hpp:catch/&:' || die
+	sed -i -e '/cryptopp-cmake/d' externals/CMakeLists.txt || die
 
 	# Unbundle cubeb
 	sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
@@ -155,7 +144,20 @@ src_prepare() {
 		sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
 	fi
 
-	# TODO unbundle xbyak (wait for 5.96 in ytree)
+	# Unbundle cpp-httplib
+	sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
+	sed -i -e 's/ httplib//' src/{web_service,network,core}/CMakeLists.txt || die
+
+	# Unbundle cpp-jwt
+	sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
+	sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
+
+	# Unbundle xbyak
+	sed -i -e '/^install(/,/^)$/d' externals/xbyak/CMakeLists.txt || die
+
+	# Do not install dynarmic
+	sed -i -e '/^# Install/,$d' externals/dynarmic/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
@@ -171,9 +173,15 @@ src_configure() {
 		-DENABLE_WEB_SERVICE=$(usex telemetry)
 		-DGENERATE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF)
 		-DUSE_SYSTEM_BOOST=ON
+		-DUSE_SYSTEM_SDL2=ON
 	)
 	cmake_src_configure
 
 	# This would be better in src_unpack but it would be unlinked
 	mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die
 }
+
+src_install() {
+	cmake_src_install
+	rm -rf "${D}"/usr/$(get_libdir)/cmake
+}

games-emulation/citra/citra-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ EGIT_SUBMODULES=(
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video"
+IUSE="cubeb +hle-sound nls +qt5 sdl +system-libfmt +telemetry video"
 
 RDEPEND="
 	cubeb? ( media-libs/cubeb )
@@ -32,7 +32,7 @@ RDEPEND="
 		media-libs/libsdl2
 		>=dev-libs/inih-52
 	)
-	system-libfmt? ( <=dev-libs/libfmt-8:= )
+	system-libfmt? ( >=dev-libs/libfmt-9:= )
 	video? ( media-video/ffmpeg:= )
 	>=dev-libs/openssl-1.1:=
 	app-arch/zstd
@@ -42,8 +42,8 @@ RDEPEND="
 	net-libs/enet:1.3=
 	virtual/libusb:1
 "
-DEPEND="${RDEPEND}
-	dev-cpp/cpp-httplib
+DEPEND="${RDEPEND}"
+BDEPEND="dev-cpp/cpp-httplib
 	dev-cpp/cpp-jwt
 	dev-cpp/robin-map"
 REQUIRED_USE="|| ( qt5 sdl )"
@@ -94,10 +94,7 @@ src_prepare() {
 
 	if use system-libfmt; then # Unbundle libfmt
 		sed -i -e '/fmt/d' externals/CMakeLists.txt || die
-		sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
-			src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die
-		sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
-		sed -i -e '/^#pragma once$/a#include <algorithm>' src/common/logging/log.h || die
+		sed -i -e '/find_package(Threads/afind_package(fmt)' CMakeLists.txt || die
 	fi
 
 	# Unbundle teakra
@@ -121,7 +118,7 @@ src_prepare() {
 		-e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \
 		src/dedicated_room/CMakeLists.txt \
 		src/core/CMakeLists.txt || die
-	sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die
+	sed -i -e '/cryptopp-cmake/d' externals/CMakeLists.txt || die
 
 	# Unbundle cubeb
 	sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
@@ -137,6 +134,12 @@ src_prepare() {
 	sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
 	sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
 
+	# Unbundle xbyak
+	sed -i -e '/^install(/,/^)$/d' externals/xbyak/CMakeLists.txt || die
+
+	# Do not install dynarmic
+	sed -i -e '/^# Install/,$d' externals/dynarmic/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
@@ -159,3 +162,8 @@ src_configure() {
 	# This would be better in src_unpack but it would be unlinked
 	mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die
 }
+
+src_install() {
+	cmake_src_install
+	rm -rf "${D}"/usr/$(get_libdir)/cmake
+}

games-emulation/flycast/flycast-9999.ebuild

@@ -32,7 +32,7 @@ DEPEND="
 	openmp? ( sys-devel/gcc:*[openmp] )
 	pulseaudio? ( media-sound/pulseaudio )
 	vulkan? (
-		dev-util/glslang
+		>=dev-util/glslang-1.3.231
 		dev-util/spirv-headers
 	)
 "
@@ -67,7 +67,6 @@ src_prepare() {
 	sed -i -e '/add_subdirectory(core\/deps\/glslang/{N;s/.*/find_library(GLSLANG libglslang.so)\nfind_library(SPIRV libSPIRV.so)\ntarget_link_libraries(${PROJECT_NAME} PRIVATE ${GLSLANG} ${SPIRV})/}' CMakeLists.txt || die
 	sed -i -e '/include.*SPIRV/{s:":<glslang/:;s/"/>/}' core/rend/vulkan/shaders.h \
 		core/rend/vulkan/compiler.cpp || die
-	sed -i -e '/maxMeshViewCountNV/a1,' core/rend/vulkan/compiler.cpp || die
 
 	# Unbundle xxHash
 	sed -i -e '/XXHASH_BUILD_XXHSUM/{N;N;s/.*/target_link_libraries(${PROJECT_NAME} PRIVATE xxhash)/}' CMakeLists.txt || die
@@ -84,9 +83,6 @@ src_prepare() {
 	# Vulkan-header
 	sed -i -e '/add_subdirectory(core.*Vulkan-Headers)$/,/Vulkan::Headers/d' \
 		-e '/core\/deps\/Vulkan-Headers\/include)/d' CMakeLists.txt
-	# local fix for < 1.3.224
-	sed -i -e '/^1,$/d' core/rend/vulkan/compiler.cpp
-	sed -i -e '/swapchainExtent = /{s/= /&static_cast<VkExtent2D>(/;s/;/);/}' core/rend/vulkan/vulkan_context.cpp
 
 	# Do not use ccache
 	sed -i -e '/find_program(CCACHE_PROGRAM ccache)/d' CMakeLists.txt

gui-apps/packettracer/packettracer-8.2.0.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop pax-utils unpacker xdg
+inherit desktop unpacker xdg
 
 DESCRIPTION="Cisco's packet tracer"
 HOMEPAGE="https://www.netacad.com/portal/resources/packet-tracer"

media-fonts/iosevka-nerdfont/Manifest

@@ -1 +1,2 @@
 DIST iosevka-nerdfont-2.2.2.zip 486465366 BLAKE2B 04fe963c0e2c4bc076854c1b6d7382a4e9222ead92e320ad369a230c771be9c88300cd2f2cd4d8b4bfbe9a66d76577390fa750e46735be993b51eb0f9e87631e SHA512 99ec42555babde800cfe320a5e48eba6dafaaecfb86ff8964a092e321bac8635dd6a5ffe9a792e56dbf83794f1a7da5368a14ff3ac3c4a70a066999fd6604153
+DIST iosevka-nerdfont-2.3.3.zip 684962518 BLAKE2B d374f91e1253e29e682ea9199a049d1b95ad51749e26a03b312b3bc64b53f43f1dd998fbfcb22e71f67782eec1ee92c0242da0cf3deca33d7bcee258afe0bfdd SHA512 48096d703a25bd9e38df66ee4fbee1a289564ef30a2eb29236c24fb669074df82d95f68b6e0b18e74ef64682cc1cfa4903f943c6dd81534371bb45ae5edcef26

media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.3.3.ebuild

@@ -0,0 +1,19 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="A free and open-source typeface for developers"
+HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
+SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Iosevka.zip -> ${P}.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+FONT_SUFFIX="ttf"