[gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/

["Sam James" <sam@gentoo.org>]

commit:     6dd7f162ff2b52067b012435c6a146394c42679f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 03:57:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 04:03:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd7f162

sys-devel/gdb: add 13.1.90_p20230325

Needed for some patches on the stable gdb-13.1 branch, mainly for Rust crash.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/gdb/Manifest                                 |  1 +
 .../{gdb-9999.ebuild => gdb-13.1.90_p20230325.ebuild}  | 18 +++++++++++++-----
 sys-devel/gdb/gdb-9999.ebuild                          | 17 ++++++++++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 08dd98394c09..419b62871780 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,3 +1,4 @@
 DIST gdb-12.1-patches-1.tar.xz 12340 BLAKE2B 071ff492f6cf7b0969d76db6f7414eeec564daf773c3334fb0d3f669e328bb4ae403ba8c709f3e33a56caa92273f762a5597a34dd7e7a1056f473b7ede2d8e59 SHA512 dc4a1a8d501dd1adfdcd6dcbd2559f1e2cc6aadeb18eacb2e9152f6858510e7392253db9568fe782da6d160221412e3e13dfd42a47a2a4a1addba2c1804a45b5
 DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d
 DIST gdb-13.1.tar.xz 23665472 BLAKE2B ab3a77ef35d21597dd1299787eebc422c3ca9764d0866223752c3036c0f9e198bf25ab4730bf6e7025bc2db148c66e98b191e15abc2d69c3088aed146728beef SHA512 e65054ffbc0357eeed4b17e1edc5ef45aa73c9ddf3b1210651e3d859576e27c1d27b266800fe26328eda58857455ccd8632f4000cfc5f63f90854096290187ca
+DIST gdb-weekly-13.1.90.20230325.tar.xz 24816144 BLAKE2B 2273ca1e6b3b563721c1497b30ae9c1c1d6fa88d1a50745a528163d54b45cc0582d3a053f279339dcc5d86b17dabe16c2be63488ac72ed7636af5988919c4b5e SHA512 19a1f1e0d4fc6f7a87c421e487990e3bc6c5ad5fae933be0e4f0ba8eec06b6bc3b0fc814d55e6059dfc2b7414ef0e7191967503dd0eda9021ccabc6d55030f49

diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild
similarity index 93%
copy from sys-devel/gdb/gdb-9999.ebuild
copy to sys-devel/gdb/gdb-13.1.90_p20230325.ebuild
index bc86849c6276..9380f74f1c2c 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild
@@ -34,6 +34,11 @@ case ${PV} in
 			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
 		"
 		S="${WORKDIR}/${PN}-${MY_PV}"
+
+		# e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine
+		if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then
+			REGULAR_RELEASE=1
+		fi
 		;;
 	*.*.9?)
 		# Prereleases
@@ -50,8 +55,7 @@ case ${PV} in
 			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
 		"
 
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-		;;
+		REGULAR_RELEASE=1
 esac
 
 PATCH_DEV=""
@@ -67,14 +71,17 @@ SRC_URI="
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
+if [[ -n ${REGULAR_RELEASE} ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-libs/mpfr:0=
+	dev-libs/mpfr:=
 	dev-libs/gmp:=
-	>=sys-libs/ncurses-5.2-r2:0=
-	>=sys-libs/readline-7:0=
+	>=sys-libs/ncurses-5.2-r2:=
+	>=sys-libs/readline-7:=
 	sys-libs/zlib
 	elibc_glibc? ( net-libs/libnsl:= )
 	lzma? ( app-arch/xz-utils )
@@ -101,6 +108,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+	"${FILESDIR}"/${PN}-13.1-Wenum-constexpr-conversion-clang16.patch
 )
 
 pkg_setup() {

diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index bc86849c6276..c88c3a08b21c 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -34,6 +34,11 @@ case ${PV} in
 			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
 		"
 		S="${WORKDIR}/${PN}-${MY_PV}"
+
+		# e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine
+		if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then
+			REGULAR_RELEASE=1
+		fi
 		;;
 	*.*.9?)
 		# Prereleases
@@ -50,8 +55,7 @@ case ${PV} in
 			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
 		"
 
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-		;;
+		REGULAR_RELEASE=1
 esac
 
 PATCH_DEV=""
@@ -67,14 +71,17 @@ SRC_URI="
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
+if [[ -n ${REGULAR_RELEASE} ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-libs/mpfr:0=
+	dev-libs/mpfr:=
 	dev-libs/gmp:=
-	>=sys-libs/ncurses-5.2-r2:0=
-	>=sys-libs/readline-7:0=
+	>=sys-libs/ncurses-5.2-r2:=
+	>=sys-libs/readline-7:=
 	sys-libs/zlib
 	elibc_glibc? ( net-libs/libnsl:= )
 	lzma? ( app-arch/xz-utils )