gentoo resync : 29.12.2022

4 files changed, 2 insertions, 148 deletions

diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 3f6a07be10e7..f13e3f3e0e3e 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,7 +1,3 @@
-DIST eog-plugins-3.26.8.tar.xz 479356 BLAKE2B ab781311473e045ffbb88e741427ac59f129fa53e6c551231d7b6edae81d21483dd1f1e7874561dfa29c9e9b2ba01fbdb174302bf8363478b785ec2ce38c53ec SHA512 a58aa849b09761dd0c7f7d31098560969872b03788f3f3ee81445dfb9be653b29e0e6646abc4e0164e4146abf7a9d2e6aadf56071f71c119493dcf1fd706a069
-DIST eog-plugins-42.0.tar.xz 132008 BLAKE2B 0dbe9ddcdf8f9a7f4da46caffe091a5d6e09327e1277b41474ecf8a3ec63ee7217fdc0cbafd1c47007f83b8ae30f30d91031c76f31473df79cda01aee23314ea SHA512 297b31fefa28f4eda73734ddcdb7702b9c9fa3493b4c13d3bf013e24ddb9015299bcd8f2af6a1976c4bf8c694fea0cc9699e82755d5e0689e71738a6d2fb2fe4
 DIST eog-plugins-42.1.tar.xz 131656 BLAKE2B e561e7b31daf950c1e1c1e1038bf40101b658583160439f7fd9050b52da2f6dd943105e1e1eeaefff7ed2aa759f8b96aad0a65130daba038733967db37158bfc SHA512 4688cb9cce044137717521a3ff2f769f960f12ec8b3f711971f276334f91915c8a3142aff2feb3d24d2eeb86223f040e9b699a1136e7fc7e96202a06b1cda1a8
-EBUILD eog-plugins-3.26.8.ebuild 1725 BLAKE2B f685d824292edc02b08cb0b2adc7d68fff1ef2868c742be61be0ff579795ebd3514f46a2594cc0d7d42eb8b95ee903a733ce88e9b2eca889944e08670c3480c2 SHA512 57604bd1094981357339c5a1382a21a517cd4538c09189a65e1927c61b63363ab36519c52cb99cf9a003e62ff887080b272a39bf4214050b7532749747da03c3
-EBUILD eog-plugins-42.0.ebuild 1681 BLAKE2B 95fdd675235a22c6800fff0d27f95ba3ec2e1c6802a7ded06e07c249a1c1e6c2d58c529c75c60bf1a8add7ec9d147de74226c6ec1df818c191dd0f949c3ef12c SHA512 a71006c09e8e82f7e6f2a8789f0ea0d893f6246f451b295f7093786eb84af307a9ec4098f2d35dbda371364ecc79801c2def9ea41bb9f239b820fc4f49c7dbdd
-EBUILD eog-plugins-42.1.ebuild 1724 BLAKE2B 51add057a8f5331f1fd0f00bfe1a9e223c185fc473c39e806fe4de30d6119cef7915c210a71ce92a4121d4ec41a5603d2bf7965710d9b86c603e232785c417e9 SHA512 2205791bf7d6c197a200c4f68074964a8c815d8173d4fb6d41452dbb54e9d8806f0d87b3decfd58697c60e685516f43cdeb2ba56cd882340b9da0aaf03713139
+EBUILD eog-plugins-42.1.ebuild 1722 BLAKE2B b3f1e17ee4b098b2ac63a70d3cdc3f7caaf2db9d647d289ddf4e2f81b91283d917a12a1f47569deecca1c8be054ce67bb660ba36f750ca07d82c5089e1122bf2 SHA512 4d3265072000f00915e49967c2f4297c6513697d1dbd3e686ab5a09f0e5aa821fd38a684bceb8d3ea3458a9f7004957c3f7c1a41a5158defe38c2f9c4cb7e6ca
 MISC metadata.xml 429 BLAKE2B 61e0c5a268c0dbcb1a2b0a0e1d0ceb1b7795db34e022ba9229015ecf05210dcdd247c2c9867549f5c75028dcb20011f7757fd9b4ef507af65b80aa8aa1ca6f18 SHA512 d4b81d9f78bf49afe842990d9c1c9dde1c3f1bc68090f77dde1bd51b2be98ab647be10f8886da7dcc1831cabc4f7c81b18b7e6e5cadb2c5aeeec69db883509bf
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild
deleted file mode 100644
index 4bfe1d1968cd..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/share/{appdata,metainfo}
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-gfx/eog-plugins/eog-plugins-42.0.ebuild b/media-gfx/eog-plugins/eog-plugins-42.0.ebuild
deleted file mode 100644
index ae3bb0bb211a..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-42.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org meson python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+exif map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-1.14.1:=
-	>=media-gfx/eog-41.0
-	exif? ( >=media-libs/libexif-0.6.16 )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0
-	)
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/glib[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif plugin_exif-display)
-		$(meson_use python plugin_export-to-folder)
-		-Dplugin_fit-to-width=true
-		$(meson_use python plugin_fullscreenbg)
-		-Dplugin_light-theme=true
-		$(meson_use map plugin_map)
-		$(meson_use python plugin_maximize-windows)
-		$(meson_use picasa plugin_postasa)
-		-Dplugin_postr=false
-		$(meson_use python plugin_pythonconsole)
-		-Dplugin_send-by-mail=true
-		$(meson_use python plugin_slideshowshuffle)
-	)
-	meson_src_configure
-}
diff --git a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild b/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
index ddb7d165e7af..606145157af2 100644
--- a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins https://gitlab.gnome.or
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="