12 files changed, 288 insertions, 94 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3d80e3ccb822..59c42d5c13d5 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 031459147964..42ed1dc3ddef 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,4 +1,3 @@
-AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
 AUX alembic-1.8.5-set-correct-libdir.patch 1593 BLAKE2B 4dec05376ed35261049886e38c851ded8f033040e5fe822337ec7655132f0b24b007e6b48caf9fb01cfc3a874a4a60b0f54649e3505f70464c1847423c684176 SHA512 befd7956ab3effb70d76648c15795cf8ea40d51687dab3988968a519267bdf1df945d475f1cd7a32747d6a5fd6cf1cf63c8f0bbbc058e9da704ba26b6bac443a
 AUX alembic-1.8.6-py312.patch 3861 BLAKE2B 307786b786aeb8868103e7d1564305fa7fa7d082acc43e2886bfda17413c993b506ba77ed54f254b87ca5123945596d0be445f558279ec1ff9b7f6cc23ea835c SHA512 70078658fc4b70618e9e2c1c694b50726eec510e30e1625f01cd1dcfae2f649162b7b94c791b12068f064c68e1deea7ccabb00a31de7fd32cc052299035662b8
 DIST alembic-1.8.6.tar.gz 868945 BLAKE2B 1ac30ffa75a4b8bbb3f32820e6f67cebcd894465f16cd12ee0396c88611af821b13973f46228fd59726c6bc0cc8885afd4de81a0cebaa0f94cb30fd9daba9885 SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
