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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2E6FB1382C5 for ; Tue, 1 Jun 2021 19:43:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74529E07A5; Tue, 1 Jun 2021 19:43:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F3C9E07A5 for ; Tue, 1 Jun 2021 19:43:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45444340BC9 for ; Tue, 1 Jun 2021 19:43:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6F564A0 for ; Tue, 1 Jun 2021 19:43:42 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1622576607.600543a6c01a0f6a4124b06b8b4448e12bac7aae.ajak@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.18.ebuild X-VCS-Directories: app-misc/hivex/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: 600543a6c01a0f6a4124b06b8b4448e12bac7aae X-VCS-Branch: master Date: Tue, 1 Jun 2021 19:43:42 +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: 03ab7822-75b4-4393-972b-2eb289ba0d3d X-Archives-Hash: fe4f2a965e5271a3ceb19a077a280e8e commit: 600543a6c01a0f6a4124b06b8b4448e12bac7aae Author: John Helmert III gentoo org> AuthorDate: Tue Jun 1 19:40:57 2021 +0000 Commit: John Helmert III gentoo org> CommitDate: Tue Jun 1 19:43:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=600543a6 app-misc/hivex: fix unconditional ruby usage Closes: https://bugs.gentoo.org/644768 Signed-off-by: John Helmert III gentoo.org> app-misc/hivex/hivex-1.3.18.ebuild | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild index f1c6db65034..9e486753dc9 100644 --- a/app-misc/hivex/hivex-1.3.18.ebuild +++ b/app-misc/hivex/hivex-1.3.18.ebuild @@ -20,27 +20,28 @@ KEYWORDS="~amd64 ~x86" IUSE="ocaml readline +perl python test ruby" RDEPEND=" + dev-libs/libxml2:2 virtual/libiconv virtual/libintl - dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) - readline? ( sys-libs/readline:0 ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) - ruby? ( $(ruby_implementations_depend) ) python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0 ) + ruby? ( $(ruby_implementations_depend) ) " DEPEND="${RDEPEND} perl? ( - test? ( dev-perl/Pod-Coverage - dev-perl/Test-Pod-Coverage ) - ) - " + test? ( + dev-perl/Pod-Coverage + dev-perl/Test-Pod-Coverage + ) + )" ruby_add_bdepend "ruby? ( dev-ruby/rake virtual/rubygems @@ -62,11 +63,11 @@ pkg_setup() { src_unpack() { default - cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all + cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die } src_configure() { - ruby-ng_src_configure + use ruby && ruby-ng_src_configure if use perl; then pushd perl @@ -90,7 +91,8 @@ src_configure() { src_compile() { default - ruby-ng_src_compile + + use ruby && ruby-ng_src_compile } src_install() { @@ -101,7 +103,7 @@ src_install() { python_optimize fi - ruby-ng_src_install + use ruby && ruby-ng_src_install if use perl; then perl_delete_localpod