gentoo resync : 29.12.2022

4 files changed, 6 insertions, 79 deletions

diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 1cc76895ee66..66cd1a0a10ab 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,7 +1,5 @@
-DIST eog-41.1.tar.xz 3603320 BLAKE2B 8b0d7affe921bcb2c917f89dc3845360f784b5d5f394a7f94379c98cd905504cde7a8fb6f59aa09bc778e302113ad27ec5815e529b418d68a3012fbf9b018d65 SHA512 0fa514dd6ef195e449bbde183f94850dfca764815a95423376bc0da422d07b6cbd7b35bbdd5ba9d8f995f55aae1e1b65d57626d1809cccf95389767d0ed594e8
-DIST eog-42.0.tar.xz 4446392 BLAKE2B bb89eadaf2066f0ef3b6f99d47d75b438adfd3bca0451e8fa5d4513e98d1e8c6acc518eb7564f2768d43205a56843852edc1aa1ecce9fac8018ae4954376b852 SHA512 3901dbac9a371bac1e1bdc143e3d257a8e25fa2743a97bd9f9ecdb06e43cd5278edf33a46ab24c5e40babef6825181c986c99d9b4fafead71e04f51e65ae2acb
 DIST eog-42.1.tar.xz 4446444 BLAKE2B e500b3f96abfc72f56544c16254a99438137789be771310fd790c201451cf6a56fd9b6efc0ea8466dbb27be57cf0cd146d77c3e4917fda928ca02928ffaddea7 SHA512 12db6bb2218f9dcea0e0558b04c05f3f8eb298eb7170a9511a7996a37082667fe06994d1db3ee4fef759aeb763a9de87749c8defa8d749432b635d2b421d1c8a
-EBUILD eog-41.1.ebuild 1638 BLAKE2B 1a794ce6f1dad0814421a93c46b50fe01db32105f6f02ff5c0be382331abd2c830a836f293f879902e0cbff5cad17a79c011e8cac357f3673edec997b0ac9140 SHA512 007349404c2bbd0d24a9b84843e9c4ca6db8bc9c9c09fe7638234fe8dc022b6297fe4e903bd286c0c58fad566a43dee8711f256b45d2fad9db3fff3f4da2b18b
-EBUILD eog-42.0.ebuild 1669 BLAKE2B eec46e687c48aea2c7e8dfa64ac63dd411e7d254792684305455b8ed4be21fcc63114b94760e284ce149e999f97bf08aac339a8cf59d23f8e94681af88b21293 SHA512 a9cff1c2f4429660a79a162cb912897caacbf469d15bbe1b61796d9c95c1f7b71b800ae496442e9a03666bef6e824ed5d38d73a8f3d32fab24db9525941b0f25
-EBUILD eog-42.1.ebuild 1716 BLAKE2B 715428a0a75026bc322ef6218da388a9d2e7c999dde86deb13357717a148810e9ac04af7a4d65b6990252fa9c757c7e3c82c89dbe5d684570f4548cdab3577bc SHA512 e198cb9d5073ccb91ce2780a810976f3ea73278c2259f5c2e9f04ebddad86ce0200362e467c8840029c66410235a3a56ac328e08841b262ed1682833f94594a0
+DIST eog-42.2.tar.xz 4445892 BLAKE2B 863ecf1efcf295ae0deb6a966b6e0009cf4966543548e258d73315810bb4c1ed8434fa022b8367d779243376d2ba6cbe10d5e44135cedd0e5ec520dcee4ceaaf SHA512 f2da81fe7040f7ffc63da03df4889add33d59ad8df637797d1094d95233f4ce891838dfe6f774f58de63c28a620807bc4097b3ab1f31afb7cc7c402f8501e69d
+EBUILD eog-42.1.ebuild 1713 BLAKE2B ab54d270a0702792c60a7e3d069a0a842b99f2615ed840c8c40c4648f20bf53b35e490e9336d8070e1d7628240505e30bb063182cf0c86f5fe0905eb82482aae SHA512 21334df0eb38c1631b98afbf52e701281345177dc38020a05f45470a15550e6702755405508128e345c494a469c8ebdf81d368ca93ff522dae0a97270626f23c
+EBUILD eog-42.2.ebuild 1716 BLAKE2B 715428a0a75026bc322ef6218da388a9d2e7c999dde86deb13357717a148810e9ac04af7a4d65b6990252fa9c757c7e3c82c89dbe5d684570f4548cdab3577bc SHA512 e198cb9d5073ccb91ce2780a810976f3ea73278c2259f5c2e9f04ebddad86ce0200362e467c8840029c66410235a3a56ac328e08841b262ed1682833f94594a0
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-41.1.ebuild b/media-gfx/eog/eog-41.1.ebuild
deleted file mode 100644
index 64b5dc1b4a9b..000000000000
--- a/media-gfx/eog/eog-41.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22.0:3[introspection,X]
-	sys-libs/zlib
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2 )
-	jpeg? ( virtual/jpeg:0 )
-	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/gtk-doc-1.16
-		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/eog/eog-42.1.ebuild b/media-gfx/eog/eog-42.1.ebuild
index fb9dfdc4d3cc..bb56eb7315ce 100644
--- a/media-gfx/eog/eog-42.1.ebuild
+++ b/media-gfx/eog/eog-42.1.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/eog/eog-42.0.ebuild b/media-gfx/eog/eog-42.2.ebuild
index e5b638b70d44..fb9dfdc4d3cc 100644
--- a/media-gfx/eog/eog-42.0.ebuild
+++ b/media-gfx/eog/eog-42.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit gnome.org gnome2-utils meson xdg
 
 DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
 
 LICENSE="GPL-2+"
 SLOT="1"
@@ -30,7 +30,7 @@ RDEPEND="
 	exif? ( >=media-libs/libexif-0.6.14 )
 	lcms? ( media-libs/lcms:2 )
 	xmp? ( media-libs/exempi:2 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	svg? ( >=gnome-base/librsvg-2.44.0:2 )