diff --git a/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch b/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch
deleted file mode 100644
index 3216e38d2381..000000000000
--- a/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9e877b10c05e9482ef00bda99033508cc64211fd Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 23 Apr 2021 15:20:15 +0200
-Subject: [PATCH] set correct libdir
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt             | 8 ++++----
- lib/Alembic/CMakeLists.txt | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 69fff1e..97d1e2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,12 +73,12 @@ option(DOCS_PATH
- 
- # Set static/dynamic build options
- SET(LIB_TYPE STATIC)
--SET(RUNTIME_INSTALL_DIR lib)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(ARCHIVE_INSTALL_DIR lib)
-+SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
- IF (ALEMBIC_SHARED_LIBS)
-     SET(LIB_TYPE SHARED)
--    SET(ARCHIVE_INSTALL_DIR lib)
-+    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
-     IF (WIN32)
-         ADD_DEFINITIONS(-DALEMBIC_DLL)
-     ENDIF()
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index 20acfed..9859bbe 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES(Alembic
-     ${ZLIB_LIBRARY}
-   )
- 
--SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
-+SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
- INSTALL(TARGETS Alembic
-         EXPORT AlembicTargets
-         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
-@@ -91,7 +91,7 @@ INSTALL(TARGETS Alembic
- 
- set(alembic_targets_file "${PROJECT_NAME}Targets.cmake")
- 
--SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
-+SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
-         "Where to install the Alembic's cmake files")
- 
- INCLUDE(CMakePackageConfigHelpers)
--- 
-2.31.1
-
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 3098b0c3d9e3..ac0e9d3538fa 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,12 +2,15 @@ AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556d
 AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
 AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a28bb879b3592d98dc1de0c3b5b7335a2985fbb5659c58b421fbca896b1f2585a5cb993b5cdf3ee6f87d9834afe3fd1a23a SHA512 82c7a4f6d6112fa024503a99e05d3050922b120821c93922ae846f9da6b02cd6f2e27315448c20ed1032c5526b85cb6d01dd6eec5109db1af3f8e92e4818ea06
 AUX darktable-4.4.2_fix-has-attribute-musl.patch 779 BLAKE2B d22e3cc6a28f9b0df574f1e512926868c7dd921b57dacb0934fdbfe934fb14ccb5cb16cbef49646a00c9be183af4f426e8d656389e2a87bb1c8247a8d64fd4f8 SHA512 70e0bf5fd3fee861490c651b2d2e94f3c187852bbd4e71972873d4ad4d426156e0785d1ed96ee65d641333357aa9048852b056985d6678f1efe98026a3e1474b
+AUX darktable-4.8.0_fix-has-attribute-musl.patch 1233 BLAKE2B 1ac838bdf7d3345b30d71065bde9d915a36876febd34f58e1005fc4f87cfbc9b757ce4145e5cb173d9d965f7e6c161d1ecf45a6845b0a82cc8ca2fe1bc275e50 SHA512 fda9f858fc1594e208501c3c277c90c3d9c914bbe9420c8151120fafd3ad54e6fc36614ebcf95a0033537e308c5a9fa6d23a619e57eff663cf996c254e434397
 DIST darktable-4.6.0.tar.xz 6129572 BLAKE2B 170d874f6a35c4fe5a5555f308bc541885968b8b5535402f8087ad4d47ee93f3d22a78c633f9b3e14584d1925a7dd682a5f3e2bd187ef2f58d0dc2a407b9bb27 SHA512 825a63c9b8bd7420f5c4b53a9281587be92088e1cd617faaf1de2b455503092cc7476872803a1d82c7bf57fcc57f85a40fc4af8ca04367e48719030f08726df7
 DIST darktable-4.6.1.tar.xz 6240188 BLAKE2B cf0055a4dd5f0a246b8de8ca5a29488fd77162cf2e0d7b681235499da39e4dad69dc5e5f7083f67364171d89aa76e940e8338eadee959f6529fb27658f43b75b SHA512 a5bcbdded7cacbc22d82cc982ad1387dc316cf4c0369f6f215abf9f60906024f2236a988dc025c0553bc2d8d7ca9d7bee9eb28b164fa1d9312eef1a084156fb6
+DIST darktable-4.8.0.tar.xz 6256036 BLAKE2B 386276776a68887c7b439bf71ecc2ba9cd4cf54c247073908eae0cafd1d1db390c39937dfd4a2fcbe5164317b6090e29f2d2caa66fb7da47a702ba8988833ed5 SHA512 cb0535274a2862dfb2c8d36149cfced828662e423e04347970c0e2546e4d70ed7ab52cb80b6d21785165a294dee74fc23ba749086aab0a78386936341eb8216a
 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67 SHA512 90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3
 DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3 SHA512 f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5
 DIST darktable-usermanual-4.6.en.pdf 26844087 BLAKE2B 5bdb5e012cd8ba7bace733006136b1f9e510214179e84a9cba0664a3c2e4b19828e2cc54addaf5999579b910b592bf0e9cd9796cf89f3a4e6ae369e8187fbfce SHA512 a1d610c42ae3d1ae4d0bf3e827ed9ccae6faeea20cbc03e7c12d74c3c41175bf3f61d9eba43406b9ba86750edf976c1539357ddf774733f566a076418c34f558
 DIST darktable-usermanual-4.6.uk.pdf 27013345 BLAKE2B 4c0da0038576e8ea97da88a4481e1afdf4e5b5df6b8a52475d18b488ac10066db4ef679681a38a194dd84771e340f58beea0450ec60726abd19d600e73fc40f1 SHA512 6e2f036e3f845791aa8b6eb565230136bfb6ae7f9b1ee56a9201cd25bb09391fd2ec45ba7fa1ddd11b4c193ab6b097fae32107af6c11b6cd6eeada60b002d4b3
 EBUILD darktable-4.6.0.ebuild 5757 BLAKE2B d095734af35fb8118b7d38d4293a8e4c71924a9a2123f3f2c35f216d02e11d7ab04aca077fa44f1fe53e4ab518f3bb84fe530efae676845d7f3f4d5c94776dd4 SHA512 823b793b78c31f9a2fdacd1dbdb638fd5cd7ac04a4a3123b0e769fda2976dc35509fad6693c1b6be4e50c06284c8e7fb3a98b17de45f2612f9d8f961cbc1950d
 EBUILD darktable-4.6.1.ebuild 5872 BLAKE2B c4d9a2afecde2316d2a2e637d1586417c2970969e0ccdbeb996efbb6e8e7f1b3fbd7edebe0ff93c6373af53eb383b2d31f793d848b816a0f6306c5cc83462c25 SHA512 406ddefbd93fc5a7f62774051499242cc298bf08a90846f507c17c7ea45f555994fe61d6195285806770162689012e5d1a25b39c3cba434de762f060662e92b6
+EBUILD darktable-4.8.0.ebuild 5893 BLAKE2B 0bccb554868a3b4263a4952ed844b205c747bc91cf1cee7829b965bdeb4dec878c4a7aa5a3588b4e9c6d46aa425699cf4c94bf44076e481e8e1ebf4ed57b39f9 SHA512 f954f841627c8c1654eb2851f699f919abe7e11dca0906c6dd47cc08bef433f2012f7ebe2bd0c613314d0ef5015d7fcbf0d92decfb6cfc914062d10c834df40e
 MISC metadata.xml 1017 BLAKE2B dabb4372a61aa5755d7adc3429fdde5a9749f25dccd43121e71a4e72a8f86c36ceb857e586df1ff35da0fe944ca59eea52006065073a6362ee40843530c40318 SHA512 ccc5df2360eab59eb00e236a33e71e4283b107b1615e9cd885e5ff1f8ef53fb134bfa30be29a6c5f6d66699c2bfb1eb4768e28c49d134681bd4fa2de6eb3f7be
diff --git a/media-gfx/darktable/darktable-4.8.0.ebuild b/media-gfx/darktable/darktable-4.8.0.ebuild
new file mode 100644
index 000000000000..a03a32b2d03e
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.8.0.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+S="${WORKDIR}/${P/_/~}"
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	#DOC_PV=$(ver_cut 1-2)
+	DOC_PV="4.6"
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? (
+			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
+			l10n_uk? (
+				https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+					-> ${PN}-usermanual-${DOC_PV}.uk.pdf
+			)
+		)"
+
+	KEYWORDS="~amd64 ~arm64 -x86"
+	LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative,
+#    in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which
+#    by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
+#    (and curiously enough, empirical observations suggest current versions of Portage are
+#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
+#    on GCC; that might be a bug though)
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2:= )
+	colord? ( x11-libs/colord-gtk:= )
+	cups? ( net-print/cups )
+	gamepad? ( media-libs/libsdl2 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	heif? ( media-libs/libheif:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	jpegxl? ( media-libs/libjxl:= )
+	lua? ( ${LUA_DEPS} )
+	midi? ( media-libs/portmidi )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:= )
+	webp? ( media-libs/libwebp:= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
+	"${FILESDIR}"/${PN}-4.8.0_fix-has-attribute-musl.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			if ! test-flags-CC -floop-block &> /dev/null; then
+				eerror "Building ${PN} with GCC requires Graphite support."
+				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
+				die "Selected compiler is sys-devel/gcc[-graphite]"
+			fi
+		fi
+
+		use openmp && tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_avx && append-flags -mavx
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DRAWSPEED_ENABLE_WERROR=OFF
+		-DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_GMIC=OFF
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_HEIF=$(usex heif)
+		-DUSE_JXL=$(usex jpegxl)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_LUA=$(usex lua)
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_PORTMIDI=$(usex midi)
+		-DUSE_SDL2=$(usex gamepad)
+		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# This USE flag is masked for -9999
+	if use doc; then
+		dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.en.pdf
+		use l10n_uk && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.uk.pdf
+	fi
+
+	if use nls; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/darktable/files/darktable-4.8.0_fix-has-attribute-musl.patch b/media-gfx/darktable/files/darktable-4.8.0_fix-has-attribute-musl.patch
new file mode 100644
index 000000000000..f6a474acfd24
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-4.8.0_fix-has-attribute-musl.patch
@@ -0,0 +1,26 @@
+From 7601d97268bf5f63f7e53d9c114fe439dcc46b0d Mon Sep 17 00:00:00 2001
+From: Markus Meier <maekke@gentoo.org>
+Date: Fri, 21 Jun 2024 20:35:33 +0200
+Subject: [PATCH] fix musl build
+
+See https://bugs.gentoo.org/915596
+---
+ src/common/darktable.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/darktable.h b/src/common/darktable.h
+index a62fd402fe..4d0d571b2b 100644
+--- a/src/common/darktable.h
++++ b/src/common/darktable.h
+@@ -150,7 +150,7 @@ extern "C" {
+ /* Create cloned functions for various CPU SSE generations */
+ /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */
+ /* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */
+-#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__)
++#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__) && defined(__GLIBC__)
+ # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
+ #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4")))
+ # elif defined(__PPC64__)
+-- 
+2.44.2
+
diff --git a/media-gfx/monica/Manifest b/media-gfx/monica/Manifest
index 4d4c9eedad03..267158b06f53 100644
--- a/media-gfx/monica/Manifest
+++ b/media-gfx/monica/Manifest
@@ -1,4 +1,3 @@
-AUX monica-3.6-makefile-cleanup.patch 907 BLAKE2B 13cf4d1a4950074f8909045fc0acd337482e343b51a800dbb87a585311ff776d4f87f8d0250b059e99b328a470e99bae23412646a5d8d89d09a4380e50bbd372 SHA512 cc151e238e89db9d3873133e1a637d5e2959c2460251fe7fe8feb62ef22c64963cec5b2533607996b2cf7d33abdfd1f42a59f5a769cad0bf2194e8d751da3bf6
 AUX monica-3.7-exit.patch 2534 BLAKE2B 99f544c0b9712d4a0cdf054fc6b39a34b143ecf93204c30e16bbfa9287ac8d89dcf25270f8c2a976f2045a0662cb673ba544c2e6ef31dcdf5253dfcac66d0b65 SHA512 a814424f3db144c5b1d8fc1dc4b507667cde97dcf13c6da3a8bd8e1aa5f95be8e119f9f8512b05096084cb3933719d85fa9548b8f2ec6af58b513abd9db612d2
 AUX monica-3.7-fprintf.patch 1835 BLAKE2B 06dedaded7424ced057b8b2298584e0d71c771124880255a012a10b351bddbbe336793da7d70104e9fa06a874a2171504424cdd55235d75b49feffa02c69bb55 SHA512 d80f79620c8df23765ae9e644e70428bf5a6443de53a3dc11ac7aa6fe091f2b911ee1f0efbc353c61851a3b571953a553898b8e1d6fb94b1ed6e7b942dbcb0fa
 AUX monica-3.7-gcc44.patch 341 BLAKE2B c534884cca357cbc37a0092bb42faa9a3f29165e0e5622d811d08f4238a2d716f91a8ce731438a33323dd350e3b9da79e743b7d3f46fc5ba9eb084b14f359bd4 SHA512 837f3fc2c77d415067460f1aae80807daa9882b814494f2305be711db920a750ae183ec7b456527956b60ca3cf022729524990cd0febafeaab41bd1dbb080bfb
diff --git a/media-gfx/monica/files/monica-3.6-makefile-cleanup.patch b/media-gfx/monica/files/monica-3.6-makefile-cleanup.patch
deleted file mode 100644
index 21881db24971..000000000000
--- a/media-gfx/monica/files/monica-3.6-makefile-cleanup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar monica-3.6.orig/Makefile monica-3.6/Makefile
---- monica-3.6.orig/Makefile	2005-03-14 22:00:18.000000000 -0800
-+++ monica-3.6/Makefile	2007-11-15 00:48:39.000000000 -0800
-@@ -2,22 +2,24 @@
- CXX      = g++
- LINK     = g++
- CFLAGS   = -Wall -O2
--CXXFLAGS = `fltk-config --cxxflags` -Wall -O2
--LDFLAGS  = `fltk-config --ldflags`
-+CXXFLAGS = -Wall -O2
-+FLTK_CXXFLAGS = `fltk-config --cxxflags`
-+LDFLAGS  = 
-+FLTK_LDFLAGS  = `fltk-config --ldflags`
- TARGET   = monica
--DESTINATION = /usr/bin
-+DESTINATION = $(DESTDIR)/usr/bin
- OBJECTS = monica.o
- 
- all: $(TARGET)
- 
- $(TARGET): $(OBJECTS)
--	$(LINK) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
-+	$(LINK) -o $(TARGET) $(OBJECTS) $(FLTK_LDFLAGS) $(LDFLAGS)
- 
- 
- monica.o: monica.cpp
--	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o monica.o monica.cpp
-+	$(CXX) -c $(FLTK_CXXFLAGS) $(CXXFLAGS) $(INCPATH) -o monica.o monica.cpp
- 
- clean: 
- 	rm -f $(OBJECTS)
- 	rm -f monica
- 	
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 14fadec75dc3..99120bd0c17e 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -2,7 +2,9 @@ AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a9
 AUX prusaslicer-2.6.0-libexpat-double-definition-fix.patch 636 BLAKE2B 047ea78be4b645790150c597e73df834cd77013f3f84f5823567318867c21746521f81582ad21e7c2db4d27e8e4e31b357a6160448ad306b5ee18a2a4efe90fe SHA512 e8bcd9db4d4cb895cebf7dd08e8f8428de7a845d802a1cd9cd6ca806450f5320dafe363bc5737203421ebe20f99110462e3ce4a16ee7c7d11be8222009be8dd4
 AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 323 BLAKE2B ee422c91800bf164098396dab448630174b2dd5444d55ff176f10b73e660a446006a0dadfcd2d3cde715b8b58023fe10dd41f6bddb6165fb405382b256eebc52 SHA512 408897cc09ad58e9828b5645553f948a0e0e1b6b07c0bca7bb3ab37789bd988a7076c6d2c79d16ee198f16fdacc59d408ea759e969c83787b2f4bc1161dd94b0
 AUX prusaslicer-2.7.4-boost-1.85.patch 1060 BLAKE2B ea7970e19573f686a181b6e824ba1cccbdbefc339ed557e072169a5bff71b550ec61fa25f95d8cf0db91ce34ea3a4060c19f6c9621e1367564bd2bd04d90e815 SHA512 2e04a61ad5cd152ec26699bce5d81ceb9c59d2daca64a827902e99c536e8060461fbe442c79fb843025ca31e52f2db119dd4c03225c8dd46186001d9db888592
+AUX prusaslicer-2.8.0-fixed-linking.patch 751 BLAKE2B d0a5593a2559514f68df6798fb9c4e5c0b9c4021ece74281311c2a19b8233914fcb16227b7aafa5ee222d41ac82c4d5c9c363c32029d13c44c7fe2cb02e60291 SHA512 5f2fdc0da5d979b8520d302549f42103f7e9b0588165430aff734d7d50d56e98c8c208394d9bfaf82f042c9ecac7a3ae72713bfe18341f0ba184cf313cec9206
+AUX prusaslicer-2.8.0-missing-includes.patch 958 BLAKE2B 52f05278ab7620fca7ab427facdb60f0eb5c625e67165d66c010b40adb0dd5b0c66e1be9a70cf88f6732c06434126936e0a1da11b293544bef65d6a2fc7ab349 SHA512 04ac49c2b3265d009c4537b28cdf45b28990b0f92c96e1cf5f636cbe56b7a76f60cc4dc9976bd576de6ad5dce62102a6d42283d0c6726021924d714ca0e47da2
 DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69 SHA512 fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b
 EBUILD prusaslicer-2.7.4.ebuild 2243 BLAKE2B f43117ea21eea84e3d853d5fed92c3f29386eaf988b06152726888fae7588e54c67e14536a1039829a64d2ba6f1c73cdac011817b1268a848f6d1d943de19dce SHA512 9b9c9075f49b852857801a8da5227e005281fb866af795af9a2e98a86c66fba3ee946d1b684c334b3967d72ced8cf5a5e17365d07ca49d949ee7b0e3cece67e0
-EBUILD prusaslicer-9999.ebuild 2173 BLAKE2B ee1ff710336b5380066ce129ff30a12bf659bf63a476e665cb69c81c4e60dad5324366eeb2fe5d66eae84247a1fe1f72559ba029da0d3e225817df4182de0658 SHA512 7cc78f61efcc7357568d9e6c6005cda9a5afc32a4351db5c0eb585c8d8c8df907f9c4527a2fa3512e0677d67ef79b5f498427a6467962a66679d9b1800b1ce41
+EBUILD prusaslicer-9999.ebuild 2290 BLAKE2B 3d8ab134fa6ccf8067cfce6820bd3c93e4771d805549ce0521e51419a202820126e624219ba1b7d6b87c1b4a695157db9b3e819c34a3e4807dd20353f444d4eb SHA512 72d681527480aa256757db2c61e00a0cac7f20019d4ed1dea4b496910ab15576946f9f3a8509767ae2810de394e890655117ced6d02c7f71a22104eae4983e1a
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch
new file mode 100644
index 000000000000..33ab6256d6b0
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch
@@ -0,0 +1,19 @@
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES
+ )
+ 
+ find_package(NanoSVG REQUIRED)
++find_package(OpenSSL REQUIRED)
+ 
+ if (APPLE)
+     list(APPEND SLIC3R_GUI_SOURCES
+@@ -404,7 +405,7 @@ endforeach()
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast)
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto)
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
new file mode 100644
index 000000000000..f92813b6b335
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
@@ -0,0 +1,35 @@
+--- a/src/slic3r/Config/Version.cpp
++++ b/src/slic3r/Config/Version.cpp
+@@ -7,6 +7,7 @@
+ #include <cctype>
+ 
+ #include <boost/filesystem/operations.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/nowide/fstream.hpp>
+ 
+ #include "libslic3r/libslic3r.h"
+--- a/src/slic3r/GUI/RulerForDoubleSlider.cpp
++++ b/src/slic3r/GUI/RulerForDoubleSlider.cpp
+@@ -4,6 +4,12 @@
+ ///|/
+ #include "RulerForDoubleSlider.hpp"
+ #include "libslic3r/CustomGCode.hpp"
++#include "../../libslic3r/libslic3r.h"
++
++#include <algorithm>
++#include <cmath>
++#include <numeric>
++#include <iterator>
+ 
+ using namespace Slic3r;
+ using namespace CustomGCode;
+--- a/src/slic3r/GUI/UserAccountCommunication.cpp
++++ b/src/slic3r/GUI/UserAccountCommunication.cpp
+@@ -9,6 +9,7 @@
+ #include <boost/log/trivial.hpp>
+ #include <boost/beast/core/detail/base64.hpp>
+ #include <boost/algorithm/string.hpp>
++#include <boost/nowide/convert.hpp>
+ #include <curl/curl.h>
+ #include <string>
+ 
diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
index 124181307e1c..71ea154eda73 100644
--- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/opengl
 	x11-libs/gtk+:3
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
 	media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}
@@ -59,6 +59,11 @@ DEPEND="${RDEPEND}
 	test? ( =dev-cpp/catch-2* )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
+	"${FILESDIR}/${PN}-2.8.0-fixed-linking.patch"
+)
+
 src_prepare() {
 	if has_version ">=sci-libs/opencascade-7.8.0"; then
 		eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"