commit:     443448132e8913e376fffc503fbd366c4ea23f78
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 16:54:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 20:55:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44344813

sys-devel/gdb: sync live

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

 sys-devel/gdb/gdb-13.0.91.ebuild | 11 +++++------
 sys-devel/gdb/gdb-9999.ebuild    | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/sys-devel/gdb/gdb-13.0.91.ebuild b/sys-devel/gdb/gdb-13.0.91.ebuild
index 7cd89f769a0c..9e1fdd605935 100644
--- a/sys-devel/gdb/gdb-13.0.91.ebuild
+++ b/sys-devel/gdb/gdb-13.0.91.ebuild
@@ -32,7 +32,6 @@ case ${PV} in
                SRC_URI="
                        
https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz
                        
https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
-                       
https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz
                "
                S="${WORKDIR}/${PN}-${MY_PV}"
                ;;
@@ -50,6 +49,8 @@ case ${PV} in
                        mirror://gnu/gdb/${P}.tar.xz
                        https://sourceware.org/pub/gdb/releases/${P}.tar.xz
                "
+
+               #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"
                ;;
 esac
 
@@ -65,14 +66,12 @@ SRC_URI="
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-
-if [[ ${PV} != 9999* ]] ; then
+IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test 
vanilla xml xxhash zstd"
+# TODO: Drop once 13 is released
+if [[ ${PV} != 9999 ]] ; then
        # for testing on loong only
-       #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"
        KEYWORDS="~loong"
 fi
-
-IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test 
vanilla xml xxhash zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 9eb29deacc90..9e1fdd605935 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -26,7 +26,7 @@ case ${PV} in
                inherit git-r3
                SRC_URI=""
                ;;
-       *.*.50_p2???????| *.*.90_p2???????)
+       *.*.50_p2???????|*.*.90_p2???????)
                # Weekly snapshots
                MY_PV="${PV/_p/.}"
                SRC_URI="
@@ -35,12 +35,22 @@ case ${PV} in
                "
                S="${WORKDIR}/${PN}-${MY_PV}"
                ;;
+       *.*.9?)
+               # Prereleases
+               MY_PV="${PV/_p/.}"
+               SRC_URI="
+                       
https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz
+               "
+               S="${WORKDIR}/${PN}-${MY_PV}"
+               ;;
        *)
                # Normal upstream release
                SRC_URI="
                        mirror://gnu/gdb/${P}.tar.xz
                        https://sourceware.org/pub/gdb/releases/${P}.tar.xz
                "
+
+               #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"
                ;;
 esac
 
@@ -56,14 +66,12 @@ SRC_URI="
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-
-if [[ ${PV} != 9999* ]] ; then
+IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test 
vanilla xml xxhash zstd"
+# TODO: Drop once 13 is released
+if [[ ${PV} != 9999 ]] ; then
        # for testing on loong only
-       #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"
        KEYWORDS="~loong"
 fi
-
-IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test 
vanilla xml xxhash zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 

Reply via email to