[gentoo-commits] repo/gentoo:master commit in: app-misc/hivex/

["John Helmert III" <ajak@gentoo.org>]

commit:     600543a6c01a0f6a4124b06b8b4448e12bac7aae
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 19:40:57 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> 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 <ajak <AT> 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