5 files changed, 98 insertions, 25 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 81d4fc303a3b..26faf892dc0d 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index d0b1436cfa42..8bff1c0e384f 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,7 @@
 DIST eog-44.3.tar.xz 4654864 BLAKE2B 1caaace6f2f654a3fdbe781723e178d91300f40f2f05ef978505329ed242b79093cef5bf48660948b62efeb4fb1b3d09da522d6cb8e39b61fcd377100f701ae1 SHA512 088d8d504e5ad5ca14a5da44ee559b30cb7749d752f7b5c1f3fa111c9d1ba7a97edaff3183e0c6d6ebf3b57b9e90fe37a42305d983ac72058804ab2599e8f0c2
 DIST eog-45.0.tar.xz 4656784 BLAKE2B cf5b5a03c153b3eedcb1839f068ab9984d1e8e493d39baa86b67691e254fbb5faa96c3aaca032c66218d0cead6a93c966bb014091041057799187210bbc6a09a SHA512 5faa5115d8865a7f5311486f6999aece8d636ed66a4feca35ace85d33623fb406f9092fc915e84c3ec4013ba153876898d873a259fdf0ff0145c499f526ef52e
+DIST eog-45.1.tar.xz 4656776 BLAKE2B 9b9bde1564735c06252a1eedb96b0ab0871726f7ce4891c57ff4a0ed6c52f13b85f1ffc8bca2c4d8a5cc6518a2d66dc4b883df5a53234a67c4374c56b03728ea SHA512 68fb6889da7129189facbd3e624e76852a8dbe5e277848b768fb28624811d9486a1edc6a1d99d5948a68854ae73a5b5b33c5f5fa3a81860391bf1bf53bf15fa7
 EBUILD eog-44.3.ebuild 1750 BLAKE2B 772bc78688b726e844e084baad785eed1b25cec4cef5b0d7f56abf0d13158533d7f758b680f8b1ec5ceec71066b7daf1f5a64604e332a7d6b0df638b81a2a52a SHA512 07f615c18a8df2fcaea25b206da422b42bd71b1f466360b5d1ebdfa802bef1f098219fb88e19bf2acfd11b59c6abf87dc9290a218517caaa31bcf2b2e99c23a5
 EBUILD eog-45.0.ebuild 1753 BLAKE2B 9c30a124035978e74e28d4f33894733f1c7c9550dd55ceb6469a1df64f5ef68606261470baa57bce66eedd21cc909a0891685b442e3da7fa85ddbda2a6c096f2 SHA512 a4d22bdd274a2271cf3124c513ba6cfb8e431230ce7c62e1eb33b3fda2daad3952509983c436f47f92ffd3b50434927ed3ac50b449aedfeca2bede188a39d44d
+EBUILD eog-45.1.ebuild 1753 BLAKE2B 9c30a124035978e74e28d4f33894733f1c7c9550dd55ceb6469a1df64f5ef68606261470baa57bce66eedd21cc909a0891685b442e3da7fa85ddbda2a6c096f2 SHA512 a4d22bdd274a2271cf3124c513ba6cfb8e431230ce7c62e1eb33b3fda2daad3952509983c436f47f92ffd3b50434927ed3ac50b449aedfeca2bede188a39d44d
 MISC metadata.xml 580 BLAKE2B 7d6bf08b37ed06abb82e92621725ab2cbc9d0b28e5c50cd9dd25e449e98212da4911da450d5e80f6d2efd3cb65981b2726e69f48ae54fc7a0dd4363c896b9086 SHA512 3ae60a59ef2e07fd78b836eb828c0b9e37e49ea6115c52215b86dafff9cb6990567659a31cfb1e06e58890cf598c98065df1e473dc7994fef0ae950081c27a54
