Add missing patches for 1.24, bug #489334.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

6 files changed, 131 insertions, 1 deletions

diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog
index 65713d7bee52..13226067a6e8 100644
--- a/app-emulation/libguestfs/ChangeLog
+++ b/app-emulation/libguestfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/libguestfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.30 2013/10/21 07:04:59 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.31 2013/10/27 12:06:04 maksbotan Exp $
+
+  27 Oct 2013; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.24/0001_add_gentoo_names_to_configure.patch,
+  +files/1.24/0002_add_gentooway_to_remove_la_files.patch,
+  +files/1.24/0004_add_icoutils_configure_drop_automagic.patch,
+  +files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch,
+  +files/1.24/0103_disable_php_bindings_makefile.patch:
+  Add missing patches for 1.24, bug #489334.
 
 *libguestfs-1.22.7 (21 Oct 2013)
 *libguestfs-1.24.0 (21 Oct 2013)
diff --git a/app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch
new file mode 100644
index 000000000000..9d209ff53584
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.24/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
+@@ -482,6 +482,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.24/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch
new file mode 100644
index 000000000000..38a591b811ed
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1487,8 +1487,10 @@
+ 
+ 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 LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
++dnl AC_SUBST([LIBTOOL])
++LT_INIT
++
+ 
+ dnl Produce output files.
+ AC_CONFIG_HEADERS([config.h])
diff --git a/app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch b/app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch
new file mode 100644
index 000000000000..ecaaa97afc4e
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch
@@ -0,0 +1,57 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -621,28 +621,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.])
++   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.
diff --git a/app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch b/app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
new file mode 100644
index 000000000000..69b3ae6d0d2d
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1491,11 +1491,12 @@
+ ])
+ 
+ # check for gtk-doc
+-m4_ifdef([GTK_DOC_CHECK], [
+-    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+-],[
+-    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+-])
++#m4_ifdef([GTK_DOC_CHECK], [
++#    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
++#],[
++#    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
++#])
++GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+ 
+ dnl Library versioning.
+ MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
diff --git a/app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch
new file mode 100644
index 000000000000..34ab42d27903
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -88,9 +88,6 @@
+ if HAVE_HASKELL
+ SUBDIRS += haskell
+ endif
+-if HAVE_PHP
+-SUBDIRS += php
+-endif
+ if HAVE_ERLANG
+ SUBDIRS += erlang erlang/examples
+ endif