gentoo resync : 29.12.2022

4 files changed, 14 insertions, 29 deletions

diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 02c28d7fa628..f317f15cb628 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,7 +1,6 @@
-AUX 0.30.14-vala-0.52.8-compat.patch 650 BLAKE2B eda8739a4f8f6fad9ad026c97542d2ec3683f3fdf86ce34be9235a49a5569ad0a67b1ab454eba6c5d13bf9a3fb2a1cefb52d8d0a6103d4d84e2d0efbafd55e0f SHA512 0736a02880c5db69a85cc3eedc444aa6d95f96e3e31695b078a416384f9751d8c8cc550d42ba6dfc1a59f98b0b30b6f87ea5136988d404ee08fe9e6b0c752ec9
 AUX 0.30.15-opencv4-compatibility.patch 2253 BLAKE2B 5120413e34f1638e777a3c737a5cf3664049c907e7a641354d7b222611f5d84ff51632b4903dd1587c3407773816bf259c2b682936b301ad3184a250e9bb9127 SHA512 5346bd1360a423c38e833cd9d52798aea4fef0f49519316023fa6c94a424cfc7db2e5468303e03e8bdaad756ed05fe40f3cdf9168d3042f3ca0ac669fd02bde6
-DIST shotwell-0.30.14.tar.xz 6524680 BLAKE2B 321406d3731a4baa333c3820ee46e8dc12ca9a340c7f1ac3824ee894fa2826b7efa3ee7a27f551d62043e5f22199042befb5063cc67cefd27830e19db7d7f661 SHA512 bd899ac099ec4760f6119804812ef9314c9261c18273309abfb1dccc675b9e4a561c0abea1c46ea0dbbab9f5c00301d840b52714f97ec06548c180a77871db7c
 DIST shotwell-0.30.15.tar.xz 6533632 BLAKE2B a973c22f06b2c05561db72974fa8f8a72006e4795ca282bd7c94e99f1b59c411917a30dd00b896cf606b80596c1510fe50e81c1a1c8fa6b98bcd75f8b25c5769 SHA512 aded4c8ec015546cb64189cc1a85b6bc233861367ec514cce041607a1deec9d69687f26e448865783c686813c1caec78df17c29d38c4296c4a255ff20c7cde0e
-EBUILD shotwell-0.30.14.ebuild 1923 BLAKE2B b2ed36882aa19d902673d4f9b5565643e5a2c026e4973a439076fa047cc1bf7e6f5c9a2e573ee117cba45d7d6c520f4f1539290d76a3117c7c2df2ec30a13657 SHA512 27b1afaf0218ae38ab259ca619ec8a0a0e97ce5c2dde709402bf0e519beeacf663933ba7323976c3300e0b2da9058585a76ac8ef8d15b7d13b25a123c679dca9
-EBUILD shotwell-0.30.15.ebuild 1885 BLAKE2B 0ffd5e1db82c7abcce8a78f823625e5982dd56b8cfd77ab65d2a2c0aada103e9e1a47675f13023b7d02e974990f07ed905bd6f8b93b6bb6675573991ec8cb55e SHA512 199f1fc5966ef2496743e55289f25866f779bfd224cc7c1189d1a35b2241b0fc80de4bcd2dcd6127265262031e2ffbebaf8a60818a8421c17db8b6ec668bcd04
+DIST shotwell-0.30.16.tar.xz 6532812 BLAKE2B caa2ff2f4536d8f04900d7ba7c583b7ec0d0244d6253bc17971e2b4e04aa3790b17e932b3367e1be40d4a0bb566bab31396aa5dfdb6dbb5c9803272cd7f94e97 SHA512 4ed725a34b1663b9cb63dcd13c98795fb2ea9a5d79ee4541276bc9dc2f607ce6466cc9c983bab55e7418e69eef3d1598846aeb6750f00927663756bd11d9a084
+EBUILD shotwell-0.30.15.ebuild 1910 BLAKE2B 414fb09249cb5354982841ed268d8ccb58b7ecdc460132489c71aea275bc42c31a5e645d1f7081c4cc9240576920941ff93b10b47c1337bab37da5875ec5bbc5 SHA512 3666499bfaf923981fc5965e06f23a871006c11ea8d93b630bcf3d75a86f2640a3a75c485800c37af36cb12a9107176675adea83f65db84e2ebfd6903194ac0b
+EBUILD shotwell-0.30.16.ebuild 1851 BLAKE2B 7e7533f9ec6cbb20c584ab471b253d91a99f8cbfb06df0e15221c61de53a906fd36a450433dccaf4affb358439a47eea693c032787781f4f7f1bc3f2da7b2b66 SHA512 4b18c69f31167a13ba1936e78fd3f6f492e1987d1a8187b45256e041bd9966d74fa43690acf120f67c96921175783e068d9c49e67c1ac6316bde062d8133886e
 MISC metadata.xml 685 BLAKE2B 60a7448a9542a8663c25966bfa7dae2bbd50fb727795300e6483ea39147521b2d6ebd3c4dd894c553cbd94df18f4e39e1d88359d9da346a02cb7a02709d19f11 SHA512 da9730037e4d473898cfa537446b9ea3dae77bb915c54df139738a4e19b824ff273c36c2e3a43f421d91e2de09789843ccc84bd4cb4bcda258eee37fd9dec425
