[gentoo-commits] gentoo-x86 commit in app-emulation/libguestfs/files/1.26: 0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 0001_add_gentoo_names_to_configure.patch 0002_add_gentooway_to_remove_la_files.patch 0103_disable_php_bindings_makefile.patch 0000_bug_499150.patch

[Maxim Koltsov (maksbotan)]

maksbotan    14/05/01 19:23:28

  Added:               
                        0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
                        0001_add_gentoo_names_to_configure.patch
                        0002_add_gentooway_to_remove_la_files.patch
                        0103_disable_php_bindings_makefile.patch
                        0000_bug_499150.patch
  Log:
  Bump to 1.26.1
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

Revision  Changes    Path
1.1                  app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch?rev=1.1&content-type=text/plain

Index: 0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
===================================================================
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`



1.1                  app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch?rev=1.1&content-type=text/plain

Index: 0001_add_gentoo_names_to_configure.patch
===================================================================
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



1.1                  app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch?rev=1.1&content-type=text/plain

Index: 0002_add_gentooway_to_remove_la_files.patch
===================================================================
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])



1.1                  app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch?rev=1.1&content-type=text/plain

Index: 0103_disable_php_bindings_makefile.patch
===================================================================
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



1.1                  app-emulation/libguestfs/files/1.26/0000_bug_499150.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch?rev=1.1&content-type=text/plain

Index: 0000_bug_499150.patch
===================================================================
--- a/configure.ac	2014-01-24 19:04:05.633056872 +0100
+++ b/configure.ac	2014-01-24 19:04:34.685691757 +0100
@@ -24,6 +24,7 @@
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
+AM_GNU_GETTEXT_VERSION(0.18.3)
 
 dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
 dnl gives an error if it sees this, but for automake >= 1.13