Bump to 1.18.9, fixes bug 427842. Thanks to slepnoga

(Portage version: 2.1.11.26/cvs/Linux x86_64)

5 files changed, 139 insertions, 0 deletions

diff --git a/app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch
new file mode 100644
index 000000000000..a30c7a059ec2
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -384,6 +384,11 @@
+         DISTRO=UBUNTU
+     fi
+ fi
++
++if test -f /etc/gentoo-release; then
++    DISTRO=GENTOO
++fi
++
+ if test -f /etc/arch-release; then
+     DISTRO=ARCHLINUX
+ fi
diff --git a/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch b/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch
new file mode 100644
index 000000000000..bc0989fc162c
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -422,7 +422,7 @@
+          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).
+ AC_CHECK_HEADERS([selinux/selinux.h])
+@@ -496,11 +496,20 @@
+ 
+ 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],
diff --git a/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch
new file mode 100644
index 000000000000..9ae028acf820
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1351,8 +1351,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'
+-AC_SUBST([LIBTOOL])
++#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/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch b/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch
new file mode 100644
index 000000000000..58d5a8bccb3b
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch
@@ -0,0 +1,62 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -524,29 +524,36 @@
+ fi
+ 
+ dnl Check for netpbm programs (optional).
+-AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no])
+-AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no])
+-AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no])
+-AC_CHECK_PROGS([PAMCUT],[pamcut],[no])
+-if test "x$PBMTEXT" != "xno"; then
+-    AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.])
+-fi
+-if test "x$PNMTOPNG" != "xno"; then
+-    AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.])
+-fi
+-if test "x$BMPTOPNM" != "xno"; then
+-    AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.])
+-fi
+-if test "x$PAMCUT" != "xno"; then
+-    AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.])
+-fi
++AC_ARG_ENABLE([icoutils],
++	AS_HELP_STRING([with-icoutils], [ Enable ico and bmp icon file inspection]),
++	[enable_icoutils=no],
++	[enable_icoutils=yes])
++AS_IF([test "enable_icoutils" != "xno"],
++  [
++	AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no])
++	AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no])
++	AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no])
++	AC_CHECK_PROGS([PAMCUT],[pamcut],[no])
++	if test "x$PBMTEXT" != "xno"; then
++	    AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.])
++	fi
++	if test "x$PNMTOPNG" != "xno"; then
++	    AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.])
++	fi
++	if test "x$BMPTOPNM" != "xno"; then
++	    AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.])
++	fi
++	if test "x$PAMCUT" != "xno"; then
++	    AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.])
++	fi
+ 
+-dnl Check for icoutils (optional).
+-AC_CHECK_PROGS([WRESTOOL],[wrestool],[no])
+-if test "x$WRESTOOL" != "xno"; then
+-    AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.])
+-fi
+-
++	dnl Check for icoutils (optional).
++	AC_CHECK_PROGS([WRESTOOL],[wrestool],[no])
++	if test "x$WRESTOOL" != "xno"; then
++	    AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.])
++	fi
++],
++[])
+ dnl Check for QEMU for running binaries on this $host_cpu, fall
+ dnl back to basic 'qemu'.  Allow the user to override it.
+ qemu_system="`echo qemu-system-$host_cpu | $SED 's/i@<:@456@:>@86/i386/g'`"
diff --git a/app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch
new file mode 100644
index 000000000000..c86acbc2c333
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -79,9 +79,6 @@
+ if HAVE_HASKELL
+ SUBDIRS += haskell
+ endif
+-if HAVE_PHP
+-SUBDIRS += php
+-endif
+ if HAVE_ERLANG
+ SUBDIRS += erlang erlang/examples
+ endif