summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-12-23 00:38:03 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-12-23 00:38:03 +0000
commit8989ddc0b5c10ae5b9aba52b87a8ae2851cff7f5 (patch)
tree9eca04281ce141e1d4d31d3c17106deebb4122c9 /app-admin/collectd
parent[QA] Remove unused files. (diff)
downloadgentoo-2-8989ddc0b5c10ae5b9aba52b87a8ae2851cff7f5.tar.gz
gentoo-2-8989ddc0b5c10ae5b9aba52b87a8ae2851cff7f5.tar.bz2
gentoo-2-8989ddc0b5c10ae5b9aba52b87a8ae2851cff7f5.zip
[QA] Remove unused files.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'app-admin/collectd')
-rw-r--r--app-admin/collectd/ChangeLog7
-rw-r--r--app-admin/collectd/files/collectd-4.10.1-libiptc.patch12
-rw-r--r--app-admin/collectd/files/collectd-4.10.1-noowniptc.patch26
-rw-r--r--app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch27
4 files changed, 6 insertions, 66 deletions
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 55e2dbdc944f..2bb8538edf2c 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/collectd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.56 2013/11/24 12:26:50 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.57 2013/12/23 00:38:03 tomwij Exp $
+
+ 23 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
+ -files/collectd-4.10.1-libiptc.patch, -files/collectd-4.10.1-noowniptc.patch,
+ -files/collectd-4.10.2-libnotify-0.7.patch:
+ [QA] Remove unused files.
24 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> collectd-5.1.0-r1.ebuild,
collectd-5.1.0-r2.ebuild, collectd-5.1.1.ebuild, collectd-5.1.1-r1.ebuild,
diff --git a/app-admin/collectd/files/collectd-4.10.1-libiptc.patch b/app-admin/collectd/files/collectd-4.10.1-libiptc.patch
deleted file mode 100644
index 193a479ebc38..000000000000
--- a/app-admin/collectd/files/collectd-4.10.1-libiptc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-noowniptc.patch b/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
deleted file mode 100644
index 6496890a7cae..000000000000
--- a/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 92b01b1ff95d..000000000000
--- a/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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;