4 files changed, 9 insertions, 167 deletions
diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest
index c8ec72492c0c..516920dd1cf5 100644
--- a/media-gfx/fotema/Manifest
+++ b/media-gfx/fotema/Manifest
@@ -1,7 +1,3 @@
-DIST fotema-1.14.0.tar.xz 78584796 BLAKE2B c7a53e07fd8ccbd6ba48d595fd280e428ce334908c7b00a4fb5021d92b69c17836ede51656d4a5ab2473fc8220a4b3cbfe25cbdf6da58bc4b7ba7bfbe6ed35dd SHA512 44ff2dd4d3d8268a3f9795f3c37651173a077a7ff831def8e968f658a75786755f7129bed565da674306194084519240b1aa4d378431c36689578f175a054df1
-DIST fotema-1.14.1.tar.xz 78613740 BLAKE2B d945e6be4ef8db99e3c380a75dd6328bcd3a94f885f75bd11db4f164a11f0d541c07d198087aed80a8df637945ca9abc9a98d4c240b0faafe4726d7a82eaef3a SHA512 f80650ccc7401b743e9f6f1b6623f99e5c78df8da44b1608ef1ebfaaf7028858d78a6ca574a712ff2ec1760d4fe0535a365925068be88858eb230ea820803eb2
 DIST fotema-1.14.2.tar.xz 78468972 BLAKE2B 59974a873381dd40cf80f274bb2fcd3763fbf946f168491e25f76f56c1646754b7cf49dd174a25726133fd774d04a9cee370c81d3c01f9d276e588d42b232f82 SHA512 27d96b0a47e312b2a7674f140646f24785dbfae47ea1bde74630fbb979946f23b1e1f5fab5ba20edb38ef91790003e138dcf4043ff371e3bf458c691dfd2db56
-EBUILD fotema-1.14.0.ebuild 1520 BLAKE2B 70ec8ef25ae8ac0ab77537f1fcd7d01a6921da7d9d9b24ae7bfea2c6360575f94a22bbde8e7903621fe9d2797c88ad9b73c33f5dab935bb1e828ff68e65c69ea SHA512 30081de6889d689e35bd5ff544046ac7ade1fb8ff721c1a11a24d807874b32da19adcdfdb2447eb1ebaa01d7bd99aafb1d846807452f0acd71fb6d9f0bbb239e
-EBUILD fotema-1.14.1.ebuild 1520 BLAKE2B 70ec8ef25ae8ac0ab77537f1fcd7d01a6921da7d9d9b24ae7bfea2c6360575f94a22bbde8e7903621fe9d2797c88ad9b73c33f5dab935bb1e828ff68e65c69ea SHA512 30081de6889d689e35bd5ff544046ac7ade1fb8ff721c1a11a24d807874b32da19adcdfdb2447eb1ebaa01d7bd99aafb1d846807452f0acd71fb6d9f0bbb239e
-EBUILD fotema-1.14.2.ebuild 1520 BLAKE2B 70ec8ef25ae8ac0ab77537f1fcd7d01a6921da7d9d9b24ae7bfea2c6360575f94a22bbde8e7903621fe9d2797c88ad9b73c33f5dab935bb1e828ff68e65c69ea SHA512 30081de6889d689e35bd5ff544046ac7ade1fb8ff721c1a11a24d807874b32da19adcdfdb2447eb1ebaa01d7bd99aafb1d846807452f0acd71fb6d9f0bbb239e
+EBUILD fotema-1.14.2-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf
 MISC metadata.xml 326 BLAKE2B 4ae1a2fadba80e1886d73fb01d493fbbaabae2b97dbffaa10d46e0dbec690e3cb6f8e604675aeb9d0167e50d53cb3f1ffcc2d2ec6c6aed14c36acfe8d6bc31bb SHA512 1f8f3199af710dd344962c425a5af0936be2f52cb41123bee1aba249c356c5c0cb74f3ac6ff7f0fdf71a7e6f8552269abb20cda7d6685e3f21fd5e95436bf552
