From 51564faa4dfefe84e7b9def184ab105823beaf88 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 14 Apr 2022 18:57:21 -0700
Subject: sys-devel/sparse: Depend on x11-libs/gtk+:3, not :2

Upstream commit 52ac1749 ("test-inspect: Detect gtk3 then gtk2 package")
in 2017 changed the default to GTK 3 and we didn't notice apparently.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 sys-devel/sparse/metadata.xml           |  2 +-
 sys-devel/sparse/sparse-0.6.4-r1.ebuild | 72 +++++++++++++++++++++++++++++++++
 sys-devel/sparse/sparse-0.6.4.ebuild    | 72 ---------------------------------
 sys-devel/sparse/sparse-9999.ebuild     |  4 +-
 4 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 sys-devel/sparse/sparse-0.6.4-r1.ebuild
 delete mode 100644 sys-devel/sparse/sparse-0.6.4.ebuild

diff --git a/sys-devel/sparse/metadata.xml b/sys-devel/sparse/metadata.xml
index aec196782c68..4eec8f82d259 100644
--- a/sys-devel/sparse/metadata.xml
+++ b/sys-devel/sparse/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Gentoo Toolchain Project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk">Build the test-inspect utility (requires <pkg>x11-libs/gtk+</pkg> version 2)</flag>
+		<flag name="gtk">Build the test-inspect utility (requires <pkg>x11-libs/gtk+</pkg>:3)</flag>
 		<flag name="llvm">Build the sparse-llvm utility</flag>
 		<flag name="xml">Build the c2xml utility (requires <pkg>dev-libs/libxml2</pkg>)</flag>
 	</use>
diff --git a/sys-devel/sparse/sparse-0.6.4-r1.ebuild b/sys-devel/sparse/sparse-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..a7c5b9dbc728
--- /dev/null
+++ b/sys-devel/sparse/sparse-0.6.4-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=12
+inherit llvm toolchain-funcs
+
+DESCRIPTION="C semantic parser"
+HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
+else
+	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gtk llvm sqlite test xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:3 )
+	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
+	sqlite? ( dev-db/sqlite:= )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="gtk? ( virtual/pkgconfig )
+	xml? ( virtual/pkgconfig )"
+
+llvm_check_deps() {
+	has_version "sys-devel/llvm:${LLVM_SLOT}" && \
+		has_version -r "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+}
+
+_emake() {
+	# Makefile does not allow for an easy override of flags.
+	# Collect them here and override default phases.
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		HAVE_GTK=$(usex gtk) \
+		HAVE_LLVM=$(usex llvm) \
+		HAVE_SQLITE=$(usex sqlite) \
+		HAVE_LIBXML=$(usex xml) \
+		V=1 \
+		PREFIX="${EPREFIX}/usr" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+
+	dodoc FAQ README
+}
diff --git a/sys-devel/sparse/sparse-0.6.4.ebuild b/sys-devel/sparse/sparse-0.6.4.ebuild
deleted file mode 100644
index 6fbcc28e1552..000000000000
--- a/sys-devel/sparse/sparse-0.6.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=12
-inherit llvm toolchain-funcs
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
-else
-	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gtk llvm sqlite test xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
-	sqlite? ( dev-db/sqlite:= )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-llvm_check_deps() {
-	has_version "sys-devel/llvm:${LLVM_SLOT}" && \
-		has_version -r "sys-devel/llvm:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-}
-
-_emake() {
-	# Makefile does not allow for an easy override of flags.
-	# Collect them here and override default phases.
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		HAVE_GTK=$(usex gtk) \
-		HAVE_LLVM=$(usex llvm) \
-		HAVE_SQLITE=$(usex sqlite) \
-		HAVE_LIBXML=$(usex xml) \
-		V=1 \
-		PREFIX="${EPREFIX}/usr" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-
-	dodoc FAQ README
-}
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 6fbcc28e1552..a7c5b9dbc728 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="gtk llvm sqlite test xml"
 RESTRICT="!test? ( test )"
 
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
+RDEPEND="gtk? ( x11-libs/gtk+:3 )
 	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
 	sqlite? ( dev-db/sqlite:= )
 	xml? ( dev-libs/libxml2 )"
-- 
cgit v1.2.3-65-gdbad