Merge updates from master

6 files changed, 64 insertions, 105 deletions

diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index e1f3a8ae48ff..085eb4e625b1 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,5 +1,3 @@
-DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf89006fd55d37e3efd0824dace379d2c72cdb45d481b0545d0b4b37299bc6161b2d083d3221d2d8d8ca7c10d6dc SHA512 6d8d1acebf4706346d5dc986f5c900cfda929ca59ca3f3907cff56892a496bf524b1f74032ac6c8587b236a473124e15c6f83f949636e28141a55c8abeddf004
-DIST vala-0.48.22.tar.xz 3539404 BLAKE2B b9e5e845bbeefd240a9d332d64c2a77bdf581a3438586f8648a068fad15ac8e55e09416548537435f6b1d5925cd6220f603526ca96c290a0628284bc4463cae2 SHA512 c12536a3773cf299e545b33408c23ae3258859172afaaee82ce49699f5285081d6af8047605fb6edd089d16ab177871219cb8b632be827e615ccaff75f5543fe
 DIST vala-0.50.10.tar.xz 3547792 BLAKE2B 80e57b0fa5fdec2e3403878db1d5c83f4fd14551863131ce359070ab11ef99bcd3813808ab61d8fd8acbb45e9882e83a2ca00f51d584608a0afdd0b9908ee2f3 SHA512 09212c128bc7f7f16b72912644e06c3b91c3b102698a6c7d7af60a8adbcbf8b8ed80b005cbf72654e1d3139c79595baf88561fa41b393a53b1e3ecc1af6896cd
 DIST vala-0.52.10.tar.xz 3598676 BLAKE2B f1d54634ffb8a152e5672badc912338a2982a81f5ee998b05212de807197d3f5cdd5b08ec9b521a004933fa6585b24b1e45a9cbc1a375c9863460350d3d3749b SHA512 d7517c25228db9c69bc68e16ed3903ea5dda016d5e84183491fef0b65edbbaf34065e785b0e0dc48f3af2460dc9ac6c435436f460b01929b2403ef0b9a2ad2d8
 DIST vala-0.54.7.tar.xz 3916868 BLAKE2B 0e9f1e20f7f2dc2e1b024baba6e64e9d192de7d9978c6f9b2ed37e5fff9e95e31718e7a44761c98e8fe2aa790e9464259df004610d4cf863ef39afe45cedd37d SHA512 7d3345984c496e9fe6324fea6c4fd8d2887102b271d825740b0f5812538dbdabe9c88ec4022d25c34121df686200cce48d4678ec6a00b2a002b9e74242475440
diff --git a/dev-lang/vala/vala-0.46.13.ebuild b/dev-lang/vala/vala-0.46.13.ebuild
deleted file mode 100644
index 446e0c12bab2..000000000000
--- a/dev-lang/vala/vala-0.46.13.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.46"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
-IUSE="test valadoc"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.0:2
-	>=dev-libs/vala-common-${PV}
-	valadoc? ( >=media-gfx/graphviz-2.16 )
-	!<net-libs/libsoup-2.66.2[vala]
-" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
-# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
-# as the newer is not required with older vala when those are picked instead of 0.46.
-# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2
-		dev-libs/gobject-introspection )
-"
-
-src_configure() {
-	# weasyprint enables generation of PDF from HTML
-	gnome2_src_configure \
-		--disable-unversioned \
-		$(use_enable valadoc) \
-		VALAC=: \
-		WEASYPRINT=:
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-lang/vala/vala-0.48.22.ebuild b/dev-lang/vala/vala-0.48.22.ebuild
deleted file mode 100644
index 80c7809944dd..000000000000
--- a/dev-lang/vala/vala-0.48.22.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.48"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="test valadoc"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.0:2
-	>=dev-libs/vala-common-${PV}
-	valadoc? ( >=media-gfx/graphviz-2.16 )
-	!<net-libs/libsoup-2.66.2[vala]
-" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
-# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
-# as the newer is not required with older vala when those are picked instead of 0.46.
-# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2
-		dev-libs/gobject-introspection
-	)
-"
-BDEPEND="
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-"
-
-src_configure() {
-	# weasyprint enables generation of PDF from HTML
-	gnome2_src_configure \
-		--disable-unversioned \
-		$(use_enable valadoc) \
-		VALAC=: \
-		WEASYPRINT=:
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 29d9dead1d08..076ef9066067 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -25,8 +25,8 @@ _VALA_ECLASS=1
 
 # @ECLASS_VARIABLE: VALA_MIN_API_VERSION
 # @DESCRIPTION:
-# Minimum vala API version (e.g. 0.46).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.46}
+# Minimum vala API version (e.g. 0.50).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.50}
 
 # @ECLASS_VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 14f4fc095214..2e8547719447 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1 +1,2 @@
 DIST gnome-clocks-41.0.tar.xz 385088 BLAKE2B d2c83212b2817767f8711cfd9352a642059f1dfbabbed007c04d4ae5c1086152eeaa5f6e4f9e88d3593a67b95212f5ab5817bd6abf9c61f6c880628adc1534eb SHA512 da0d0b487310d63f14c99dd7e4018dfb0779482e9936594641bb26b1d12479d373da5a2652392d6927a16ec072ee7c08515548c347fb7dcc82e32be5c0e626ba
+DIST gnome-clocks-42.0.tar.xz 360968 BLAKE2B de66b802dbce8e57a97594c76e8fe5f7a4d65c1426d3c45217f3eb1e27e553fda9f1484b83827e6f44db10c8623581c7e1cd79f0bd79352966f67345e59fcf30 SHA512 f642cb4a626de2a97ad78c25922bb933bdac917d363097fcf5149310111abd11834410b48bfb4fc9cbae06f0ab30b0a5200d45304ce292b5a9558a90b922edb4
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
new file mode 100644
index 000000000000..2433248fc543
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_MIN_API_VERSION="0.56"
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.68:2
+	>=gui-libs/gtk-4.5:4
+	>=media-libs/gsound-0.98
+	>=dev-libs/libgweather-4.0.0:4=
+	gnome-base/gnome-desktop:4
+	>=sci-geosciences/geocode-glib-1
+	>=app-misc/geoclue-2.4:2.0
+	>=gui-libs/libadwaita-1.0:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	dev-libs/libgweather:4[vala]
+	media-libs/gsound[vala]
+	gui-libs/libadwaita:1[vala]
+"
+
+DOCS=( AUTHORS.md CONTRIBUTING.md README.md )
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=default
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}