diff --git a/media-gfx/fotema/fotema-1.14.1.ebuild b/media-gfx/fotema/fotema-1.14.1.ebuild
deleted file mode 100644
index d4bc59161fe6..000000000000
--- a/media-gfx/fotema/fotema-1.14.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cargo gnome2-utils meson xdg-utils
-
-DESCRIPTION="Photo gallery for Linux"
-HOMEPAGE="https://github.com/blissd/fotema"
-SRC_URI="
-	https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz
-"
-
-# see LICENSES/
-LICENSE="
-	CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0
-	FDL-1.3+ GPL-3+ MIT
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	>=gui-libs/gtk-4.0.0:4
-"
-# indirect deps via crates
-DEPEND+="
-	dev-libs/openssl:=
-	gui-libs/libadwaita
-	media-libs/fontconfig
-	media-libs/graphene
-	media-libs/lcms:2
-	media-libs/libshumate:=
-	media-libs/opencv:=[contribdnn]
-	media-video/ffmpeg:=
-	sci-libs/onnx
-	sys-libs/libseccomp
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-"
-RDEPEND="
-	${DEPEND}
-	media-libs/glycin-loaders
-"
-BDEPEND="
-	dev-libs/glib:2
-"
-
-ECARGO_VENDOR=${S}/vendor
-
-QA_FLAGS_IGNORED="/usr/bin/fotema"
-
-src_configure() {
-	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
-
-		[source."git+https://github.com/blissd/rust-faces.git?branch=patch"]
-		git = "https://github.com/blissd/rust-faces.git"
-		branch = "patch"
-		replace-with = "gentoo"
-	EOF
-
-	local emesonargs=(
-		-Dprofile=$(usex debug development default)
-	)
-
-	meson_src_configure
-	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
-
-	export ORT_STRATEGY=system
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/fotema/fotema-1.14.0.ebuild b/media-gfx/fotema/fotema-1.14.2-r1.ebuild
index d4bc59161fe6..34219ad68ea2 100644
--- a/media-gfx/fotema/fotema-1.14.0.ebuild
+++ b/media-gfx/fotema/fotema-1.14.2-r1.ebuild
@@ -51,6 +51,14 @@ ECARGO_VENDOR=${S}/vendor
 
 QA_FLAGS_IGNORED="/usr/bin/fotema"
 
+src_prepare() {
+	default
+
+	# patch the dependency on flatpak-spawn out (sigh)
+	find "${S}"/{core,src} -name '*.rs' \
+		-exec sed -i -e '/FlatpakSpawn/d' {} + || die
+}
+
 src_configure() {
 	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
 
diff --git a/media-gfx/fotema/fotema-1.14.2.ebuild b/media-gfx/fotema/fotema-1.14.2.ebuild
deleted file mode 100644
index d4bc59161fe6..000000000000
--- a/media-gfx/fotema/fotema-1.14.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cargo gnome2-utils meson xdg-utils
-
-DESCRIPTION="Photo gallery for Linux"
-HOMEPAGE="https://github.com/blissd/fotema"
-SRC_URI="
-	https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz
-"
-
-# see LICENSES/
-LICENSE="
-	CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0
-	FDL-1.3+ GPL-3+ MIT
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	>=gui-libs/gtk-4.0.0:4
-"
-# indirect deps via crates
-DEPEND+="
-	dev-libs/openssl:=
-	gui-libs/libadwaita
-	media-libs/fontconfig
-	media-libs/graphene
-	media-libs/lcms:2
-	media-libs/libshumate:=
-	media-libs/opencv:=[contribdnn]
-	media-video/ffmpeg:=
-	sci-libs/onnx
-	sys-libs/libseccomp
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-"
-RDEPEND="
-	${DEPEND}
-	media-libs/glycin-loaders
-"
-BDEPEND="
-	dev-libs/glib:2
-"
-
-ECARGO_VENDOR=${S}/vendor
-
-QA_FLAGS_IGNORED="/usr/bin/fotema"
-
-src_configure() {
-	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
-
-		[source."git+https://github.com/blissd/rust-faces.git?branch=patch"]
-		git = "https://github.com/blissd/rust-faces.git"
-		branch = "patch"
-		replace-with = "gentoo"
-	EOF
-
-	local emesonargs=(
-		-Dprofile=$(usex debug development default)
-	)
-
-	meson_src_configure
-	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
-
-	export ORT_STRATEGY=system
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}