[gentoo-commits] dev/eva:master commit in: app-admin/collectd/files/

[Gilles Dartiguelongue]

commit:     0de4e0a7a517a88f4ebcc09cee2d312950109754
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 14:20:01 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 14:20:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=0de4e0a7

add missing patches

---
 .../collectd/files/collectd-4.10.1-libiptc.patch   |   12 ++++++++
 .../collectd/files/collectd-4.10.1-libperl.patch   |   29 ++++++++++++++++++++
 .../collectd/files/collectd-4.10.1-noowniptc.patch |   26 +++++++++++++++++
 .../files/collectd-4.10.2-libnotify-0.7.patch      |   27 ++++++++++++++++++
 .../collectd/files/collectd-4.10.2-libocci.patch   |   20 +++++++++++++
 .../collectd/files/collectd-4.10.2-nohal.patch     |   23 +++++++++++++++
 6 files changed, 137 insertions(+), 0 deletions(-)

diff --git a/app-admin/collectd/files/collectd-4.10.1-libiptc.patch b/app-admin/collectd/files/collectd-4.10.1-libiptc.patch
new file mode 100644
index 0000000..193a479
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.1-libiptc.patch
@@ -0,0 +1,12 @@
+diff -r -u collectd-4.10.1.orig/configure.in collectd-4.10.1/configure.in
+--- collectd-4.10.1.orig/configure.in	2010-07-09 12:01:59.000000000 +0200
++++ collectd-4.10.1/configure.in	2010-08-27 22:27:57.010271693 +0200
+@@ -1626,7 +1626,7 @@
+ # Check for the iptc_init symbol in the library.
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
+ then
+-	AC_CHECK_LIB(iptc, iptc_init,
++	AC_SEARCH_LIBS(iptc_init, [iptc ip4tc],
+ 	[
+ 		AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
+ 	],

diff --git a/app-admin/collectd/files/collectd-4.10.1-libperl.patch b/app-admin/collectd/files/collectd-4.10.1-libperl.patch
new file mode 100644
index 0000000..8fc25a8
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.1-libperl.patch
@@ -0,0 +1,29 @@
+diff -r -u collectd-4.10.1.orig/configure.in collectd-4.10.1/configure.in
+--- collectd-4.10.1.orig/configure.in	2010-07-09 12:01:59.000000000 +0200
++++ collectd-4.10.1/configure.in	2010-09-24 20:15:22.666434555 +0200
+@@ -2607,11 +2607,13 @@
+ then
+   SAVE_CFLAGS="$CFLAGS"
+   SAVE_LDFLAGS="$LDFLAGS"
++  SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+   CFLAGS="$CFLAGS $PERL_CFLAGS"
+   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++  LIBS="$LIBS -lperl"
+ 
+   AC_CACHE_CHECK([for libperl],
+     [c_cv_have_libperl],
+@@ -2630,7 +2632,10 @@
+ 			 Nullsv);
+       ]]),
+       [c_cv_have_libperl="yes"],
+-      [c_cv_have_libperl="no"]
++      [ 
++        c_cv_have_libperl="no" 
++        LIBS="$SAVE_LIBS"
++      ]
+     )
+   )
+ 

diff --git a/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch b/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
new file mode 100644
index 0000000..6496890
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
@@ -0,0 +1,26 @@
+diff -r -u collectd-4.10.1.orig/src/Makefile.am collectd-4.10.1/src/Makefile.am
+--- collectd-4.10.1.orig/src/Makefile.am	2010-07-09 12:01:59.000000000 +0200
++++ collectd-4.10.1/src/Makefile.am	2010-10-11 00:10:59.000000000 +0200
+@@ -1,7 +1,4 @@
+ SUBDIRS = libcollectdclient
+-if BUILD_WITH_OWN_LIBIPTC
+-SUBDIRS += owniptc
+-endif
+ if BUILD_WITH_OWN_LIBOCONFIG
+ SUBDIRS += liboconfig
+ endif
+@@ -415,12 +412,9 @@
+ iptables_la_SOURCES = iptables.c
+ iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
+ iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
+-if BUILD_WITH_OWN_LIBIPTC
+-iptables_la_LIBADD  = owniptc/libiptc.la
+-iptables_la_DEPENDENCIES = owniptc/libiptc.la
+-else
++
+ iptables_la_LIBADD = -liptc
+-endif
++
+ collectd_LDADD += "-dlopen" iptables.la
+ collectd_DEPENDENCIES += iptables.la
+ endif

diff --git a/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch b/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch
new file mode 100644
index 0000000..92b01b1
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch
@@ -0,0 +1,27 @@
+--- src/notify_desktop.c
++++ src/notify_desktop.c
+@@ -31,6 +31,10 @@
+ #include <glib.h>
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #define log_info(...) INFO ("notify_desktop: " __VA_ARGS__)
+ #define log_warn(...) WARNING ("notify_desktop: " __VA_ARGS__)
+ #define log_err(...) ERROR ("notify_desktop: " __VA_ARGS__)
+@@ -95,7 +99,12 @@
+ 				: (NOTIF_WARNING == n->severity) ? "WARNING"
+ 				: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
+ 
+-	notification = notify_notification_new (summary, n->message, NULL, NULL);
++	notification = notify_notification_new (summary, n->message, NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	);
++#else
++	, NULL);
++#endif
+ 	if (NULL == notification) {
+ 		log_err ("Failed to create a new notification.");
+ 		return -1;

diff --git a/app-admin/collectd/files/collectd-4.10.2-libocci.patch b/app-admin/collectd/files/collectd-4.10.2-libocci.patch
new file mode 100644
index 0000000..2ae42dc
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.2-libocci.patch
@@ -0,0 +1,20 @@
+diff -r -u collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in
+--- collectd-4.10.2.orig/configure.in	2010-11-28 03:27:47.000000000 +0100
++++ collectd-4.10.2/configure.in	2010-11-28 03:28:23.000000000 +0100
+@@ -2446,14 +2446,14 @@
+ ])
+ if test "x$ORACLE_HOME" != "x"
+ then
+-	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public"
++	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci"
+ 
+ 	if test -e "$ORACLE_HOME/lib/ldflags"
+ 	then
+ 		with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"`
+ 	fi
+ 	#with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh"
+-	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh"
++	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci"
+ fi
+ if test "x$with_oracle" = "xyes"
+ then

diff --git a/app-admin/collectd/files/collectd-4.10.2-nohal.patch b/app-admin/collectd/files/collectd-4.10.2-nohal.patch
new file mode 100644
index 0000000..a82a3bc
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.2-nohal.patch
@@ -0,0 +1,23 @@
+diff -ruN collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in
+--- collectd-4.10.2.orig/configure.in	2010-11-27 11:10:38.000000000 +0100
++++ collectd-4.10.2/configure.in	2011-02-07 21:55:22.000000000 +0100
+@@ -1109,18 +1109,7 @@
+ AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
+ 
+ dnl Check for HAL (hardware abstraction library)
+-with_libhal="yes"
+-AC_CHECK_LIB(hal,libhal_device_property_exists,
+-	     [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
+-	     [with_libhal="no"])
+-if test "x$with_libhal" = "xyes"; then
+-	if test "x$PKG_CONFIG" != "x"; then
+-		BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
+-		BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
+-		AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
+-		AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
+-	fi
+-fi
++with_libhal="no"
+ 
+ m4_divert_once([HELP_WITH], [
+ collectd additional packages:])