From c009c0a877ccde5c7954c870b6b3a3987ebb7fd4 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 15 Sep 2022 16:09:30 -0400
Subject: games-arcade/gnome-nibbles: Remove vala version restrictions

They were resolved in commit acbfede4da1 ("games-arcade/gnome-nibbles:
Fix for vala 0.50.4 regression") but the commit did not remove the
restrictions themselves.

Also bump to EAPI=8 while we're here.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 .../gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild   | 53 +++++++++++++++++++++
 .../gnome-nibbles/gnome-nibbles-3.38.2.ebuild      | 54 ----------------------
 2 files changed, 53 insertions(+), 54 deletions(-)
 create mode 100644 games-arcade/gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild
 delete mode 100644 games-arcade/gnome-nibbles/gnome-nibbles-3.38.2.ebuild

(limited to 'games-arcade')

diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild
new file mode 100644
index 000000000000..afbe437b2d54
--- /dev/null
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Nibbles clone for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles https://gitlab.gnome.org/GNOME/gnome-nibbles"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.0:2
+	>=media-libs/clutter-1.22.0:1.0
+	>=media-libs/clutter-gtk-1.4.0:1.0
+	dev-libs/libgee:0.8=
+	>=media-libs/gsound-1.0.2
+	>=x11-libs/gtk+-3.24.0:3
+	>=dev-libs/libgnome-games-support-1.7.1:1=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	media-libs/gsound[vala]
+"
+
+PATCHES=(
+	# backport for https://gitlab.gnome.org/GNOME/gnome-nibbles/-/issues/52
+	"${FILESDIR}"/${P}-vala-0.50.4-GtkChild-1.patch
+	"${FILESDIR}"/${P}-vala-0.50.4-GtkChild-2.patch
+)
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2.ebuild
deleted file mode 100644
index ca5b7e496f47..000000000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MAX_API_VERSION="0.50"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Nibbles clone for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles https://gitlab.gnome.org/GNOME/gnome-nibbles"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2
-	>=media-libs/clutter-1.22.0:1.0
-	>=media-libs/clutter-gtk-1.4.0:1.0
-	dev-libs/libgee:0.8=
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.24.0:3
-	>=dev-libs/libgnome-games-support-1.7.1:1=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-"
-
-PATCHES=(
-	# backport for https://gitlab.gnome.org/GNOME/gnome-nibbles/-/issues/52
-	"${FILESDIR}"/${P}-vala-0.50.4-GtkChild-1.patch
-	"${FILESDIR}"/${P}-vala-0.50.4-GtkChild-2.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-- 
cgit v1.2.3-65-gdbad