Fix building with x11-libs/libnotify >= 0.7.

Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64

4 files changed, 40 insertions, 26 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 17511b146ca9..a6fb95c6dc99 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.13 2011/01/28 21:34:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.14 2011/02/06 12:25:42 ssuominen Exp $
+
+  06 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  collectd-4.10.2-r2.ebuild, +files/collectd-4.10.2-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   collectd-4.10.2-r2.ebuild:
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 4d7d087d5ece..4cb82f33716f 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,31 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX collectd-4.10.1-libiptc.patch 534 RMD160 dd6c016797ec4e6e5c7c67bbbeddd50d1c59badc SHA1 253efd36642f7ab1253bcc307e0f4d0e1a4d8e21 SHA256 f6c63e0cb686e4d7a655b9ff0b69e8ba75a9cf40c2ae79c6ec97c1e7377d2f4e
 AUX collectd-4.10.1-libperl.patch 917 RMD160 2feb20abbf7fd036e34957c190689f1e668ff321 SHA1 1c8312b576faa6a855f4f615995b007b108325ba SHA256 26e3c74392166a2438d7106e94953f871aedfe3b643c866afc8865c1ef7534c7
 AUX collectd-4.10.1-noowniptc.patch 837 RMD160 433d936a3c8d22af289ab9ecc00a9843ab4634e3 SHA1 c08eb253a5297c9ec69b1923dc2ed173343e0ce8 SHA256 fac80da197b0df38b2544edf7008eed544eac06817d5ead86dea2baf46ee009d
+AUX collectd-4.10.2-libnotify-0.7.patch 823 RMD160 f3a0febc8487be06ad1cc5ffc61206ad97b2ba37 SHA1 fae5913db9fe0c9243bad1aa9610f0759c1e0abb SHA256 b7a4baca65b4c68ca46ac95a269071c356ca4674ebfda50e872f665cf2422fe8
 AUX collectd-4.10.2-libocci.patch 720 RMD160 c90872f76a771076efe500c78dc3e3a5545f8f51 SHA1 40197f33a565ea37774f577c036b1c75ef447cae SHA256 2338b8405e46d67bc71ebe4d4f8cba8658047a352cb7b0c3c0f4b15109a9c98b
 AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc SHA1 85f569035bbb6ff7d3e03a4b85c35ccb126c29a4 SHA256 30e41d63f3af1d736d86903046e5aac8f8a548714bab0acbbca0ffd6c16ed430
 AUX collectd.initd 1475 RMD160 27a19af6419a7bd450e7877bd8b95075e6653c70 SHA1 b8315ce1db2f755d4bc77047d66d0dad12e45668 SHA256 b09dea6513ed0d9932c84f46755c89afc4d04777a96230ead019f68d0b74a583
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
 DIST collectd-4.10.2.tar.bz2 1419603 RMD160 13db504beb5cd560d60014183b67ce768fe4293e SHA1 8d83dd2d68ac4c0871774af99079564880abb5ef SHA256 17cd6741c360cb2544f00fbe902ec3e9aa0d04a7ab6a744e3e8ea5615bb794be
-EBUILD collectd-4.10.2-r2.ebuild 11168 RMD160 469f5d574f0a2188a57355f7a4e3d666e7c9ad48 SHA1 2f5415a58f1f73b18afab1c84cc50e82025b1311 SHA256 fce7a70ba4d81124c385ebd8c310da5b87bf65da8cffac47531c2059e5c128e5
-MISC ChangeLog 3193 RMD160 6d7bca9866beb065441b256bd7a9bbbe2d5683a6 SHA1 32cb516424b5b2a2626f8e24cc9d68ebdd0926a5 SHA256 3370e91df14c6b2c8be98adb47cc08cc6c7cf88a10c7eb88540e7a8cbf86c477
+EBUILD collectd-4.10.2-r2.ebuild 11194 RMD160 303efc913557e498fb121db159095ad937b632aa SHA1 c12a23b14545189be7133ecda19d1336c5e627d7 SHA256 c021a560bd642ad12f1f6f1ec7b3c199c5ce2042df2d086cd459b68da936b0c0
+MISC ChangeLog 3368 RMD160 f22b6f289949253c73d3ee4c5951c22d1da103f7 SHA1 0c2077ebabeb32e03d486cd2afbbd7ff14c05960 SHA256 abc181663b5f2da4d769d91cd6d6bce4e4c59beccc8e63f02c378dc78ed71b33
 MISC metadata.xml 11374 RMD160 d55c891c2b22898dd8d4f09e635bddbd61988ea9 SHA1 f725b0c3a45c6c3098dd84b29b39dc7a95a0267f SHA256 f849d03105461a54bce4e59f96530a8ab9471ab8620efee506076ef4e546eb88
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNQzZDAAoJENwGBM22xffeYB8P/0DGo+7x2mGddW4cbNsfUbuN
-Pp7g5+pU3/357ujdQ7dWSvYfLzVlyNpTYgdawi7X7HdQlGPFLCnZx6KYcoGdNBuv
-H2EjcOLRA2QgpNsyZc7h+vkQTc/firbjRqn/Oy0T1CKlTtJfueG46EyXP55QXpFm
-yHwepDKLgHjJbykcv509ALfncqYt3jx7NqJZ4hrV5racTw/tEZHBDR26eSLyWgrA
-+jrG5i9VAeazheUbmO/Dnv4LJOZAdUVJ+TizumVowaWoeL7SusVYiqqQc2nRIbmq
-9GwX3wGZHnqmTAAMN/aG/r0bT4kgRn9K/u5plYRWWzTNg7aze7vE6F5jbRQuoZmf
-mjuGvi3Ezq9QSzrbzwwnxoRbiiu+GuGbF7lIvfDvQuEubyceZefmW8gKVPFjBiAX
-fqFQ4h7ocnc5MeYOd/fxPfN/sdJLlnD4HoAUK15xonFxgLkzbHynVEazuwR8DYRx
-sjnJMfZfaVcn/eFFWgvKL1ZdkVxvrDUf8VxvhYYw3MCYLJyvJmBjb/bmxmmWyBf4
-g6p2c1kFtpA4MJPDKrSPd2q6uRt5lH5D8qbyWo6jeQNByo11o+9PPWaLzB1S5rsU
-AgzHrS9W9HGD0qIQUuPxUni6C2attvSTg8KdqbTcwdZulNI/6/mzW0Rv08qHxnkb
-ccJ/07UqBv+0A0vbGLor
-=d6vF
------END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-4.10.2-r2.ebuild b/app-admin/collectd/collectd-4.10.2-r2.ebuild
index 7759e0df5fce..0976f45ecc1c 100644
--- a/app-admin/collectd/collectd-4.10.2-r2.ebuild
+++ b/app-admin/collectd/collectd-4.10.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.2-r2.ebuild,v 1.2 2011/01/28 21:34:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.2-r2.ebuild,v 1.3 2011/02/06 12:25:42 ssuominen Exp $
 
 EAPI="2"
 
@@ -99,8 +99,10 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	collectd_plugins_syslog?		( virtual/logger )"
 
-PATCHES=( "${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch
-	"${FILESDIR}/${P}"-libocci.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.10.1-{libperl,libiptc,noowniptc}.patch
+	"${FILESDIR}"/${PN}-4.10.2-{libocci,libnotify-0.7}.patch
+	)
 
 # @FUNCTION: collectd_plugin_kernel_linux
 # @DESCRIPTION:
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 000000000000..92b01b1ff95d
--- /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;