Add missing files, bugs #408797 and #408619

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 204 insertions, 9 deletions

diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog
index c6e8293b54ec..729e3e75e17b 100644
--- a/app-emulation/libguestfs/ChangeLog
+++ b/app-emulation/libguestfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libguestfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.8 2012/03/18 18:25:42 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.9 2012/03/20 14:09:42 maksbotan Exp $
+
+  20 Mar 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.17/0001-configure_ac_automagic.patch, +files/env.file:
+  Add missing files, bugs #408797 and #408619
 
 *libguestfs-1.16.10 (18 Mar 2012)
 
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 664b8a7b3c6e..261ac7ee3fcc 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,11 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.17/0001-configure_ac_automagic.patch 6629 RMD160 9b2dc4b8b3ac490b59542f7c1ba3124822fbb456 SHA1 10741e335e4e927d5fa840a40b2dab8a0fd9eed5 SHA256 f1764dd7b0c3d7c86ca1bd10d1ddf9ce2da002e2d347faebe1ce24ef7dcafd49
 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
+AUX env.file 47 RMD160 44df6d989ae52531e1a67ae2d57cae9556c6f2a9 SHA1 e5f3545af2ff75b8a0e1389800c96c64f7eaf229 SHA256 265f18ec70d803a243b16303638ef6347212a93318da71bd9e15b6dc7dc2d11a
 DIST appliance-1.17.14.tar.xz 46644196 RMD160 3d8ad13c5c4daf202cc563145c480b7a953408e1 SHA1 1d9ee21217f7e1a9f2342fff569c19dd331d6f04 SHA256 7cf81ef8a31d5d9ce6c8b1b601a8bf83cbd5521a397879fb7d1c55814b8b9be3
 DIST libguestfs-1.16.10.tar.gz 6574148 RMD160 1e2dd9a9d8b36f130c01d0c590fe5bf22ba79fec SHA1 c2acbe122180dfc5ab6aab0c2f0a12658d69c526 SHA256 82b314f4f473ac008bafe509165048d775bea35064ce383203c398866d923ba4
 DIST libguestfs-1.17.14.tar.gz 6791404 RMD160 d71af0a6d023af26ae04811c0924a659b990ef46 SHA1 1af36e30d27835d47de18afcb3aef6af3fe76425 SHA256 cd007e9174428ba2fce275ef53230c1ee8264d920610b70ffd55d45bd29be7c1
@@ -16,16 +18,16 @@ EBUILD libguestfs-1.16.10.ebuild 3716 RMD160 090993a78e5749d486c89e6a59b729ea2e4
 EBUILD libguestfs-1.17.14.ebuild 3716 RMD160 d841682e6b10854038ff8d1121762307a835554c SHA1 19b991c79d93534be44391adc3962529677cc6e7 SHA256 efff830da35aba6f93ca85d92a10c81d0eaf2151aeb65a9163c351a0b55c0129
 EBUILD libguestfs-1.17.18.ebuild 3716 RMD160 4bd920e5eee56b05064861d931e241c4d91d1b13 SHA1 79ee70b4ca38f6b68b059628462714498daee097 SHA256 2ae74db38f622d35fc486d41546d52e8300afbc5af9ef08b48ffeec02fd4b2ce
 EBUILD libguestfs-1.8.16.ebuild 4947 RMD160 deb8e8ab91be6e4bd2c99d6d0f1a58e4f8db9a10 SHA1 75f4879df8fa414e3b279286d45cfb1c34bb4873 SHA256 9bf9616ea393281b5499e70a7f1844cf3be7038c00795e5ac8509a493e1e272b
-MISC ChangeLog 1604 RMD160 2b284eda399c7045d1d4988a55691d1d651de73f SHA1 8de3492eed4041223efc4e7d2809e1ea572d24d3 SHA256 6cba6e1dae4bd5aeebda1c56a57c48bc03c5f5306cd81ff66d47b93f471a194b
+MISC ChangeLog 1769 RMD160 34b357388c08951296b385f8d818c4391af619cf SHA1 6a8023d2ce9673cae5f1a7cfeeb80e97ede34cbf SHA256 4b19341a6f4aac3d46fbf42ccaf7df590ddd52cfc2058ff4447bf4fdf1ab44a2
 MISC metadata.xml 908 RMD160 2a35e4039f393c13448351dc556a3e56b7110603 SHA1 43062d6eb73114af4a4fc474bac7b5d012f4ee02 SHA256 e6e7003aea62c855318b988c8843e798ad602a3b0063654666863a016b5a49a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPZii8AAoJEAmJmMX429rejMAIAKt2TC7GqjDVcripeES+70Vb
