sys-devel/gdb: add guile USE flag

Add a new guile optional USE flag for GDB's scripting support.
Also adds the >=guile-2.0 optional dependency if such flag is active.

GDB has been compiling with '--without-guile' since #562902 and the option
seems to have been forgotten. Since GDB works with guile 2.0 to 3.0 it seems
about time to bring it back.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Martí Huescar <Phireh@fukurokuju.dev>
Bug: https://bugs.gentoo.org/562902
Closes: https://github.com/gentoo/gentoo/pull/22115
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 12 insertions, 12 deletions

diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild
index 43bc2989930f..c751cccea855 100644
--- a/sys-devel/gdb/gdb-10.1.ebuild
+++ b/sys-devel/gdb/gdb-10.1.ebuild
@@ -46,7 +46,7 @@ SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -65,6 +65,7 @@ RDEPEND="
 	sys-libs/zlib
 	lzma? ( app-arch/xz-utils )
 	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
 	xml? ( dev-libs/expat )
 	source-highlight? (
 		dev-util/source-highlight
@@ -157,8 +158,6 @@ src_configure() {
 		--enable-64-bit-bfd
 		--disable-install-libbfd
 		--disable-install-libiberty
-		# Disable guile for now as it requires guile-2.x #562902
-		--without-guile
 		--enable-obsolete
 		# This only disables building in the readline subdir.
 		# For gdb itself, it'll use the system version.
@@ -176,6 +175,7 @@ src_configure() {
 		$(use multitarget && echo --enable-targets=all)
 		$(use_with python python "${EPYTHON}")
 		$(use_with xxhash)
+		$(use_with guile)
 	)
 	if use sparc-solaris || use x86-solaris ; then
 		# disable largefile support
diff --git a/sys-devel/gdb/gdb-10.2-r1.ebuild b/sys-devel/gdb/gdb-10.2-r1.ebuild
index b5d5204d0458..7440aef64f5c 100644
--- a/sys-devel/gdb/gdb-10.2-r1.ebuild
+++ b/sys-devel/gdb/gdb-10.2-r1.ebuild
@@ -46,7 +46,7 @@ SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -65,6 +65,7 @@ RDEPEND="
 	sys-libs/zlib
 	lzma? ( app-arch/xz-utils )
 	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
 	xml? ( dev-libs/expat )
 	source-highlight? (
 		dev-util/source-highlight
@@ -159,8 +160,6 @@ src_configure() {
 		--enable-64-bit-bfd
 		--disable-install-libbfd
 		--disable-install-libiberty
-		# Disable guile for now as it requires guile-2.x #562902
-		--without-guile
 		--enable-obsolete
 		# This only disables building in the readline subdir.
 		# For gdb itself, it'll use the system version.
@@ -178,6 +177,7 @@ src_configure() {
 		$(use multitarget && echo --enable-targets=all)
 		$(use_with python python "${EPYTHON}")
 		$(use_with xxhash)
+		$(use_with guile)
 	)
 	if use sparc-solaris || use x86-solaris ; then
 		# disable largefile support
diff --git a/sys-devel/gdb/gdb-10.2.ebuild b/sys-devel/gdb/gdb-10.2.ebuild
index 9968e1b3e6af..bdb30edb1d9e 100644
--- a/sys-devel/gdb/gdb-10.2.ebuild
+++ b/sys-devel/gdb/gdb-10.2.ebuild
@@ -46,7 +46,7 @@ SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -65,6 +65,7 @@ RDEPEND="
 	sys-libs/zlib
 	lzma? ( app-arch/xz-utils )
 	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
 	xml? ( dev-libs/expat )
 	source-highlight? (
 		dev-util/source-highlight
@@ -158,8 +159,6 @@ src_configure() {
 		--enable-64-bit-bfd
 		--disable-install-libbfd
 		--disable-install-libiberty
-		# Disable guile for now as it requires guile-2.x #562902
-		--without-guile
 		--enable-obsolete
 		# This only disables building in the readline subdir.
 		# For gdb itself, it'll use the system version.
@@ -177,6 +176,7 @@ src_configure() {
 		$(use multitarget && echo --enable-targets=all)
 		$(use_with python python "${EPYTHON}")
 		$(use_with xxhash)
+		$(use_with guile)
 	)
 	if use sparc-solaris || use x86-solaris ; then
 		# disable largefile support
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index d45841148f9b..fde1ad992437 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -46,7 +46,7 @@ SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -65,6 +65,7 @@ RDEPEND="
 	sys-libs/zlib
 	lzma? ( app-arch/xz-utils )
 	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
 	xml? ( dev-libs/expat )
 	source-highlight? (
 		dev-util/source-highlight
@@ -156,8 +157,6 @@ src_configure() {
 		--enable-64-bit-bfd
 		--disable-install-libbfd
 		--disable-install-libiberty
-		# Disable guile for now as it requires guile-2.x #562902
-		--without-guile
 		--enable-obsolete
 		# This only disables building in the readline subdir.
 		# For gdb itself, it'll use the system version.
@@ -175,6 +174,7 @@ src_configure() {
 		$(use multitarget && echo --enable-targets=all)
 		$(use_with python python "${EPYTHON}")
 		$(use_with xxhash)
+		$(use_with guile)
 	)
 	if use sparc-solaris || use x86-solaris ; then
 		# disable largefile support