From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7B1E1586B3 for ; Sun, 26 Mar 2023 03:03:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2855FE0841; Sun, 26 Mar 2023 03:03:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1355AE0841 for ; Sun, 26 Mar 2023 03:03:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A2AC3411DF for ; Sun, 26 Mar 2023 03:03:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA66E959 for ; Sun, 26 Mar 2023 03:03:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1679799770.447c8c96f8d6c45ad85bbae3ad190c08602cff01.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/hivex/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/hivex/hivex-1.3.23-r1.ebuild app-misc/hivex/hivex-1.3.23.ebuild X-VCS-Directories: app-misc/hivex/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 447c8c96f8d6c45ad85bbae3ad190c08602cff01 X-VCS-Branch: master Date: Sun, 26 Mar 2023 03:03:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84fd87de-0426-4a20-8e00-619590c5f61d X-Archives-Hash: e7b22bb454e75c08b76f3065238bac08 commit: 447c8c96f8d6c45ad85bbae3ad190c08602cff01 Author: Sam James gentoo org> AuthorDate: Sat Mar 25 12:39:36 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 26 03:02:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447c8c96 app-misc/hivex: fix building ruby extensions + enable ruby31, enable ruby32 This was totally broken before and only built one Ruby at best. Signed-off-by: Sam James gentoo.org> ...{hivex-1.3.23.ebuild => hivex-1.3.23-r1.ebuild} | 35 ++++++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/app-misc/hivex/hivex-1.3.23.ebuild b/app-misc/hivex/hivex-1.3.23-r1.ebuild similarity index 80% rename from app-misc/hivex/hivex-1.3.23.ebuild rename to app-misc/hivex/hivex-1.3.23-r1.ebuild index eb478bcce09c..de92e2a9cade 100644 --- a/app-misc/hivex/hivex-1.3.23.ebuild +++ b/app-misc/hivex/hivex-1.3.23-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -USE_RUBY="ruby27 ruby30" +USE_RUBY="ruby27 ruby30 ruby31 ruby32" RUBY_OPTIONAL=yes PYTHON_COMPAT=( python3_{9..11} ) inherit perl-module ruby-ng python-single-r1 strip-linguas @@ -31,7 +31,7 @@ RDEPEND=" dev-perl/IO-stringy ) python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0 ) + readline? ( sys-libs/readline:= ) ruby? ( $(ruby_implementations_depend) ) " DEPEND=" @@ -100,21 +100,46 @@ src_configure() { econf "${myeconfargs[@]}" } +each_ruby_configure() { + local myeconfargs=( + --without-readline + --disable-ocaml + --disable-perl + --enable-nls + --enable-ruby + --disable-python + --disable-rpath + ) + + export ac_cv_prog_RUBY="${RUBY}" + + econf "${myeconfargs[@]}" +} + src_compile() { default use ruby && ruby-ng_src_compile } +each_ruby_compile() { + # -C ruby deliberately omitted as we need the library itself built too + emake +} + src_test() { emake check local dir - for dir in ocaml perl python ruby ; do + for dir in ocaml perl python ; do use ${dir} && emake -C ${dir} check done } +each_ruby_test() { + emake -C ruby check +} + src_install() { strip-linguas -i po @@ -138,3 +163,7 @@ src_install() { find "${ED}" -name '*.la' -delete || die } + +each_ruby_install() { + emake -C ruby install DESTDIR="${ED}" +}