commit: 6998163962d086aa30fce68edaff28b0b5e03cb6
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 21:34:27 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 21:35:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69981639
app-emulation/libguestfs: force use of ocaml for build failures, bug 629490
Package-Manager: Portage-2.3.14, Repoman-2.3.6
app-emulation/libguestfs/Manifest | 4 ++--
app-emulation/libguestfs/libguestfs-1.36.5.ebuild | 16 ++++++----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/app-emulation/libguestfs/Manifest
b/app-emulation/libguestfs/Manifest
index 31c3fafc085..d3685b72382 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,2 +1,2 @@
-DIST libguestfs-1.28.5.tar.gz 12747537 SHA256
e9f38c6ad15cefe18b096a86334a60fc7df6367358f2641d8c5c5f3122ad9d91 SHA512
5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6
WHIRLPOOL
cbbac5cce87dd41ad05b13732d0f5a3442c980152d8864522f5df47ffed7a260a131c819ceb40edd07cd74454fc9f4c0c7eb41fe734509a4e123d28bc58d813f
-DIST libguestfs-1.36.5.tar.gz 23012703 SHA256
c2f7c10c42de04567a9b5cfd8345a995fb951ded9a7fbe72fae061d66dfe8f98 SHA512
01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6
WHIRLPOOL
aec77d2f3070722d6f39b172054ae1f526f731757a7d539ad1b7dc93c328259560172c91b77ca182526b73f1cbebfd037dea441a7c386f8398a0628145580502
+DIST libguestfs-1.28.5.tar.gz 12747537 BLAKE2B
b0cc023efef41955c4b448b68bd5578d88d305364afdc1fc24c7d26ba5fae4a1b81ee58799d42774ea28e162208edbf36a0e49c1a7e4f751c74e9c45e9a472a6
SHA512
5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6
+DIST libguestfs-1.36.5.tar.gz 23012703 BLAKE2B
31dcbef2ae1c287c4a353f671e6073cdb4eb2c7173666ff9589ed0e0ce909c2dfa00f2da14b40a0a6a9384dd830082f1f721b0c1dafabe2862391f0f75ff3f3d
SHA512
01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6
diff --git a/app-emulation/libguestfs/libguestfs-1.36.5.ebuild
b/app-emulation/libguestfs/libguestfs-1.36.5.ebuild
index bbd53624c9d..941ac259350 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.5.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.5.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2"
SLOT="0/"${MY_PV_1}""
KEYWORDS="~amd64"
-IUSE="bash-completion erlang +fuse debug ocaml doc +perl python ruby
static-libs
+IUSE="bash-completion erlang +fuse debug doc +perl python ruby static-libs
selinux systemtap introspection inspect-icons test lua gtk"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -72,11 +72,10 @@ COMMON_DEPEND="
sys-libs/libsemanage
)
systemtap? ( dev-util/systemtap )
- ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt]
- dev-ml/findlib[ocamlopt]
- dev-ml/ocaml-gettext
- >=dev-ml/ounit-2
- )
+ >=dev-lang/ocaml-4.02[ocamlopt]
+ dev-ml/findlib[ocamlopt]
+ dev-ml/ocaml-gettext
+ >=dev-ml/ounit-2
erlang? ( dev-lang/erlang )
inspect-icons? (
media-libs/netpbm
@@ -139,7 +138,7 @@ src_configure() {
--without-java \
$(use_enable perl) \
$(use_enable fuse) \
- $(use_enable ocaml) \
+ --enable-ocaml \
$(use_enable ruby) \
--disable-haskell \
--disable-golang \
@@ -162,9 +161,6 @@ pkg_postinst() {
if ! use perl ; then
einfo "Perl based tools NOT build"
fi
- if ! use ocaml ; then
- einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
- fi
if ! gtk ; then
einfo "virt-p2v NOT installed"
fi