diff --git a/media-gfx/eog/eog-45.1.ebuild b/media-gfx/eog/eog-45.1.ebuild
new file mode 100644
index 000000000000..b967e79892ea
--- /dev/null
+++ b/media-gfx/eog/eog-45.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="
+	exif? ( jpeg )
+	gtk-doc? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.73.2:2
+	>=dev-libs/libpeas-0.7.4[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 6ae91a79ffb7..d4b6538281c5 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -2,5 +2,5 @@ AUX meshlab-2020.12-disable-updates.patch 1005 BLAKE2B 61fe405555be9a1170f0044ad
 AUX meshlab-2020.12-find-plugins.patch 1117 BLAKE2B 0c17b35288543cc3b84040851f5bfb30977677254a60cb3410c2ef65d10febe648541828a1b16ac6ba4db6ac92cc087a6256923d936ffe2f069edbdb29decd14 SHA512 b57ebd412475f22624b1f211000a020dd00628f2d197ba25942874324a34d6ed14ddcbd28f9819adc523657352ac024f23852ba83d4663e4dce794e0be96340f
 DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335 SHA512 0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87
 DIST vcglib-2020.12.tar.gz 6777201 BLAKE2B 9e2e3eb4ae7b930a8a334d58ee4bdadaf43e9a031d523471d17ca39d241c0dd66ec846a360cbcccd53d8728a2c7a6b6fa7d7a3efc04c01515ac3366b10f01aa8 SHA512 d7eec0c9c847e6ade7a3bee9aa1cddbb6855c388b15e2b35889ce998ea9a1c7afb0034ec31c38de3cbc2d867c8d8a474b13e4e2e3218e636926967abe4e54924
-EBUILD meshlab-2020.12-r1.ebuild 1392 BLAKE2B db0e1c76e9fc5bd20b9ffd56ccacdb7dfba3cde005ee5212b02fd5a28b64a8df09af71e2709fd501c1ec74ea4f09c5718762d4e5765918d0bd90bc259798d829 SHA512 6e43569a7bebd4059c6eecf82e51d1f945085cabedbf6cd7184469eaeb271b8aee6e34322f73497fa2c727274a894343fd089e9049155742a0991ea905dd7ea6
+EBUILD meshlab-2020.12-r2.ebuild 1294 BLAKE2B 8d8e61904e1a0986369ada6e197089857c9e4c2e5d6471c0bdc152d5cb6324cad1d176a088a18b7f5527601b4b3a3a820e0c055511221c1abeb65527eb6c3730 SHA512 85a6c0716a15a84f4f9f111f385fcdfd29f2ec944b97132ec69aed6701ceebd0a78d07294d361b1f9a04ffdf4b3039c8b81e4148bb8877cb46a2cdff3fa869b1
 MISC metadata.xml 997 BLAKE2B 5d19fc1966e58b6e1a637bc460fda603b5a8c67c338bdc70ffac78e47634656c974e89a54818b6e4235b94a0b846a7e24643b4ea539340abdfad8498ff272689 SHA512 30d93373f02a0983272ba22f0331c32f019053f6ff4291f2c77083e7a983145862eb0fc75eb00a1497d1037857031bb536aaf20a1f7b6d674dd2f09446aa3bd4
diff --git a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild b/media-gfx/meshlab/meshlab-2020.12-r2.ebuild
index 172c5a559c36..3022559a4e4c 100644
--- a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
+++ b/media-gfx/meshlab/meshlab-2020.12-r2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake xdg-utils
-
-DESCRIPTION="A system for processing and editing unstructured 3D triangular meshes"
-HOMEPAGE="http://www.meshlab.net"
 VCG_VERSION="2020.12"
+inherit cmake xdg
+
+DESCRIPTION="System for processing and editing unstructured 3D triangular meshes"
+HOMEPAGE="https://www.meshlab.net/"
 SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/cnr-isti-vclab/vcglib/archive/${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz"
+S="${WORKDIR}/meshlab-Meshlab-${PV}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,23 +21,22 @@ DEPEND="
 	dev-cpp/eigen:3
 	dev-cpp/muParser
 	dev-libs/gmp:=
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtdeclarative-5.12:5
-	>=dev-qt/qtopengl-5.12:5
-	>=dev-qt/qtscript-5.12:5
-	>=dev-qt/qtxml-5.12:5
-	>=dev-qt/qtxmlpatterns-5.12:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-libs/glew:0=
 	=media-libs/lib3ds-1*
 	media-libs/openctm:=
 	media-libs/qhull:=
 	sci-libs/levmar
-	sci-libs/mpir:="
-
+	sci-libs/mpir:=
+"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/meshlab-Meshlab-${PV}/src"
-
 PATCHES=(
 	"${FILESDIR}/${P}-disable-updates.patch"
 	"${FILESDIR}/${P}-find-plugins.patch"
@@ -44,21 +44,15 @@ PATCHES=(
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	cd "${S}"
+	cd "${S}" || die
 	unpack vcglib-2020.12.tar.gz
-	mv vcglib-2020.12/* vcglib
+	mv vcglib-2020.12/* vcglib || die
 }
 
 src_configure() {
-	CMAKE_BUILD_TYPE=Release
-
 	local mycmakeargs=(
 		-DBUILD_MINI=$(usex minimal)
 		-DBUILD_WITH_DOUBLE_SCALAR=$(usex double-precision)
 	)
 	cmake_src_configure
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}