summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-12-31 16:59:55 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-12-31 16:59:55 +0000
commitd4d74e7dbeb78feeaa08a45e1767a9c9a669992f (patch)
tree85068cb29e1ec5417bcf9600ec8e52cb28695d9d /app-emulation
parent[QA] Remove unused files. (diff)
downloadgentoo-2-d4d74e7dbeb78feeaa08a45e1767a9c9a669992f.tar.gz
gentoo-2-d4d74e7dbeb78feeaa08a45e1767a9c9a669992f.tar.bz2
gentoo-2-d4d74e7dbeb78feeaa08a45e1767a9c9a669992f.zip
[QA] Remove unused files.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/libguestfs/ChangeLog11
-rw-r--r--app-emulation/libguestfs/files/1.17/0002-configure_ac_automagic.patch138
-rw-r--r--app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch15
-rw-r--r--app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch34
-rw-r--r--app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch15
-rw-r--r--app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch62
-rw-r--r--app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch13
7 files changed, 10 insertions, 278 deletions
diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog
index 13226067a6e8..c524f70f06ab 100644
--- a/app-emulation/libguestfs/ChangeLog
+++ b/app-emulation/libguestfs/ChangeLog
@@ -1,6 +1,15 @@
# 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.31 2013/10/27 12:06:04 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.32 2013/12/31 16:59:55 tomwij Exp $
+
+ 31 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
+ -files/1.17/0002-configure_ac_automagic.patch,
+ -files/1.18/0001_add_gentoo_names_to_configure.patch,
+ -files/1.18/0002_add_doc_more_option.patch,
+ -files/1.18/0002_add_gentooway_to_remove_la_files.patch,
+ -files/1.18/0003_add_icoutils_configure_drop_automagic.patch,
+ -files/1.18/0103_disable_php_bindings_makefile.patch:
+ [QA] Remove unused files.
27 Oct 2013; Maxim Koltsov <maksbotan@gentoo.org>
+files/1.24/0001_add_gentoo_names_to_configure.patch,
diff --git a/app-emulation/libguestfs/files/1.17/0002-configure_ac_automagic.patch b/app-emulation/libguestfs/files/1.17/0002-configure_ac_automagic.patch
deleted file mode 100644
index cf903357c286..000000000000
--- a/app-emulation/libguestfs/files/1.17/0002-configure_ac_automagic.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -75,9 +75,6 @@
- if HAVE_HASKELL
- SUBDIRS += haskell
- endif
--if HAVE_PHP
--SUBDIRS += php
--endif
- if HAVE_ERLANG
- SUBDIRS += erlang erlang/examples
- endif
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -356,6 +356,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
-@@ -368,6 +373,7 @@
- AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
- AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
- ])
-+AS_IF([test "xRPCGEN" = "xno"], [AC_MSG_ERROR([rpcgen not installed])],[])
-
- dnl Check for Augeas (optional).
- PKG_CHECK_MODULES([AUGEAS], [augeas],
-@@ -381,9 +387,11 @@
- 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).
-+dnl TODO selinux triplet
-+
- AC_CHECK_HEADERS([selinux/selinux.h])
- AC_CHECK_LIB([selinux],[setexeccon],[
- have_libselinux="$ac_cv_header_selinux_selinux_h"
-@@ -409,7 +417,7 @@
- AS_IF([test "x$enable_probes" != "xno"],[
- dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps
- AC_CHECK_HEADERS([sys/sdt.h])
-- dnl AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
-+ AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
- AS_IF([test "x$ac_cv_header_sys_sdt_h" = "xyes"],[
- AC_DEFINE([ENABLE_PROBES],[1],[enable systemtap/DTrace userspace probes])
- ])
-@@ -442,7 +450,7 @@
- AC_MSG_RESULT([yes])
- POD2_STDERR_OPTION="--stderr"
- else
-- AC_MSG_RESULT([no])
-+ AC_MSG_RESULT([no]
- POD2_STDERR_OPTION=""
- fi
- AC_SUBST([POD2_STDERR_OPTION])
-@@ -464,11 +472,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],
-@@ -641,6 +658,9 @@
- [])
-
- dnl Readline.
-+dnl TODO - add ncurses LDFLGS separately
-+dnl build --without-redline in fact broken with -lncurses not inherited
-+
- AC_ARG_WITH([readline],
- [AS_HELP_STRING([--with-readline],
- [support fancy command line editing @<:@default=check@:>@])],
-@@ -894,11 +914,13 @@
- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-
- dnl Check for Java.
--AC_ARG_WITH(java_home,
-- [AS_HELP_STRING([--with-java-home],
-- [specify path to JDK directory @<:@default=check@:>@])],
-- [],
-- [with_java_home=check])
-+AC_ARG_ENABLE([java],
-+ AS_HELP_STRING([--enable-java], [Disable Java language bindings]),
-+ [enable_java=no],
-+ [enable_java=yes])
-+
-+AS_IF([test "x$enable_java" = "xyes"],
-+ [
-
- if test "x$with_java_home" != "xno"; then
- if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck"
-@@ -1034,7 +1056,9 @@
- AC_SUBST(JNI_INSTALL_DIR)
- AC_SUBST(JNI_VERSION_INFO)
-
--AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])
-+
-+])
-+AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" && test "x$enable_java" != "xno"])
-
- dnl Check for Haskell (GHC).
- GHC=no
-@@ -1153,7 +1177,7 @@
-
- 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'
-+dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
- AC_SUBST([LIBTOOL])
-
- dnl Produce output files.
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
deleted file mode 100644
index a30c7a059ec2..000000000000
--- a/app-emulation/libguestfs/files/1.18/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
-@@ -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
deleted file mode 100644
index bc0989fc162c..000000000000
--- a/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 9ae028acf820..000000000000
--- a/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 58d5a8bccb3b..000000000000
--- a/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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
deleted file mode 100644
index c86acbc2c333..000000000000
--- a/app-emulation/libguestfs/files/1.18/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
-@@ -79,9 +79,6 @@
- if HAVE_HASKELL
- SUBDIRS += haskell
- endif
--if HAVE_PHP
--SUBDIRS += php
--endif
- if HAVE_ERLANG
- SUBDIRS += erlang erlang/examples
- endif