-up9kr9anbA29PPZ1cK2F0gmuPhLCGWIAqR4wcTKWa39UKXw78ktlcj/H9hPhVEZT
-xUNnF0n5A35iesij5kDsgnJ0IhlePOrjJcKjhndaYSVfHhCxmZNYaGXTHI7TFx/x
-udHtn6seDP08nMbghzEZJJ88faLV+q74nX1Ru3nBUpns49j4hHcPMJrNuyaHd9pT
-Gv4EONiC6rqMvQzvYmPhBQHhq8jHtRfybLyoHa1LQsgifgm+kiPVK4z2wzHb3wi9
-uX37Il0rh5nEmDKsP+6XVxWkkfTz71BtSHWg+95lfZSJOSwYJndYjoj4utADPNI=
-=R7nb
+iQEcBAEBAgAGBQJPaI/BAAoJEAmJmMX429reolgIAIdSZqs+HC+9FXfwKwySVEhe
+W6P4qYvF+EtAZpwJc7kIqoYOS1wGa5lCGFUyIrV+D6tBJoIgordZZq+jo6BJFNCR
+lk8XDeDoK0bjmML1RzCF5KUpqYFdbN87r7BFIelGfFNM42EhRtqg8P0Z1tcWN7Md
+GfdDWZ20vWvVdBFxLEyBg/UH9s2kz1+qh4pGhTS/EIrkhpJL2BwqnikJG9TkbKme
+LHfvX7qaXSeUPwVudyfudM8y1/ksTGscw/JGjsjVcnQhWYjINF8FBFilnT+l09qN
+n06FOmjmVJ+M2Xbn9kR6qcPcMjJ4/kD4QTSpAmaHKQdwIEiXgzvf8Rw6Z0ECOUY=
+=sUXU
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libguestfs/files/1.17/0001-configure_ac_automagic.patch b/app-emulation/libguestfs/files/1.17/0001-configure_ac_automagic.patch
new file mode 100644
index 000000000000..a010a8e02bbd
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.17/0001-configure_ac_automagic.patch
@@ -0,0 +1,188 @@
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -76,9 +76,6 @@
+ if HAVE_HASKELL
+ SUBDIRS += haskell
+ endif
+-if HAVE_PHP
+-SUBDIRS += php
+-endif
+ if HAVE_ERLANG
+ SUBDIRS += erlang erlang/examples
+ endif
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -353,11 +353,16 @@
+ if test -f /etc/arch-release; then
+     DISTRO=ARCHLINUX
+ fi
++if test -f /etc/gentoo-release; then
++    DISTRO=GENTOO
++fi
++
+ AC_MSG_RESULT([$DISTRO])
+ AC_SUBST([DISTRO])
+ 
+ dnl Check for rpcgen and XDR library.  rpcgen is optional.
+ AC_CHECK_PROG([RPCGEN],[rpcgen],[rpcgen],[no])
++AS_IF([test "xRPCGEN" = "xno"], [AC_MSG_ERROR([rpcgen not installed])],[])
+ AM_CONDITIONAL([HAVE_RPCGEN],[test "x$RPCGEN" != "xno"])
+ AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
+         AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
+@@ -375,9 +380,10 @@
+          AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode])
+          LIBS="$old_LIBS"
+         ],
+-        [AC_MSG_WARN([augeas not found, some core features will be disabled])])
++        [AC_MSG_ERROR([augeas not found, some core features will be disabled])])
+ 
+ dnl Check for libselinux (optional).
++dnl TODO selinux triplet
+ AC_CHECK_HEADERS([selinux/selinux.h])
+ AC_CHECK_LIB([selinux],[setexeccon],[
+         have_libselinux="$ac_cv_header_selinux_selinux_h"
+@@ -397,7 +403,7 @@
+ dnl Check for systemtap/DTrace userspace probes (optional).
+ dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps
+ AC_CHECK_HEADERS([sys/sdt.h])
+-dnl AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
++AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
+ 
+ dnl Check for cpio which isn't in the default Pardus install amazingly.
+ AC_CHECK_PROG([CPIO],[cpio],[cpio],[no])
+@@ -448,11 +454,17 @@
+ 
+ dnl Check for optional xmllint.
+ AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
++AS_IF([test "xXMLLINT" = "xno"], [AC_MSG_ERROR([xmllint not installed])],[])
+ AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"])
+ 
+ dnl po4a for translating man pages and POD files (optional).
+ AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
+-AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
++AC_ARG_ENABLE([doc],
++       AS_HELP_STRING([--enable-doc], [Enable generation translating man pages and doc]),
++       [enable_doc=no],
++       [enable_doc=yes])
++AS_IF([test "xPO4A" = "xno"], [AC_MSG_WARN([po4a not installed])],[])	
++AM_CONDITIONAL([HAVE_PO4A],[test "x$PO4A" != "xno" && test "x$enable_doc" != "xno"])
+ 
+ dnl Check for db_dump, db_load (optional).
+ AC_CHECK_PROGS([DB_DUMP],
+@@ -598,6 +610,8 @@
+         [])
+ 
+ dnl Readline.
++dnl TODO - add ncurses LDFLGS separately
++dnl build --without-redline in fact broken with -lncurses not inherited
+ AC_ARG_WITH([readline],
+     [AS_HELP_STRING([--with-readline],
+         [support fancy command line editing @<:@default=check@:>@])],
+@@ -624,6 +638,7 @@
+ 
+ dnl For i18n.
+ AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.18])
+ 
+ dnl Check for PCRE (required)
+ PKG_CHECK_MODULES([PCRE], [libpcre])
+@@ -635,7 +650,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_ERROR([libmagic not found, some core features will be disabled])])
+ 
+ dnl libvirt (highly recommended)
+ PKG_CHECK_MODULES([LIBVIRT], [libvirt],
+@@ -643,7 +658,7 @@
+          AC_SUBST([LIBVIRT_LIBS])
+          AC_DEFINE([HAVE_LIBVIRT],[1],[libvirt found at compile time.])
+         ],
+-        [AC_MSG_WARN([libvirt not found, some core features will be disabled])])
++        [AC_MSG_ERROR([libvirt not found, some core features will be disabled])])
+ AM_CONDITIONAL([HAVE_LIBVIRT],[test "x$LIBVIRT_LIBS" != "x"])
+ 
+ dnl libxml2 (highly recommended)
+@@ -652,7 +667,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_ERROR([libxml2 not found, some core features will be disabled])])
+ AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"])
+ 
+ dnl libconfig (highly recommended)
+@@ -661,7 +676,7 @@
+          AC_SUBST([LIBCONFIG_LIBS])
+          AC_DEFINE([HAVE_LIBCONFIG],[1],[libconfig found at compile time.])
+         ],
+-        [AC_MSG_WARN([libconfig not found, some features will be disabled])])
++        [AC_MSG_ERROR([libconfig not found, some features will be disabled])])
+ AM_CONDITIONAL([HAVE_LIBCONFIG],[test "x$LIBCONFIG_LIBS" != "x"])
+ 
+ dnl hivex library (highly recommended)
+@@ -672,7 +687,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])])
+ AM_CONDITIONAL([HAVE_HIVEX],[test "x$HIVEX_LIBS" != "x"])
+ 
+ dnl FUSE is optional to build the FUSE module.
+@@ -827,11 +842,13 @@
+     [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"
+@@ -967,8 +984,8 @@
+ 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
+ AC_ARG_ENABLE([haskell],
+@@ -1081,8 +1098,9 @@
+ 
+ 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'
++dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
+ AC_SUBST([LIBTOOL])
++LT_INIT
+ 
+ dnl Produce output files.
+ AC_CONFIG_HEADERS([config.h])
+diff --git a/inspector/Makefile.am b/inspector/Makefile.am
+--- a/inspector/Makefile.am
++++ b/inspector/Makefile.am
+@@ -37,7 +37,7 @@
+ 
+ CLEANFILES = stamp-virt-inspector.pod
+ 
+-docdir = @docdir@
++docdir = @docdir@/examples
+ dist_doc_DATA = \
+ 	virt-inspector.rng \
+ 	$(EXAMPLE_XML)
diff --git a/app-emulation/libguestfs/files/env.file b/app-emulation/libguestfs/files/env.file
new file mode 100644
index 000000000000..577009eebf8f
--- /dev/null
+++ b/app-emulation/libguestfs/files/env.file
@@ -0,0 +1 @@
+LIBGUESTFS_PATH=/usr/share/guestfs/appliance/