commit:     8e142b0afc861d7555a9ac23a88b12223a6cc6bf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 23:49:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 16 01:52:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e142b0a

dev-lang/ruby: add Valgrind annotation support

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

 dev-lang/ruby/ruby-3.0.6-r2.ebuild | 11 ++++++++---
 dev-lang/ruby/ruby-3.1.4-r2.ebuild | 11 ++++++++---
 dev-lang/ruby/ruby-3.2.2-r2.ebuild | 11 ++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/dev-lang/ruby/ruby-3.0.6-r2.ebuild 
b/dev-lang/ruby/ruby-3.0.6-r2.ebuild
index 15a1c837c91e..5620a57f0672 100644
--- a/dev-lang/ruby/ruby-3.0.6-r2.ebuild
+++ b/dev-lang/ruby/ruby-3.0.6-r2.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz";
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 
+ssl static-libs systemtap tk xemacs"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 
+ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
        berkdb? ( sys-libs/db:= )
@@ -42,7 +42,10 @@ RDEPEND="
        >=app-eselect/eselect-ruby-20201225
 "
 
-DEPEND="${RDEPEND}"
+DEPEND="
+       ${RDEPEND}
+       valgrind? ( dev-util/valgrind )
+"
 
 BUNDLED_GEMS="
        >=dev-ruby/minitest-5.14.2[ruby_targets_ruby30(-)]
@@ -62,7 +65,8 @@ PDEPEND="
        >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30(-)]
        >=dev-ruby/json-2.5.1[ruby_targets_ruby30(-)]
        rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30(-)] )
-       xemacs? ( app-xemacs/ruby-modes )"
+       xemacs? ( app-xemacs/ruby-modes )
+"
 
 src_prepare() {
        eapply "${FILESDIR}"/"${SLOT}"/010*.patch
@@ -185,6 +189,7 @@ src_configure() {
                $(use_enable static-libs install-static-library) \
                $(use_with static-libs static-linked-ext) \
                $(use_enable debug) \
+               $(use_with valgrind) \
                ${myconf} \
                --enable-option-checking=no
 

diff --git a/dev-lang/ruby/ruby-3.1.4-r2.ebuild 
b/dev-lang/ruby/ruby-3.1.4-r2.ebuild
index 8f22e76e844b..329d524d02c4 100644
--- a/dev-lang/ruby/ruby-3.1.4-r2.ebuild
+++ b/dev-lang/ruby/ruby-3.1.4-r2.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz";
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl 
static-libs systemtap tk xemacs"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl 
static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
        berkdb? ( sys-libs/db:= )
@@ -42,7 +42,10 @@ RDEPEND="
        >=app-eselect/eselect-ruby-20201225
 "
 
-DEPEND="${RDEPEND}"
+DEPEND="
+       ${RDEPEND}
+       valgrind? ( dev-util/valgrind )
+"
 
 BUNDLED_GEMS="
        >=dev-ruby/minitest-5.15.0[ruby_targets_ruby31(-)]
@@ -62,7 +65,8 @@ PDEPEND="
        >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31(-)]
        >=dev-ruby/json-2.6.1[ruby_targets_ruby31(-)]
        rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31(-)] )
-       xemacs? ( app-xemacs/ruby-modes )"
+       xemacs? ( app-xemacs/ruby-modes )
+"
 
 src_prepare() {
        eapply "${FILESDIR}"/"${SLOT}"/011*.patch
@@ -190,6 +194,7 @@ src_configure() {
                $(use_enable static-libs install-static-library) \
                $(use_with static-libs static-linked-ext) \
                $(use_enable debug) \
+               $(use_with valgrind) \
                ${myconf} \
                --enable-option-checking=no
 

diff --git a/dev-lang/ruby/ruby-3.2.2-r2.ebuild 
b/dev-lang/ruby/ruby-3.2.2-r2.ebuild
index e5c7808698dc..e4e119c922f1 100644
--- a/dev-lang/ruby/ruby-3.2.2-r2.ebuild
+++ b/dev-lang/ruby/ruby-3.2.2-r2.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz";
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl 
static-libs systemtap tk xemacs"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl 
static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
        berkdb? ( sys-libs/db:= )
@@ -42,7 +42,10 @@ RDEPEND="
        >=app-eselect/eselect-ruby-20221225
 "
 
-DEPEND="${RDEPEND}"
+DEPEND="
+       ${RDEPEND}
+       valgrind? ( dev-util/valgrind )
+"
 
 BUNDLED_GEMS="
        >=dev-ruby/debug-1.7.1[ruby_targets_ruby32(-)]
@@ -69,7 +72,8 @@ PDEPEND="
        >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby32(-)]
        >=dev-ruby/json-2.6.1[ruby_targets_ruby32(-)]
        rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby32(-)] )
-       xemacs? ( app-xemacs/ruby-modes )"
+       xemacs? ( app-xemacs/ruby-modes )
+"
 
 src_prepare() {
        eapply "${FILESDIR}"/"${SLOT}"/010*.patch
@@ -207,6 +211,7 @@ src_configure() {
                $(use_with static-libs static-linked-ext) \
                $(use_enable debug) \
                ${myconf} \
+               $(use_with valgrind) \
                --enable-option-checking=no
 
        # Makefile is broken because it lacks -ldl

Reply via email to