diff --git a/app-text/typst/Manifest b/app-text/typst/Manifest
index 7d4fd4c818..1f636aecce 100644
--- a/app-text/typst/Manifest
+++ b/app-text/typst/Manifest
@@ -256,9 +256,9 @@ DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c31
DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
DIST thiserror-1.0.57.crate 20993 BLAKE2B 4eb90b8ee027e39102d6c030176db94510180f2bd2966503501ff89ca6b49afd61e6d9e1ebf18c08d374ff9de4e958dfcb3da8740fdfe31cceace5be456bfe4b SHA512 0ff7e48c3696f4f4c6af29f3142f0a7bb88a07b7a9877ec243e3ea15d89c48f1898b731311da5d4a7c88060628cae3eeea6a4eccf25bd851cb3075920cb1a936
DIST thiserror-impl-1.0.57.crate 15639 BLAKE2B 2838235c5536fcb16d19382fe286850d6fb882b1d77ca4ade6a62e1d4727ef89f69cf0383cf330996f9e2303226d5fd709557331a45c9a91393db1788fbf4422 SHA512 a850806f09b232546d1e0df5e35cd961a8aa32f1d8ac3b24df360981da53b75325a46dc788c994042c95a5887fdc77234b9f6ee5851242f734a613e579548e3c
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
+DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
+DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
DIST tiny-skia-0.11.4.crate 201082 BLAKE2B fe350137665e6229ea707bedbb535b8d5c3fd24752ec9c97e2a6c43b28ce7fb9107935a6f91074e0613dd2a156a45dde695343cde7ca78f3f9079636c5e1f9d9 SHA512 1371fa11934c1223169fb4494accf3b47958003e19a603e8fde446216e2c1253a6ef80da5d7bf3c9c73038f5282e3c47cc5f8eb87f8456cc5706392b28b4ecac
DIST tiny-skia-path-0.11.4.crate 47764 BLAKE2B 55b76adc467fb4c063ac2136271c353b92254f20a68e5205395081582c624481687bc319845e217868e5f2c54ef320728d0b2ddefe32fab1a17b90882168c2dd SHA512 723557dcb08cbdbc4d442ccfbba38481b922e367cec07fa23957f9271a96d1c656fd46bb0e0b5609686e5c830d1a988b0e209f57d0765d0afa738e5b2b0d8dc8
DIST tinystr-0.7.5.crate 16366 BLAKE2B 00a5eda21da581ab351dbdd2591960c027d0d1e35f00b2b1049cf78ce115b4e7f9583ebec74d0a95c79112d2b4fa60ab8440ec83646542d8c73236790c07ae8c SHA512 f6f5ee490049a3572d13305f1431d4882f201c81bacb0e0a333e949a0a955c98d3a0d347b1f31d1fc8eaeefb4690a3fe6fb18e82163b92d10b757a56bb5610c3
diff --git a/app-text/typst/files/typst-0.11.1-alt-bump-time-version.patch b/app-text/typst/files/typst-0.11.1-alt-bump-time-version.patch
new file mode 100644
index 0000000000..6e4db8e9a2
--- /dev/null
+++ b/app-text/typst/files/typst-0.11.1-alt-bump-time-version.patch
@@ -0,0 +1,30 @@
+This patch updates time to 0.3.16 which makes compiling typst with rust 1.80.0 possible
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 0a9e82ce..a613f4d9 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2376,9 +2376,9 @@ dependencies = [
+
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+ "deranged",
+ "itoa",
+@@ -2397,9 +2397,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+ "num-conv",
+ "time-core",
diff --git a/app-text/typst/typst-0.11.1.ebuild b/app-text/typst/typst-0.11.1.ebuild
index bc3492110a..66838e2005 100644
--- a/app-text/typst/typst-0.11.1.ebuild
+++ b/app-text/typst/typst-0.11.1.ebuild
@@ -265,8 +265,8 @@ CRATES="
thiserror-impl@1.0.57
thiserror@1.0.57
time-core@0.1.2
- time-macros@0.2.17
- time@0.3.34
+ time-macros@0.2.18
+ time@0.3.36
tiny-skia-path@0.11.4
tiny-skia@0.11.4
tinystr@0.7.5
@@ -391,6 +391,11 @@ QA_FLAGS_IGNORED="usr/bin/typst"
DOCS=( README.md )
+src_prepare() {
+ eapply "${FILESDIR}/typst-0.11.1-alt-bump-time-version.patch"
+ eapply_user
+}
+
src_compile() {
local GIT_HASH=$(gunzip < "${DISTDIR}/${P}.tar.gz" | git get-tar-commit-id)
export TYPST_VERSION="${PV} (${GIT_HASH::8})"
diff --git a/games-emulation/RetroArch/Manifest b/games-emulation/RetroArch/Manifest
index c2f97488e6..685f94c5df 100644
--- a/games-emulation/RetroArch/Manifest
+++ b/games-emulation/RetroArch/Manifest
@@ -1 +1 @@
-DIST RetroArch-1.16.0.3.tar.gz 49084629 BLAKE2B e04b33585085679262da52ba37a960c1b5076628ffeaadd0beb7bceaf092f7a202677622fec5156ee61afdffbbaae050379d8038ef331475b17a7f0bbb8c50b3 SHA512 a208905257ef5ac38f055195a06167cba5727f470abcba20015ae47bec9af5936fbdc50badb146502d6ccf8de76eaad5846a131974919bb99ea5a0a008624bc1
+DIST RetroArch-1.19.1.tar.gz 63298569 BLAKE2B 66acbd32117704f543d3dfe94906d89b4500d51b56f57d1d236ce65e4e78c0c17a830b7c1dd4683f940423cfa88c65956a57bd5fa47591713a5c4d987c928161 SHA512 35e44ffc776cbc7f58fa76c686d3c3693d125fccf482c8f3b66378058b8400ada37ebf2549e9bd362e46c3bfb586971a217cc3142dcf7a7468c95ec78638ee23
diff --git a/games-emulation/RetroArch/RetroArch-1.16.0.3.ebuild b/games-emulation/RetroArch/RetroArch-1.19.1.ebuild
similarity index 76%
rename from games-emulation/RetroArch/RetroArch-1.16.0.3.ebuild
rename to games-emulation/RetroArch/RetroArch-1.19.1.ebuild
index c621d30dc2..b7fa0223c2 100644
--- a/games-emulation/RetroArch/RetroArch-1.16.0.3.ebuild
+++ b/games-emulation/RetroArch/RetroArch-1.19.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="RetroArch is a frontend for emulators, game engines and media players"
HOMEPAGE="https://www.retroarch.com"
@@ -14,12 +14,10 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="7zip alsa cg cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_x86_sse2 cheevos debug dispmanx +egl filters ffmpeg gles2 gles3 hid jack kms libass libusb materialui network openal +opengl osmesa oss +ozone +pulseaudio +rgui sdl sdl2 +truetype +threads udev v4l2 videocore vulkan wayland +X xinerama xmb xv zlib"
+IUSE="7zip alsa cg cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_x86_sse2 cheevos debug dispmanx +egl filters ffmpeg gles2 gles3 hid jack kms libass libusb materialui network openal +opengl osmesa oss +ozone pulseaudio +rgui sdl +truetype +threads udev v4l2 videocore vulkan wayland X xinerama xmb xv zlib"
REQUIRED_USE="
- || ( alsa jack openal oss pulseaudio )
- || ( opengl sdl sdl2 vulkan dispmanx )
- || ( kms X wayland videocore )
+ || ( opengl sdl vulkan dispmanx )
|| ( materialui ozone rgui xmb )
alsa? ( threads )
arm? ( gles2? ( egl ) )
@@ -34,17 +32,16 @@ REQUIRED_USE="
kms? ( egl )
libass? ( ffmpeg )
libusb? ( hid )
- sdl? ( rgui )
- sdl2? ( rgui !sdl )
videocore? ( arm )
vulkan? ( amd64 )
wayland? ( egl )
xinerama? ( X )
xv? ( X )
"
-
RDEPEND="
- alsa? ( media-libs/alsa-lib:0= )
+ app-arch/xz-utils
+ x11-libs/libxkbcommon
+ alsa? ( media-libs/alsa-lib )
cg? ( media-gfx/nvidia-cg-toolkit:0= )
arm? ( dispmanx? ( || ( media-libs/raspberrypi-userland:0 media-libs/raspberrypi-userland-bin:0 ) ) )
ffmpeg? ( >=media-video/ffmpeg-2.1.3:0= )
@@ -52,31 +49,44 @@ RDEPEND="
libass? ( media-libs/libass:0= )
libusb? ( virtual/libusb:1= )
openal? ( media-libs/openal:0= )
- opengl? ( media-libs/mesa:0=[gles2(+)?] )
+ opengl? ( media-libs/libglvnd )
osmesa? ( media-libs/mesa:0=[osmesa?] )
- pulseaudio? ( media-libs/libpulse:0= )
- sdl? ( >=media-libs/libsdl-1.2.10:0=[joystick] )
- sdl2? ( media-libs/libsdl2:0=[joystick] )
- truetype? ( media-libs/freetype:2= )
- udev? ( virtual/udev:0=
+ pulseaudio? ( media-libs/libpulse )
+ sdl? ( media-libs/libsdl2[joystick] )
+ truetype? (
+ media-libs/fontconfig
+ media-libs/freetype:2
+ )
+ udev? ( virtual/udev
X? ( x11-drivers/xf86-input-evdev:0= )
)
- amd64? ( vulkan? ( media-libs/vulkan-loader:0= ) )
+ amd64? ( vulkan? ( media-libs/vulkan-loader ) )
v4l2? ( media-libs/libv4l:0= )
- wayland? ( media-libs/mesa:0=[wayland?] )
+ wayland? (
+ dev-libs/wayland
+ dev-libs/wayland-protocols
+ )
X? (
- x11-base/xorg-server:0=
- >=x11-libs/libxkbcommon-0.4.0:0=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+ x11-libs/libxcb:=
)
xinerama? ( x11-libs/libXinerama:0= )
- xv? ( x11-libs/libXv:0= )
+ xv? ( x11-libs/libXv )
zlib? ( sys-libs/zlib:0= )
"
-
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
+ wayland? ( dev-util/wayland-scanner )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.16.0.3-int-conversion.patch"
+)
+
src_configure() {
if use cg; then
append-ldflags -L"${EPREFIX}/"opt/nvidia-cg-toolkit/$(get_libdir)
@@ -95,10 +105,13 @@ src_configure() {
fi
# Note that OpenVG support is hard-disabled. (See ${RDEPEND} above.)
- ./configure \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" ./configure \
--prefix="${EPREFIX}/usr" \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--enable-dynamic \
+ --disable-builtinzlib \
+ --disable-qt \
+ --disable-sdl \
--disable-vg \
$(use_enable 7zip) \
$(use_enable alsa) \
@@ -126,8 +139,7 @@ src_configure() {
$(use_enable ozone) \
$(use_enable pulseaudio pulse) \
$(use_enable rgui) \
- $(use_enable sdl) \
- $(use_enable sdl2) \
+ $(use_enable sdl sdl2) \
$(use_enable threads) \
$(use_enable truetype freetype) \
$(use_enable udev) \
@@ -139,14 +151,15 @@ src_configure() {
$(use_enable xinerama) \
$(use_enable xmb) \
$(use_enable xv xvideo) \
- $(use_enable zlib)
+ $(use_enable zlib) \
+ || die
}
src_compile() {
- emake $(usex debug "DEBUG=1" "")
+ emake V=1 $(usex debug "DEBUG=1" "")
if use filters; then
- emake $(usex debug "build=debug" "build=release") -C gfx/video_filters/
- emake $(usex debug "build=debug" "build=release") -C libretro-common/audio/dsp_filters/
+ emake CC="$(tc-getCC)" $(usex debug "build=debug" "build=release") -C gfx/video_filters/
+ emake CC="$(tc-getCC)" $(usex debug "build=debug" "build=release") -C libretro-common/audio/dsp_filters/
fi
}
diff --git a/games-emulation/RetroArch/files/RetroArch-1.16.0.3-int-conversion.patch b/games-emulation/RetroArch/files/RetroArch-1.16.0.3-int-conversion.patch
new file mode 100644
index 0000000000..95c03cdeb0
--- /dev/null
+++ b/games-emulation/RetroArch/files/RetroArch-1.16.0.3-int-conversion.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/936962
+https://github.com/libretro/RetroArch/commit/4ce7dd6fd5b6be4cb9049e7f58dda04051f877f7
+--- a/gfx/drivers_context/wayland_ctx.c
++++ b/gfx/drivers_context/wayland_ctx.c
+@@ -407,7 +407,7 @@ static bool gfx_ctx_wl_set_video_mode(void *data,
+ goto error;
+ }
+
+- if (!egl_create_surface(&wl->egl, (EGLNativeWindowType)wl->win))
++ if (!egl_create_surface(&wl->egl, (void*)wl->win))
+ goto error;
+ egl_set_swap_interval(&wl->egl, wl->egl.interval);
+ #endif
diff --git a/games-emulation/RetroArch/metadata.xml b/games-emulation/RetroArch/metadata.xml
index b1549cca8b..5ad5cc5ffc 100644
--- a/games-emulation/RetroArch/metadata.xml
+++ b/games-emulation/RetroArch/metadata.xml
@@ -31,8 +31,7 @@
Ozone menu
PulseAudio support
RGUI menu
- SDL support
- SDL2 support (disables SDL 1.x)
+ SDL2 support
FreeType support
Threading support
Udev/Evdev gamepad support
diff --git a/net-misc/megasync/megasync-5.4.1.0.ebuild b/net-misc/megasync/megasync-5.4.1.0.ebuild
index cacf6085a1..950e804d22 100644
--- a/net-misc/megasync/megasync-5.4.1.0.ebuild
+++ b/net-misc/megasync/megasync-5.4.1.0.ebuild
@@ -29,7 +29,7 @@ fi
LICENSE="MEGA"
SLOT="0"
-IUSE="dolphin mediainfo nautilus nemo thumbnail thunar"
+IUSE="mediainfo nautilus nemo thumbnail thunar"
DEPEND="
dev-db/sqlite:3
@@ -52,12 +52,6 @@ DEPEND="
net-misc/curl[ssl]
sys-libs/zlib
x11-libs/libxcb:=
- dolphin? (
- kde-apps/dolphin:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kio:5
- kde-frameworks/kwidgetsaddons:5
- )
mediainfo? (
media-libs/libmediainfo
media-libs/libzen
@@ -83,7 +77,6 @@ RDEPEND="
"
BDEPEND="
dev-qt/linguist-tools:5
- dolphin? ( kde-frameworks/extra-cmake-modules )
"
PATCHES=(
@@ -94,15 +87,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.0.0-rename-libcryptopp.patch"
)
-BUILD_DIR_DOLPHIN="${S}_dolphin"
-
-dolphin_run() {
- if use dolphin; then
- cd "${S}/src/MEGAShellExtDolphin" || die
- BUILD_DIR="${BUILD_DIR_DOLPHIN}" CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin" "$@"
- fi
-}
-
nautilus_run() {
if use nautilus; then
cd "${S}/src/MEGAShellExtNautilus" || die
@@ -151,7 +135,6 @@ src_configure() {
cmake_src_configure
unset mycmakeargs
- dolphin_run cmake_src_configure
nautilus_run eqmake5
nemo_run eqmake5
thunar_run eqmake5
@@ -160,7 +143,6 @@ src_configure() {
src_compile() {
cmake_src_compile
- dolphin_run cmake_src_compile
nautilus_run emake
nemo_run emake
thunar_run emake
@@ -169,7 +151,6 @@ src_compile() {
src_install() {
cmake_src_install
- dolphin_run cmake_src_install
nautilus_run emake INSTALL_ROOT="${D}" install
nemo_run emake INSTALL_ROOT="${D}" install
thunar_run emake INSTALL_ROOT="${D}" install
diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
index 8b25de399b..524e07beb9 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -29,7 +29,7 @@ fi
LICENSE="MEGA"
SLOT="0"
-IUSE="dolphin mediainfo nautilus nemo thumbnail thunar"
+IUSE="mediainfo nautilus nemo thumbnail thunar"
DEPEND="
dev-db/sqlite:3
@@ -52,12 +52,6 @@ DEPEND="
net-misc/curl[ssl]
sys-libs/zlib
x11-libs/libxcb:=
- dolphin? (
- kde-apps/dolphin:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kio:5
- kde-frameworks/kwidgetsaddons:5
- )
mediainfo? (
media-libs/libmediainfo
media-libs/libzen
@@ -83,7 +77,6 @@ RDEPEND="
"
BDEPEND="
dev-qt/linguist-tools:5
- dolphin? ( kde-frameworks/extra-cmake-modules )
"
PATCHES=(
@@ -94,15 +87,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.0.0-rename-libcryptopp.patch"
)
-BUILD_DIR_DOLPHIN="${S}_dolphin"
-
-dolphin_run() {
- if use dolphin; then
- cd "${S}/src/MEGAShellExtDolphin" || die
- BUILD_DIR="${BUILD_DIR_DOLPHIN}" CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin" "$@"
- fi
-}
-
nautilus_run() {
if use nautilus; then
cd "${S}/src/MEGAShellExtNautilus" || die
@@ -151,7 +135,6 @@ src_configure() {
cmake_src_configure
unset mycmakeargs
- dolphin_run cmake_src_configure
nautilus_run eqmake5
nemo_run eqmake5
thunar_run eqmake5
@@ -160,7 +143,6 @@ src_configure() {
src_compile() {
cmake_src_compile
- dolphin_run cmake_src_compile
nautilus_run emake
nemo_run emake
thunar_run emake
@@ -169,7 +151,6 @@ src_compile() {
src_install() {
cmake_src_install
- dolphin_run cmake_src_install
nautilus_run emake INSTALL_ROOT="${D}" install
nemo_run emake INSTALL_ROOT="${D}" install
thunar_run emake INSTALL_ROOT="${D}" install
diff --git a/net-misc/megasync/metadata.xml b/net-misc/megasync/metadata.xml
index aa423a9929..95ed641878 100644
--- a/net-misc/megasync/metadata.xml
+++ b/net-misc/megasync/metadata.xml
@@ -13,7 +13,6 @@
meganz/MEGAsync