[gentoo-commits] gentoo-x86 commit in app-emulation/libguestfs/files/1.22: 0004_add_icoutils_configure_drop_automagic.patch 0002_add_gentooway_to_remove_la_files.patch 0103_disable_php_bindings_makefile.patch 0001_add_gentoo_names_to_configure.patch 0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 0003_add_doc_more_option.patch

[Maxim Koltsov (maksbotan)]

maksbotan    13/10/01 17:51:39

  Added:                0004_add_icoutils_configure_drop_automagic.patch
                        0002_add_gentooway_to_remove_la_files.patch
                        0103_disable_php_bindings_makefile.patch
                        0001_add_gentoo_names_to_configure.patch
                        0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
                        0003_add_doc_more_option.patch
  Log:
  Bump to 1.22.26, thanks to slepnoga
  
  (Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

Revision  Changes    Path
1.1                  app-emulation/libguestfs/files/1.22/0004_add_icoutils_configure_drop_automagic.patch

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

Index: 0004_add_icoutils_configure_drop_automagic.patch
===================================================================
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.



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

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/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.22/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.22/0103_disable_php_bindings_makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/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.22/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.22/0001_add_gentoo_names_to_configure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/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.22/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.22/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.22/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.22/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.22/0003_add_doc_more_option.patch

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

Index: 0003_add_doc_more_option.patch
===================================================================
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -521,7 +521,7 @@
     dnl Check for functions not available in earlier versions of Augeas.
     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])
@@ -594,11 +594,19 @@
 
 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],