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

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

4 files changed, 39 insertions, 21 deletions

diff --git a/sys-apps/syslog-notify/ChangeLog b/sys-apps/syslog-notify/ChangeLog
index a6d99cbe0b7a..2512d34f0914 100644
--- a/sys-apps/syslog-notify/ChangeLog
+++ b/sys-apps/syslog-notify/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/syslog-notify
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/ChangeLog,v 1.3 2010/06/29 08:57:31 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/ChangeLog,v 1.4 2011/01/30 09:41:45 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> syslog-notify-0.1.ebuild,
+  +files/syslog-notify-0.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   29 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
   syslog-notify-0.1.ebuild:
diff --git a/sys-apps/syslog-notify/Manifest b/sys-apps/syslog-notify/Manifest
index 83b6cf7e28f3..db86ea179178 100644
--- a/sys-apps/syslog-notify/Manifest
+++ b/sys-apps/syslog-notify/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX syslog-notify-0.1-libnotify-0.7.patch 608 RMD160 ed6daa4839cd31748e407b754bb3d4247c91e0e8 SHA1 0965c991956fe608fc6888b8c91bbd7581ce8096 SHA256 e5b7f3e35e6a19adac6d00aa544e8c1d4f346eb336b91ca4f2481384dba6822b
 DIST syslog-notify-0.1.tar.bz2 77714 RMD160 2ea60e7c8af640c44d9143c2165b3d535eb26e10 SHA1 03e137b1ab629cce1b9352f034394582636b371f SHA256 c3fb1a25b9d3ca0a46c4e8be06bf20b108ddb929fd1f168cdfa094dc98bd5d57
-EBUILD syslog-notify-0.1.ebuild 1130 RMD160 4a6f279017066dc54dc6ab084b3febf1d36fc945 SHA1 4915b09cf8a6e7f65d72aeb813b3b34238c244ee SHA256 7868633b73bcd9b9b8518118f02a56ec45dd06f7c227e55bdcb9fc7d48f34483
-MISC ChangeLog 698 RMD160 3e050144f359928ac5fa5dd8de8067f58502292a SHA1 b16c5fab029af4479b42f01df2bbd72231d34e2c SHA256 d5043b901b147ec8ca6c7445461099e61d5194c98486b61c368f588c57830fc6
+EBUILD syslog-notify-0.1.ebuild 1150 RMD160 35a02af13cca829eaf854234baedc52e8f37dca4 SHA1 c35768bf44a7741f04e0ec3db4d57ff84624b618 SHA256 049d5225e5bdfc2be70888c0c8162d668ea989a942eeec86575fdb1eaecad90e
+MISC ChangeLog 878 RMD160 808879d89e39fab8dc13abb4f66e5bde11b2e9a5 SHA1 a76231738a07aeca76c063104dc26959c390b471 SHA256 96bf6b2800c49b31877fdb6eba9c7c475b9c2b1297e91d776c3166b07f4a9e22
 MISC metadata.xml 299 RMD160 2e104f9e93f7c11fa27c83226511c841e1a3dbd4 SHA1 25472cd164d586761a84c06a7b1506c6a33c03b7 SHA256 90f87a1654ecc810fd74a96670dee08373b74500e39e378ceb0d64a9c45c6dc5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwptb0ACgkQNQqtfCuFneNTYQCggbVXAznuEAV9qGzL1BY2yCX7
-l6YAnjILooIfk2W8Ta6a5b99GTQZtyyb
-=CEWS
------END PGP SIGNATURE-----
diff --git a/sys-apps/syslog-notify/files/syslog-notify-0.1-libnotify-0.7.patch b/sys-apps/syslog-notify/files/syslog-notify-0.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..acefdd765c20
--- /dev/null
+++ b/sys-apps/syslog-notify/files/syslog-notify-0.1-libnotify-0.7.patch
@@ -0,0 +1,18 @@
+--- src/syslog-notify.c
++++ src/syslog-notify.c
+@@ -66,7 +66,15 @@
+     close(fd);
+     return;
+   }
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  notification=notify_notification_new(title,message,NULL);
++#else
+   notification=notify_notification_new(title,message,NULL,NULL);
++#endif
++#else
++  notification=notify_notification_new(title,message,NULL,NULL);
++#endif
+   notify_notification_set_timeout(notification,NOTIFY_EXPIRES_DEFAULT);
+   notify_notification_set_urgency(notification,NOTIFY_URGENCY_NORMAL);
+   notify_notification_set_hint_string(notification,"x-canonical-append",
diff --git a/sys-apps/syslog-notify/syslog-notify-0.1.ebuild b/sys-apps/syslog-notify/syslog-notify-0.1.ebuild
index ad453f1d5b6a..664b128ce149 100644
--- a/sys-apps/syslog-notify/syslog-notify-0.1.ebuild
+++ b/sys-apps/syslog-notify/syslog-notify-0.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/syslog-notify-0.1.ebuild,v 1.3 2010/06/29 08:57:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syslog-notify/syslog-notify-0.1.ebuild,v 1.4 2011/01/30 09:41:45 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
+inherit eutils
 
 DESCRIPTION="Notifications for syslog entries via libnotify"
 HOMEPAGE="http://jtniehof.github.com/syslog-notify/"
@@ -17,13 +18,17 @@ DEPEND="x11-libs/libnotify"
 RDEPEND="${DEPEND}
 	app-admin/syslog-ng"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+}
+
 src_install() {
-	dosbin src/syslog-notify || die "install failed"
+	dosbin src/syslog-notify || die
 	ebegin "Creating /var/spool/syslog-notify FIFO"
-	dodir /var/spool/ || die "dodir failed"
-	mkfifo "${D}"var/spool/syslog-notify || die "mkfifo failed"
+	dodir /var/spool/ || die
+	mkfifo "${D}"var/spool/syslog-notify || die
 	eend $?
-	dodoc AUTHORS INSTALL README || die "dodoc failed"
+	dodoc AUTHORS INSTALL README || die
 }
 
 pkg_postinst() {