Version bump.

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

4 files changed, 48 insertions, 10 deletions

diff --git a/xfce-extra/xfce4-volumed/ChangeLog b/xfce-extra/xfce4-volumed/ChangeLog
index 52e80ba6cb10..c8c8fa672bd4 100644
--- a/xfce-extra/xfce4-volumed/ChangeLog
+++ b/xfce-extra/xfce4-volumed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-volumed
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/ChangeLog,v 1.12 2010/11/02 16:39:15 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/ChangeLog,v 1.13 2011/01/29 19:35:19 ssuominen Exp $
+
+*xfce4-volumed-0.1.11 (29 Jan 2011)
+
+  29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-volumed-0.1.11.ebuild,
+  +files/xfce4-volumed-0.1.11-libnotify-0.7.patch:
+  Version bump.
 
 *xfce4-volumed-0.1.10 (02 Nov 2010)
 
diff --git a/xfce-extra/xfce4-volumed/Manifest b/xfce-extra/xfce4-volumed/Manifest
index 7c9696c47816..8d9296319c21 100644
--- a/xfce-extra/xfce4-volumed/Manifest
+++ b/xfce-extra/xfce4-volumed/Manifest
@@ -1,6 +1,7 @@
-DIST xfce4-volumed-0.1.10.tar.bz2 88091 RMD160 df0c536ffc9001c847ffcf0ec7f1618241327714 SHA1 e178396c545943b7d6eb25cbe3f6d43738e0ee0b SHA256 569efd59b81ca06cb67aa6994e6483740829c622e0bfdefe140f218a6fda59d4
+AUX xfce4-volumed-0.1.11-libnotify-0.7.patch 614 RMD160 4d1cac66c8836009f65833afcb55bbbd6d234fe8 SHA1 5d1f973038e9bf40d987ae68c95acc55e86b330b SHA256 738a494934c5a65126cc206b31865f7e8f4f12998b49b5dc8cf5ba9060ca9c8d
+DIST xfce4-volumed-0.1.11.tar.bz2 88298 RMD160 15dbb3c5128c2d9848a4d6b165b40dead4d4bfa0 SHA1 93df091814843bbead3f51b9b0583c2009ae7166 SHA256 81597ef5358c460e4992afadef71f0d52c187eef303c4d954e4894b4319e6ff0
 DIST xfce4-volumed-0.1.8.tar.bz2 88574 RMD160 ba0aeec261c43dbf42474054a1d22c66336e7ab0 SHA1 7b2c3fea094fab01b4f33916273d82a752e7d89f SHA256 90757ed30876a996b78da583ac2416e46c565e34b5e419526e7c05e9a479f777
-EBUILD xfce4-volumed-0.1.10.ebuild 900 RMD160 e91e7aa10711d8250a98eb8e6073661cc8779a4a SHA1 4da05725ea76f599b20e92492a0bbb33f028c535 SHA256 5f9f205bc24be337eb05c557c6828575eb8b5369be3681003419227489d56ab9
+EBUILD xfce4-volumed-0.1.11.ebuild 960 RMD160 79c5b0cc1f2afcd5f7c0bdd7959c2ae0e00a1290 SHA1 638cf3b871399c8aa202e0595c5c3693a0082981 SHA256 e78a3a532e5dffa52df0f871bea08abc11eae66fa3bc063874b4be423731a0be
 EBUILD xfce4-volumed-0.1.8.ebuild 904 RMD160 cdb81afdd34db936e7f592a3bb8b2a33eb9e164c SHA1 424db4427750873ee1be9ab9c056dca9a2f964ab SHA256 425df143d9cf4c4c57fdeb24f2fabafe51e0a2ee4101145da7931f354788cc46
-MISC ChangeLog 1926 RMD160 ff69463e670ac74ab3b39cfd14c1a5e2af4d3aab SHA1 c089296eff96de5c430e7c8bd66476362397c133 SHA256 01fa019aa565606c452245e452cd034b496fc7c88c4c6a8fe7cd4e17c031ebc9
+MISC ChangeLog 2117 RMD160 b0ec711c70bc930e74900cbaa69e2baf47bc0905 SHA1 32bd9964755416673e7d8347632e1b9742fad682 SHA256 490cfdba4f9055f1dfd584a4d121aa26f1cfc3a79b2c0a0c9ddcf8af15683328
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-extra/xfce4-volumed/files/xfce4-volumed-0.1.11-libnotify-0.7.patch b/xfce-extra/xfce4-volumed/files/xfce4-volumed-0.1.11-libnotify-0.7.patch
new file mode 100644
index 000000000000..5415354a781b
--- /dev/null
+++ b/xfce-extra/xfce4-volumed/files/xfce4-volumed-0.1.11-libnotify-0.7.patch
@@ -0,0 +1,25 @@
+http://bugs.launchpad.net/xfce4-volumed/+bug/671915
+
+--- src/xvd_notify.c
++++ src/xvd_notify.c
+@@ -117,11 +117,15 @@
+ 		g_list_free (caps_list);
+ 	}
+ 	
+-	Inst->notification = notify_notification_new (
+-					"Xfce4-Volumed",
+-					NULL,
+-					NULL,
+-					NULL);
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL, NULL);
++#else
++	Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL, NULL, NULL);
++#endif
++#else
++	Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL, NULL, NULL);
++#endif
+ }
+ 
+ void 
diff --git a/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.10.ebuild b/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.11.ebuild
index ebed55c8e496..fd778877230d 100644
--- a/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.10.ebuild
+++ b/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.11.ebuild
@@ -1,8 +1,8 @@
-# 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/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.10.ebuild,v 1.1 2010/11/02 16:39:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.11.ebuild,v 1.1 2011/01/29 19:35:19 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit xfconf
 
 DESCRIPTION="Daemon to control volume up/down and mute keys"
@@ -25,8 +25,13 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF="--disable-dependency-tracking
+	PATCHES=( "${FILESDIR}"/${P}-libnotify-0.7.patch )
+
+	XFCONF=(
+		--disable-dependency-tracking
 		$(use_enable debug)
-		$(use_with libnotify)"
+		$(use_with libnotify)
+		)
+
 	DOCS="AUTHORS ChangeLog README THANKS"
 }