| 1 |
commit: 600543a6c01a0f6a4124b06b8b4448e12bac7aae |
| 2 |
Author: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 1 19:40:57 2021 +0000 |
| 4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 1 19:43:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=600543a6 |
| 7 |
|
| 8 |
app-misc/hivex: fix unconditional ruby usage |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/644768 |
| 11 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
| 12 |
|
| 13 |
app-misc/hivex/hivex-1.3.18.ebuild | 24 +++++++++++++----------- |
| 14 |
1 file changed, 13 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild |
| 17 |
index f1c6db65034..9e486753dc9 100644 |
| 18 |
--- a/app-misc/hivex/hivex-1.3.18.ebuild |
| 19 |
+++ b/app-misc/hivex/hivex-1.3.18.ebuild |
| 20 |
@@ -20,27 +20,28 @@ KEYWORDS="~amd64 ~x86" |
| 21 |
IUSE="ocaml readline +perl python test ruby" |
| 22 |
|
| 23 |
RDEPEND=" |
| 24 |
+ dev-libs/libxml2:2 |
| 25 |
virtual/libiconv |
| 26 |
virtual/libintl |
| 27 |
- dev-libs/libxml2:2 |
| 28 |
ocaml? ( dev-lang/ocaml[ocamlopt] |
| 29 |
dev-ml/findlib[ocamlopt] |
| 30 |
) |
| 31 |
- readline? ( sys-libs/readline:0 ) |
| 32 |
perl? ( |
| 33 |
dev-lang/perl:= |
| 34 |
dev-perl/IO-stringy |
| 35 |
) |
| 36 |
- ruby? ( $(ruby_implementations_depend) ) |
| 37 |
python? ( ${PYTHON_DEPS} ) |
| 38 |
+ readline? ( sys-libs/readline:0 ) |
| 39 |
+ ruby? ( $(ruby_implementations_depend) ) |
| 40 |
" |
| 41 |
|
| 42 |
DEPEND="${RDEPEND} |
| 43 |
perl? ( |
| 44 |
- test? ( dev-perl/Pod-Coverage |
| 45 |
- dev-perl/Test-Pod-Coverage ) |
| 46 |
- ) |
| 47 |
- " |
| 48 |
+ test? ( |
| 49 |
+ dev-perl/Pod-Coverage |
| 50 |
+ dev-perl/Test-Pod-Coverage |
| 51 |
+ ) |
| 52 |
+ )" |
| 53 |
|
| 54 |
ruby_add_bdepend "ruby? ( dev-ruby/rake |
| 55 |
virtual/rubygems |
| 56 |
@@ -62,11 +63,11 @@ pkg_setup() { |
| 57 |
|
| 58 |
src_unpack() { |
| 59 |
default |
| 60 |
- cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all |
| 61 |
+ cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die |
| 62 |
} |
| 63 |
|
| 64 |
src_configure() { |
| 65 |
- ruby-ng_src_configure |
| 66 |
+ use ruby && ruby-ng_src_configure |
| 67 |
|
| 68 |
if use perl; then |
| 69 |
pushd perl |
| 70 |
@@ -90,7 +91,8 @@ src_configure() { |
| 71 |
|
| 72 |
src_compile() { |
| 73 |
default |
| 74 |
- ruby-ng_src_compile |
| 75 |
+ |
| 76 |
+ use ruby && ruby-ng_src_compile |
| 77 |
} |
| 78 |
|
| 79 |
src_install() { |
| 80 |
@@ -101,7 +103,7 @@ src_install() { |
| 81 |
python_optimize |
| 82 |
fi |
| 83 |
|
| 84 |
- ruby-ng_src_install |
| 85 |
+ use ruby && ruby-ng_src_install |
| 86 |
|
| 87 |
if use perl; then |
| 88 |
perl_delete_localpod |
Archives