[gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/

[Sam James]

commit:     6a94d242a47d04fe253c9af52e31aa61aec1b08f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 07:47:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 07:47:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a94d242

dev-util/valgrind: add 3.22.0_rc1 (unkeyworded)

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

 dev-util/valgrind/Manifest                              |  2 ++
 ...{valgrind-9999.ebuild => valgrind-3.22.0_rc1.ebuild} | 17 ++++++++++++++---
 dev-util/valgrind/valgrind-9999.ebuild                  | 17 ++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 734b97b2aa83..4b0b3cae4f4a 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -2,3 +2,5 @@ DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 
8217dcfc185c7f6601fedd8d53bb35d260
 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 
12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7
 SHA512 
70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
 DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 
1f7306d288eb5ecfb2b2f0b2dc68960ecd4a7213b96a2e4ecb9990a755e8c233b0e9d190c0f807019bde669f44a631c8dafe9eb521d739561e6f889f7bdaca5c
 SHA512 
3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd
 DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 
6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2
 SHA512 
114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba
+DIST valgrind-3.22.0.RC1.tar.bz2 16414739 BLAKE2B 
21b59e3c749c9a4fdab91568c942bd8a2c21ecadb053c88aa11563c739f8c87f403cd2a2bf03a3c6556c750a0190f2a1c4ff445355991f16d6f6a58b0be50fa1
 SHA512 
0aa9e98a959808d20cce53575433f81973ef3de3acc313ef2700f58cf9b2b7ee951b5bc701ef8508f5c136cb14239bbe7d81ae4208679ba55150b3edfd6078f0
+DIST valgrind-3.22.0.RC1.tar.bz2.asc 488 BLAKE2B 
938e032fc51e40c816fa6cec4fd95c6f183692d4d30988355bbb217984245fc7a0e6f70314f998511ab081bd2c5feeb217b025dcc84173afe7db7c04a9ebc063
 SHA512 
6b6518c633d40431bcf6836b0f0b67b44d7bf04a7b598dcd9707f479607a8cf9f6ca9320ddbf0d972db084c7e5bb5a02f866f5dc95c06e973d35597bf2f65695

diff --git a/dev-util/valgrind/valgrind-9999.ebuild 
b/dev-util/valgrind/valgrind-3.22.0_rc1.ebuild
similarity index 92%
copy from dev-util/valgrind/valgrind-9999.ebuild
copy to dev-util/valgrind/valgrind-3.22.0_rc1.ebuild
index 35e98ebeba1d..26eb51e592fd 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-3.22.0_rc1.ebuild
@@ -18,9 +18,15 @@ if [[ ${PV} == 9999 ]]; then
 else
        
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/valgrind.gpg
        inherit verify-sig
-       SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2";
-       SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
-       KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
+
+       MY_P="${P/_rc/.RC}"
+       SRC_URI="https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2";
+       SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc )"
+       S="${WORKDIR}"/${MY_P}
+
+       if [[ ${PV} != *_rc* ]] ; then
+               KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
+       fi
 fi
 
 LICENSE="GPL-2"
@@ -105,6 +111,11 @@ src_configure() {
        econf "${myconf[@]}"
 }
 
+src_test() {
+       # fxsave.o, tronical.o have textrels
+       emake LDFLAGS="${LDFLAGS} -Wl,-z,notext" check
+}
+
 src_install() {
        default
 

diff --git a/dev-util/valgrind/valgrind-9999.ebuild 
b/dev-util/valgrind/valgrind-9999.ebuild
index 35e98ebeba1d..26eb51e592fd 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -18,9 +18,15 @@ if [[ ${PV} == 9999 ]]; then
 else
        
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/valgrind.gpg
        inherit verify-sig
-       SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2";
-       SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
-       KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
+
+       MY_P="${P/_rc/.RC}"
+       SRC_URI="https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2";
+       SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc )"
+       S="${WORKDIR}"/${MY_P}
+
+       if [[ ${PV} != *_rc* ]] ; then
+               KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
+       fi
 fi
 
 LICENSE="GPL-2"
@@ -105,6 +111,11 @@ src_configure() {
        econf "${myconf[@]}"
 }
 
+src_test() {
+       # fxsave.o, tronical.o have textrels
+       emake LDFLAGS="${LDFLAGS} -Wl,-z,notext" check
+}
+
 src_install() {
        default