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

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

4 files changed, 42 insertions, 13 deletions

diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index 9c34ab9893e0..110321083708 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/gnomebaker
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.56 2008/09/28 09:23:28 loki_val Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.57 2011/01/29 20:05:33 ssuominen Exp $
+
+  29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> gnomebaker-0.6.4.ebuild,
+  +files/gnomebaker-0.6.4-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   28 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
   -files/gnomebaker-0.6.1-export-dynamic_for_glade.patch,
diff --git a/app-cdr/gnomebaker/Manifest b/app-cdr/gnomebaker/Manifest
index d6e78e5861bc..f6e61fbf90e3 100644
--- a/app-cdr/gnomebaker/Manifest
+++ b/app-cdr/gnomebaker/Manifest
@@ -1,4 +1,5 @@
+AUX gnomebaker-0.6.4-libnotify-0.7.patch 678 RMD160 01aa8d37bcb1c1bec6c48d7a3baa02b949e42ba3 SHA1 623d21137c4a3bf643b4599b398b67e4ef0188b2 SHA256 439006ede352ea5aa2d52e769f4eb611086123f220c3ac57da0d8f34b5d91e0c
 DIST gnomebaker-0.6.4.tar.gz 1276117 RMD160 a90d129866deefde31e859e45ad1260e6c1be4cc SHA1 ead0fe0091a1de7ae9197bf8e1b374749fc7c61b SHA256 6e1ef94cafca7536fc3211a7abd4732f6dc5adc3c7c1b73184f5a87738117fb7
-EBUILD gnomebaker-0.6.4.ebuild 1486 RMD160 23203de29453ae6bbe0f6345bb557a519729f747 SHA1 fe9951b53515bd0f6c1a4e22a77de3bacab6d9df SHA256 ec0112b061f5ffc34c1f05b128b156576d07613f2a9622e05268eef95f2bfd9c
-MISC ChangeLog 8201 RMD160 f9b921561feaef8ff87a62b13652fa0010ec9d78 SHA1 61b06559434c50100a468bf9ead2b20bc137f514 SHA256 83a2576b923f06a415b624c6dda1aaf792c03ae25e95a19d2420f74d1fca0f6d
+EBUILD gnomebaker-0.6.4.ebuild 1565 RMD160 b8120b5ddf6291e83ea53438178b717bb570540d SHA1 051935713420e295e5437d91535c216c394fd6c9 SHA256 c7ada7f2d1a5194ace8740baf978ce63149eed264a0762247dfd7ba18579e463
+MISC ChangeLog 8376 RMD160 98a8f94a014d87e37507f3fefac2e2d1f40b684f SHA1 a27582baa16a27a119f3ff663b76cc1e7fdd3491 SHA256 fdbc3ea10167b60d41ebc1c3f63cece0ea36027200a50122b7992780b9307e2f
 MISC metadata.xml 168 RMD160 0f4531db7705cd8bc36b75d29d850bf7104855ae SHA1 d5eb7a704881bd8a8a83d83679d791b1e17633b4 SHA256 78253ccb8cd8df7179b1776b7e98a02f8df32368476727fef07ad0c9d164e180
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch
new file mode 100644
index 000000000000..27ae276d77a3
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch
@@ -0,0 +1,18 @@
+--- src/gblibnotify.c
++++ src/gblibnotify.c
+@@ -87,7 +87,15 @@
+ #ifdef HAVE_LIBNOTIFY
+ #if (LIBNOTIFY_VERSION_MINOR >= 3)
+ 	gint x, y;
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	global_notify = notify_notification_new (subject, content, "");
++#else
+ 	global_notify = notify_notification_new (subject, content, "", NULL);
++#endif
++#else
++	global_notify = notify_notification_new (subject, content, "", NULL);
++#endif
+ 	/* not sure if we have to free the pixbuf since it could be used internally in libnotify */
+     GdkPixbuf *icon_pixbuf = gbcommon_get_icon_for_name("gnomebaker-48", 48);
+     /* I think they changed the api between 0.3.0 and 0.3.1+ */
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
index 944d006bb1c2..6105bfa1c478 100644
--- a/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
+++ b/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild,v 1.6 2008/08/30 14:40:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild,v 1.7 2011/01/29 20:05:33 ssuominen Exp $
 
+EAPI=3
 GCONF_DEBUG=no
-
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application."
 HOMEPAGE="http://sourceforge.net/projects/gnomebaker"
@@ -33,14 +33,20 @@ RDEPEND=">=x11-libs/gtk+-2.8
 		>=media-libs/libogg-1.1.2
 		media-libs/gst-plugins-good )"
 DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig
+	app-text/rarian
 	dev-util/intltool
-	sys-devel/gettext
-	dev-perl/XML-Parser"
+	dev-util/pkgconfig
+	sys-devel/gettext"
 
 pkg_setup() {
-	G2CONF="${G2CONF} --disable-dependency-tracking $(use_enable libnotify)"
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		$(use_enable libnotify)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
 }
 
 src_install() {