# ChangeLog for app-emulation/libguestfs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.1 2011/12/11 19:34:22 maksbotan Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.2 2012/01/05 11:23:23 maksbotan Exp $
+
+*libguestfs-1.8.16 (05 Jan 2012)
+
+ 05 Jan 2012; Maxim Koltsov <maksbotan@gentoo.org>
+ +files/1.8/1.8.16/0001-configure_ac_automagic_patch.patch,
+ +files/1.8/1.8.16/0002-disable_php_in_makefile.patch,
+ +files/1.8/1.8.16/0003-hivex_to_hard_error.patch, +libguestfs-1.8.16.ebuild:
+ Bump to 1.8.16, thanks to slepnoga
*libguestfs-1.8.15 (11 Dec 2011)
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 1.8/1.8.15/configure_ac_automagic.patch 3491 RMD160 fc09fe6d9c5b2866e881011e9683d1cd3dd31342 SHA1 8845b22b8050388a485ebbe11ebf61c7a2a13a20 SHA256 6d114f453596e20788c493d8a7799cb946b2dec9bca677fda15a0e20855c2392
AUX 1.8/1.8.15/disable_php_in_makefile.patch 354 RMD160 ee8b88a845af4bcc31492aaecab71931a2a3fe9e SHA1 f6cacc0990b88770c503ac884d57da82cb4115b9 SHA256 e674249ff1345339e8c0e996c0ed7aeb981c5cfcb28fa9919885d2474ce69205
+AUX 1.8/1.8.16/0001-configure_ac_automagic_patch.patch 3405 RMD160 e477d7a6c5bab22a4b8ab308db0e4d8238cd3560 SHA1 779c9c1c52aeeca34f891c8000e3ea4175478ea1 SHA256 88fbb75af95553ad413f3460b5e0ae219fdbfb8a38c61f99dfdc20ca425b82b4
+AUX 1.8/1.8.16/0002-disable_php_in_makefile.patch 577 RMD160 1a69452ff245d384ef6b12963ebd4b827f715a45 SHA1 4027447bff6221e4bf8b2d8a9c1d394a68d18556 SHA256 ad7d4ceb260f546318b413a704f880ded38413a81436a274dcf1c3569d24086f
+AUX 1.8/1.8.16/0003-hivex_to_hard_error.patch 674 RMD160 df3240d4b9cc5238f8529dd5ff587e4d66fd4460 SHA1 70b4fbd620719f4908cdfaa5742d1d391072bfad SHA256 3e863e366cda3340725306c08bf6d5ffb758963df974b99fe11865f80d1d6d04
DIST libguestfs-1.7.18-x86_64.tar.gz 62332840 RMD160 202ac5883d1453d6225b76029290ccebd44c7e84 SHA1 661786c088fad8d2354e8121a2fafb1d598587fc SHA256 07c4f0b4b50df7407327333d9e9b09c310265d056868531c69659659a9f5218d
DIST libguestfs-1.8.15.tar.gz 5161269 RMD160 09b3f3d22032c3bdaedb813a367676d812c35450 SHA1 4ad8a8875105754834a2c887db39e49800b755bb SHA256 b57dd3d31a6ed78a1aee7b4eaf64a9c476c49ac46602aee7daa6b642cb23fad3
+DIST libguestfs-1.8.16.tar.gz 5164608 RMD160 eec0d8875f02e007f5dcbce629ddf00c0ee609af SHA1 24a9aa8c2a8226438a6613a9a12a4d467404d1e6 SHA256 7d8fb8529f201d81761bd383ea567d752f54471a1b5b5903fe553440cbe7755f
EBUILD libguestfs-1.8.15.ebuild 5040 RMD160 e308167c5f18ccf955cd1382de9c0c4b0cf73f72 SHA1 e571734ddd813e675c9ed42a995260eff5009bb7 SHA256 dce608221975078b5549ebca99540669b2cec8f8703c74d225369ad893cf82db
-MISC ChangeLog 517 RMD160 32d9edab0fb13fce247572260bacc900a2abda7b SHA1 fed190725eb4f3bf3f8e5f308b12f8bc49ec2aee SHA256 9d5ef171396bedb355d60e7a2c6c50e6fb749cceb9a0e9e3dbe89c57f6d7b3dc
+EBUILD libguestfs-1.8.16.ebuild 4940 RMD160 67546cfcf5acd7e3fa6eebd6c4956ad214822ad8 SHA1 66509ba527112c2ff81b4eeab4333428e189c14d SHA256 6a94270066ca3ac4fa621a56396246b5bbf2398614c728071af2623d6c52133a
+MISC ChangeLog 837 RMD160 68583aa32f15c6e3878b83cb0b82d4861fbef505 SHA1 af3053766943272a8068b420c28ea071d36baf1b SHA256 d1deed4de068a38eb33913dcd5e21c4add79f38f52eb651e20c551184f75c1f4
MISC metadata.xml 666 RMD160 09b1620a738cf598810208d28bccce585fb26a88 SHA1 803c30c770918624b9222b9d34fd7e10eb3e4fcd SHA256 ecd9d02ee84fa3befc7685c597cecde1b9eeacadcb54bde7790d0789aad85923
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPBYiYAAoJEAmJmMX429reTLAH/ReFnUYsbwr0P7qltPWicMtl
+2D2D2mcuqsNjZLFWW88Hcz1hMpuamhcEbjVTh6DpNnwdaskIa43Qp4xumxG7Tl9o
+3RDEv3GxEluLxjSUnwfK74/dxhOKKn0m10JyAxX4MUUyinkmGfit9uKy+6T/Mq78
+ZiCpd/hKkhS8TD9AXtStDX7GhI6YI1HsUBeqkTWCtlXdFgf8bq3Y2mtzHRi90wbr
+bYzK2k/cLSOglnwzqfrxSrSw+kIbw4LbH9pgA4NwEfPyTDHj+JQPwiIHUqThqERn
+chuQSzLuwmcmfS50P82aSgRXptQJy318Sozjrl0SlHHzVKXIvdZ0KhXkSeZE9Ks=
+=4O8T
+-----END PGP SIGNATURE-----
--- /dev/null
+# HG changeset patch
+# User Andreis Vinogradovs <spamslepnoga@inbox.ru>
+# Date 1325421041 -7200
+# Node ID ba14909c0a95bf9879e6df25d8128d1cf9a75252
+# Parent c9bc634a526984160a40b70f71895de0a855f4c0
+configure_ac_automagic.patch
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -217,6 +217,10 @@
+ if test -f /etc/arch-release; then
+ DISTRO=ARCHLINUX
+ fi
++ dnl Slepnoga for Gentoo
++ if test -f /etc/gentoo-release; then
++ DISTRO=GENTOO
++ fi
+ AC_MSG_RESULT([$DISTRO])
+ AC_SUBST([DISTRO])
+ fi
+@@ -461,7 +465,7 @@
+ AC_DEFINE([HAVE_LIBMAGIC],[1],[libmagic found at compile time.])
+ ], [])
+ ],
+- [AC_MSG_WARN([libmagic not found, some core features will be disabled])])
++ [AC_MSG_FAILURE([libmagic not found, some core features will be disabled])])
+
+ dnl Check for PCRE (highly recommended)
+ PKG_CHECK_MODULES([PCRE], [libpcre],
+@@ -469,7 +473,7 @@
+ AC_SUBST([PCRE_LIBS])
+ AC_DEFINE([HAVE_PCRE],[1],[PCRE found at compile time.])
+ ],
+- [AC_MSG_WARN([PCRE not found, some core features will be disabled])])
++ [AC_MSG_FAILURE([PCRE not found, some core features will be disabled])])
+
+ dnl libvirt (highly recommended)
+ PKG_CHECK_MODULES([LIBVIRT], [libvirt],
+@@ -486,7 +490,7 @@
+ AC_SUBST([LIBXML2_LIBS])
+ AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.])
+ ],
+- [AC_MSG_WARN([libxml2 not found, some core features will be disabled])])
++ [AC_MSG_FAILURE([libxml2 not found, some core features will be disabled])])
+ AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"])
+
+ dnl hivex library (highly recommended)
+@@ -654,13 +658,13 @@
+ AM_CONDITIONAL([HAVE_RUBY],
+ [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
+
+-dnl Check for Java.
+-AC_ARG_WITH(java_home,
+- [AS_HELP_STRING([--with-java-home],
+- [specify path to JDK directory @<:@default=check@:>@])],
+- [],
+- [with_java_home=check])
++AC_ARG_ENABLE([java],
++ AS_HELP_STRING([--enable-java], [Disable Java language bindings]),
++ [enable_java=no],
++ [enable_java=yes])
+
++AS_IF([test "x$enable_java" = "xyes"],
++ [
+ if test "x$with_java_home" != "xno"; then
+ if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck"
+ then
+@@ -756,7 +760,6 @@
+ fi
+ fi
+ AC_MSG_RESULT([$JNI_CFLAGS])
+-
+ dnl Need extra version flag?
+ AC_MSG_CHECKING([extra javac flags])
+ JAVAC_FLAGS=
+@@ -791,8 +794,8 @@
+ AC_SUBST(JAR_INSTALL_DIR)
+ AC_SUBST(JNI_INSTALL_DIR)
+ AC_SUBST(JNI_VERSION_INFO)
+-
+-AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])
++])
++AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" && test "x$enable_java" != "xno"])
+
+ dnl Check for Haskell (GHC).
+ GHC=no
+@@ -849,8 +852,12 @@
+
+ dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
+ dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
+-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
+-AC_SUBST([LIBTOOL])
++dnl ha-ha, criocamera :) - gentoo kill la files in other way's
++dnlLIBTOOL='$(SHELL) $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
++dnl haha, are stub
++dnl AC_PROG_LIBTOOL
++dnl AC_SUBST([LIBTOOL])
++LT_INIT
+
+ dnl Run in subdirs.
+ if test "x$enable_daemon" = "xyes"; then
--- /dev/null
+# HG changeset patch
+# User Andreis Vinogradovs <spamslepnoga@inbox.ru>
+# Date 1325421062 -7200
+# Node ID 8d969d9324fa8f1f5384037627d5478e33be5d47
+# Parent ba14909c0a95bf9879e6df25d8128d1cf9a75252
+disable_php_in_makefile
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -57,9 +57,12 @@
+ if HAVE_HASKELL
+ SUBDIRS += haskell
+ endif
+-if HAVE_PHP
+-SUBDIRS += php
+-endif
++
++# use Gentoo way to compile/install php extension
++# due slot system
++#if HAVE_PHP
++#SUBDIRS += php
++#endif
+
+ # Unconditional because nothing is built yet.
+ SUBDIRS += csharp
--- /dev/null
+# HG changeset patch
+# User Andreis Vinogradovs <spamslepnoga@inbox.ru>
+# Date 1325421826 -7200
+# Node ID 4bcdef3cca5c867d82c72d4b394b866a3b9f2d95
+# Parent 8d969d9324fa8f1f5384037627d5478e33be5d47
+hivex to hard error
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -501,7 +501,7 @@
+ AC_SUBST([HIVEX_LIBS])
+ AC_DEFINE([HAVE_HIVEX],[1],[hivex library found at compile time.])
+ ],
+- [AC_MSG_WARN([hivex not found, some core features will be disabled])])
++ [AC_MSG_ERROR([hivex not found, some core features will be disabled])])
+
+ dnl FUSE is optional to build the FUSE module.
+ AC_ARG_ENABLE([fuse],
--- /dev/null
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.8.16.ebuild,v 1.1 2012/01/05 11:23:23 maksbotan Exp $
+
+EAPI="3"
+
+WANT_AUTOMAKE="1.11"
+
+JAVA_PKG_OPT_USE="java"
+JAVA_PKG_ALLOW_VM_CHANGE="yes"
+APLANCE_PV="1.7.18"
+PYTHON_DEPEND="python? 2:2.6"
+USE_RUBY="ruby18"
+RUBY_OPTIONAL="yes"
+PHP_EXT_NAME="guestfs_php"
+USE_PHP="php5-3 php5-4"
+PHP_EXT_OPTIONAL_USE="php"
+
+inherit autotools bash-completion-r1 confutils versionator java-pkg-opt-2 perl-module python ruby-ng php-ext-source-r2 ghc-package
+
+MY_PV_1="$(get_version_component_range 1-2)"
+MY_PV_2="$(get_version_component_range 2)"
+
+[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Library for accessing and modifying virtual machine (VM) disk images"
+HOMEPAGE="http://libguestfs.org/"
+SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz
+ http://rion-overlay.googlecode.com/files/${PN}-${APLANCE_PV}-x86_64.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Upstream NOT supported 32-bit version, keyword in own risk
+KEYWORDS="~amd64"
+IUSE="fuse +ocaml perl python ruby haskell +readline nls php debug doc nls source javadoc"
+
+COMMON_DEPEND="
+ virtual/perl-Getopt-Long
+ >=dev-perl/Sys-Virt-0.2.4
+ >=app-misc/hivex-1.2.1[perl]
+ dev-perl/libintl-perl
+ dev-perl/String-ShellQuote
+ dev-libs/libpcre
+ app-arch/cpio
+ dev-lang/perl
+ app-cdr/cdrkit
+ >=app-emulation/qemu-kvm-0.13[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64]
+ sys-apps/fakeroot
+ sys-apps/file
+ app-emulation/libvirt
+ dev-libs/libxml2:2
+ >=sys-apps/fakechroot-2.8
+ >=app-admin/augeas-0.7.1
+ sys-fs/squashfs-tools
+ perl? ( virtual/perl-ExtUtils-MakeMaker )
+ fuse? ( sys-fs/fuse )
+ readline? ( sys-libs/readline )
+ doc? ( dev-libs/libxml2 )
+ ocaml? ( dev-lang/ocaml
+ dev-ml/findlib
+ dev-ml/xml-light )
+ ruby? ( dev-lang/ruby
+ dev-ruby/rake )
+ java? ( virtual/jre )
+ haskell? ( dev-lang/ghc )"
+
+DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.6
+ source? ( app-arch/zip ) )
+ doc? ( app-text/po4a )"
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.6 )"
+
+PHP_EXT_S="${S}/php/extension"
+
+pkg_setup() {
+ use java && java-pkg-opt-2_pkg_setup
+
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ python_need_rebuild
+ fi
+
+ confutils_use_depend_all source java
+ confutils_use_depend_all javadoc java
+
+ use ruby && ruby-ng_pkg_setup
+ use haskell && ghc-package_pkg_setup
+}
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ cd "${WORKDIR}"
+ mkdir image || die
+ cd image || die
+ unpack libguestfs-${APLANCE_PV}-x86_64.tar.gz
+ cp "${WORKDIR}"/image/usr/local/lib/guestfs/* "${S}"/appliance/ || die
+
+ # part of php-ext-source-r2_src_unpack
+ # whole version cannot be called here as it will attempt to unpack ${A}
+ if use php; then
+ local slot orig_s="${PHP_EXT_S}"
+ for slot in $(php_get_slots); do
+ cp -r "${orig_s}" "${WORKDIR}/${slot}" || die
+ done
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/1.8/${PV}"/000*.patch
+
+ use java && java-pkg-opt-2_src_prepare
+ eautoreconf
+
+ if use php; then
+ php-ext-source-r2_src_prepare
+ fi
+}
+
+src_configure() {
+
+ # Disable feature test for kvm for more reason
+ # i.e: not loaded module in __build__ time,
+ # build server not supported kvm, etc. ...
+ #
+ # In fact, this feature is virtio support and requires
+ # configured kernel.
+ export vmchannel_test=no
+
+ econf \
+ --with-repo=fedora-12 \
+ --disable-appliance \
+ --disable-daemon \
+ --with-drive-if=virtio \
+ --with-net-if=virtio-net-pci \
+ --disable-rpath \
+ $(use_enable java) \
+ $(use_enable nls) \
+ $(use_with readline) \
+ $(use_enable ocaml ocaml-viewer) \
+ $(use_enable perl) \
+ $(use_enable fuse) \
+ $(use_enable ocaml) \
+ $(use_enable python) \
+ $(use_enable ruby) \
+ $(use_enable haskell) \
+ $(use_with doc po4a)
+
+ if use php; then
+ php-ext-source-r2_src_configure
+ fi
+}
+
+src_compile() {
+ emake || die
+
+ if use php; then
+ php-ext-source-r2_src_compile
+ fi
+}
+
+src_test() {
+ emake -j1 check || die
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install || die
+
+ dodoc BUGS HACKING README RELEASE-NOTES TODO
+
+ dobashcomp "${D}/etc"/bash_completion.d/guestfish-bash-completion.sh
+
+ rm -fr "${D}/etc"/bash* || die
+
+ insinto /usr/$(get_libdir)/guestfs/
+ doins "${WORKDIR}/image/usr/local/lib/"guestfs/*
+
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ if use java; then
+ java-pkg_newjar java/${P}.jar ${PN},jar
+ rm -fr "${D}/usr"/share/java
+ rm -fr "${D}/usr"/share/javadoc
+ if use source;then
+ java-pkg_dosrc java/com/redhat/et/libguestfs/*
+ fi
+ if use javadoc;then
+ java-pkg_dojavadoc java/api
+ fi
+ fi
+
+ use perl && fixlocalpod
+ python_clean_installation_image -q
+
+ if use php; then
+ php-ext-source-r2_src_install
+ fi
+}
+
+pkg_preinst() {
+ use java && java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+ use haskell && ghc-package_pkg_postinst
+}
+
+pkg_prerm() {
+ use haskell && ghc-package_pkg_prerm
+}
projects / gentoo.git / commitdiff