From aa53b57ebbaf9a3e404b8ade8765a43bc689b0ea Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 15 Jan 2017 12:23:39 +0100 Subject: app-emulation/libguestfs: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- .../1.24/0001_add_gentoo_names_to_configure.patch | 15 ------ .../0002_add_gentooway_to_remove_la_files.patch | 16 ------ ...004_add_icoutils_configure_drop_automagic.patch | 57 ---------------------- ...gtk_docs_in_broken_autotools-utils-eclass.patch | 21 -------- .../1.24/0103_disable_php_bindings_makefile.patch | 13 ----- .../libguestfs/files/1.26/0000_bug_499150.patch | 10 ---- .../1.26/0001_add_gentoo_names_to_configure.patch | 15 ------ .../0002_add_gentooway_to_remove_la_files.patch | 16 ------ ...gtk_docs_in_broken_autotools-utils-eclass.patch | 21 -------- .../files/1.26/0020_all_qemu_configure.patch | 27 ---------- .../1.26/0103_disable_php_bindings_makefile.patch | 13 ----- 11 files changed, 224 deletions(-) delete mode 100644 app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch delete mode 100644 app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch delete mode 100644 app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch delete mode 100644 app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch delete mode 100644 app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch delete mode 100644 app-emulation/libguestfs/files/1.26/0000_bug_499150.patch delete mode 100644 app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch delete mode 100644 app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch delete mode 100644 app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch delete mode 100644 app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch delete mode 100644 app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch (limited to 'app-emulation/libguestfs/files') 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 deleted file mode 100644 index 9d209ff53584..000000000000 --- a/app-emulation/libguestfs/files/1.24/0001_add_gentoo_names_to_configure.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 38a591b811ed..000000000000 --- a/app-emulation/libguestfs/files/1.24/0002_add_gentooway_to_remove_la_files.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index ecaaa97afc4e..000000000000 --- a/app-emulation/libguestfs/files/1.24/0004_add_icoutils_configure_drop_automagic.patch +++ /dev/null @@ -1,57 +0,0 @@ -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 deleted file mode 100644 index 69b3ae6d0d2d..000000000000 --- a/app-emulation/libguestfs/files/1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 34ab42d27903..000000000000 --- a/app-emulation/libguestfs/files/1.24/0103_disable_php_bindings_makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch b/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch deleted file mode 100644 index 1e0f1a32185e..000000000000 --- a/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 diff --git a/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch deleted file mode 100644 index 9d209ff53584..000000000000 --- a/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch +++ /dev/null @@ -1,15 +0,0 @@ -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.26/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch deleted file mode 100644 index 38a591b811ed..000000000000 --- a/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch +++ /dev/null @@ -1,16 +0,0 @@ -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.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch b/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch deleted file mode 100644 index 69b3ae6d0d2d..000000000000 --- a/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch +++ /dev/null @@ -1,21 +0,0 @@ -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.26/0020_all_qemu_configure.patch b/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch deleted file mode 100644 index 77423f73e8c9..000000000000 --- a/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/528386 - -From 101d728e80cce73b882aac7af457013491d03311 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 22 Apr 2014 22:21:57 -0400 -Subject: [PATCH] configure: Make sure grep matches qemu 2.x version string. - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 34e4ddb..bb1a361 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -777,7 +777,7 @@ working. - fi - - AC_MSG_CHECKING([for $QEMU version >= 1]) -- if $QEMU -version | grep -sq 'version @<:@1-@:>@'; then -+ if $QEMU -version | grep -sq 'version @<:@1-9@:>@'; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) --- -2.1.3 - diff --git a/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch deleted file mode 100644 index 34ab42d27903..000000000000 --- a/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 -- cgit v1.2.3-65-gdbad