diff --git a/media-gfx/shotwell/files/0.30.14-vala-0.52.8-compat.patch b/media-gfx/shotwell/files/0.30.14-vala-0.52.8-compat.patch
deleted file mode 100644
index 0aef3e4eea96..000000000000
--- a/media-gfx/shotwell/files/0.30.14-vala-0.52.8-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/dialogs/ExportDialog.vala b/src/dialogs/ExportDialog.vala
-index 5a61dc4a..c8011b7f 100644
---- a/src/dialogs/ExportDialog.vala
-+++ b/src/dialogs/ExportDialog.vala
-@@ -23,7 +23,7 @@ public class ExportDialog : Gtk.Dialog {
- 
-     private static ScaleConstraint current_constraint = ScaleConstraint.ORIGINAL;
-     private static ExportFormatParameters current_parameters = ExportFormatParameters.current();
--    private static int current_scale = DEFAULT_SCALE;
-+    private static int current_scale = 1200; //FIXME not needed with vala 0.54+
- 
-     private Gtk.Grid table = new Gtk.Grid();
-     private Gtk.ComboBoxText quality_combo;
diff --git a/media-gfx/shotwell/shotwell-0.30.15.ebuild b/media-gfx/shotwell/shotwell-0.30.15.ebuild
index fae21f9f1568..ddc681e611ef 100644
--- a/media-gfx/shotwell/shotwell-0.30.15.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.15.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.54"
 inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Open source photo manager for GNOME"
@@ -11,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/shotwell/shotwell-0.30.14.ebuild b/media-gfx/shotwell/shotwell-0.30.16.ebuild
index 68dd3cb9e8a4..cd09860b7b42 100644
--- a/media-gfx/shotwell/shotwell-0.30.14.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.16.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-VALA_MAX_API_VERSION="0.54"
+EAPI=8
 
-inherit gnome.org gnome2-utils meson vala xdg
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.54"
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Open source photo manager for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="opencv udev"
 
 DEPEND="
@@ -40,6 +41,7 @@ RDEPEND="${DEPEND}
 	media-plugins/gst-plugins-meta:1.0
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	$(vala_depend)
 	dev-libs/appstream-glib
 	dev-util/itstool
@@ -50,14 +52,10 @@ BDEPEND="
 	app-crypt/gcr[vala]
 "
 
-PATCHES=(
-	# Fix build against vala-0.52.8. Isn't needed once we use 0.54+ or drop vala:0.52 slots
-	"${FILESDIR}"/${PV}-vala-0.52.8-compat.patch
-)
-
 src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
+	default
+	vala_setup
+	xdg_environment_reset
 }
 
 src_configure() {