x11-plugins/pidgin-gfire: Version bump: Added patches for >=libnotify-0.7 support, and for disabled NLS compilation errors (both now fixed upstream). Bumped to EAPI4.

svn path=/sunrise/; revision=11902

5 files changed, 120 insertions, 1 deletions

diff --git a/x11-plugins/pidgin-gfire/ChangeLog b/x11-plugins/pidgin-gfire/ChangeLog
index 567c18da2..467916ccf 100644
--- a/x11-plugins/pidgin-gfire/ChangeLog
+++ b/x11-plugins/pidgin-gfire/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Apr 2011; Dean Matzkov (bapa) <bapabooiee@gmail.com>
+  +pidgin-gfire-0.9.4.ebuild,
+  +files/pidgin-gfire-0.9.4-disabled-nls-fix.patch,
+  +files/pidgin-gfire-0.9.4-libnotify-0.7-support.patch:
+  Version bump: Added patches for >=libnotify-0.7 support, and for disabled
+  NLS compilation errors (both now fixed upstream). Bumped to EAPI4.
+
   18 Feb 2011; Dean Matzkov (bapa) <bapabooiee@gmail.com>
   pidgin-gfire-0.9.2.ebuild:
   Tested on x86, and clarified a comment.
diff --git a/x11-plugins/pidgin-gfire/Manifest b/x11-plugins/pidgin-gfire/Manifest
index fda9dba51..d379e3676 100644
--- a/x11-plugins/pidgin-gfire/Manifest
+++ b/x11-plugins/pidgin-gfire/Manifest
@@ -1,4 +1,8 @@
+AUX pidgin-gfire-0.9.4-disabled-nls-fix.patch 849 RMD160 9365f466eef57ebc7650da55d928fe2e788fd56b SHA1 db4f4bf02cbe81c9aceb695104cbde55d293e6df SHA256 1404a1c50bc270eb18e1fdb083583b960f072c5dbae38e09480ea97c53f4e3d7
+AUX pidgin-gfire-0.9.4-libnotify-0.7-support.patch 1080 RMD160 832cc6d13a0beeb2570b8c73e84f745ac1b8e7a3 SHA1 4b3a516082ee9b7e0777f30e0ea77e82c88debff SHA256 cec26c9831ef90d4a77ea17afb5a4c5ecd429ef0b97a7338ec1b2728838b0964
 DIST pidgin-gfire-0.9.2.tar.bz2 494341 RMD160 c536b5c170c2c16c47a39efe5a5a060fdfecdbd2 SHA1 c26026462d6e29c0c9900ac7734df4b3cdbadcbc SHA256 02ddf8ae5f5a9593d2395639ded119d3760184c3659b1f45688e6b3f2ff1230f
+DIST pidgin-gfire-0.9.4.tar.bz2 499352 RMD160 d8eb757353f0a40b990430409239416d3d65fc38 SHA1 1bcfd30d4ca72f0f20acbb843fa838ee6b9809f9 SHA256 f69d713b68f18d4037c1f37a7b1a459e048ee7c626f262b80480f60e78ebde71
 EBUILD pidgin-gfire-0.9.2.ebuild 1155 RMD160 58dcb1ae15d1640605c435034ed174b45f2dcd2b SHA1 ed69821612116c7b4e1a59e3658bcd411d7f1abf SHA256 57d1371390ee4db7d71cfbf02902b33a8f3512ff6b30fb5197a56d14a74f77df
-MISC ChangeLog 747 RMD160 4b669f033e80641e93f4f7cf092e3efd4d42f210 SHA1 d556289fbf466cacb96522dd08601a968f7c9717 SHA256 c391d4dc0516280a6749649550f5e4a4b1f455d24fd741124d4ef75934d3316e
+EBUILD pidgin-gfire-0.9.4.ebuild 1318 RMD160 579582471695709c7f794c1ca71a95be0b44d223 SHA1 47b599abbb46b65ebac0207649e44f7b2087dc68 SHA256 6fcf051b5bcc4fa73f94d8b595283489e6dab4597376ad45bf17aa6011bc0d6c
+MISC ChangeLog 1090 RMD160 4049dffede3caf04dda055d1d2e346da61354e33 SHA1 e658db492ac6964148d534cd38f4dc2bd135f94b SHA256 dbdf855367caab962cdf9cfc442bb91ebdccdd0eb7aa8eadf91200f05ca2adb0
 MISC metadata.xml 429 RMD160 106ea006ca0d98523a1416a8ecbb4791bb37a239 SHA1 5bfad2eac32f87542d47c968cc17b250457fe694 SHA256 967ace29c9762f3f7800470bc96d98e23ee0f1e82d34344a06139f2bc40fd666
diff --git a/x11-plugins/pidgin-gfire/files/pidgin-gfire-0.9.4-disabled-nls-fix.patch b/x11-plugins/pidgin-gfire/files/pidgin-gfire-0.9.4-disabled-nls-fix.patch
new file mode 100644
index 000000000..84bd0ba9d
--- /dev/null
+++ b/x11-plugins/pidgin-gfire/files/pidgin-gfire-0.9.4-disabled-nls-fix.patch
@@ -0,0 +1,24 @@
+--- src/gf_games.c
++++ src/gf_games.c
+@@ -1530,7 +1530,9 @@ void gfire_game_manager_show(PurplePluginAction *p_action)
+ 		return;
+ 	}
+ 
++#ifdef ENABLE_NLS
+ 	gtk_builder_set_translation_domain(gfire_gtk_builder, GETTEXT_PACKAGE);
++#endif // ENABLE_NLS
+ 
+ 	gchar *builder_file = g_build_filename(DATADIR, "purple", "gfire", "games.glade", NULL);
+ 	gtk_builder_add_from_file(gfire_gtk_builder, builder_file, NULL);
+--- src/gf_server_browser.c
++++ src/gf_server_browser.c
+@@ -772,7 +772,9 @@ void gfire_server_browser_show(gfire_server_browser *p_browser)
+ 		return;
+ 	}
+ 
++#ifdef ENABLE_NLS
+ 	gtk_builder_set_translation_domain(p_browser->builder, GETTEXT_PACKAGE);
++#endif // ENABLE_NLS
+ 
+ 	gchar *builder_file = g_build_filename(DATADIR, "purple", "gfire", "servers.glade", NULL);
+ 	gtk_builder_add_from_file(p_browser->builder, builder_file, NULL);
diff --git a/x11-plugins/pidgin-gfire/files/pidgin-gfire-0.9.4-libnotify-0.7-support.patch b/x11-plugins/pidgin-gfire/files/pidgin-gfire-0.9.4-libnotify-0.7-support.patch
new file mode 100644
index 000000000..2338334d0
--- /dev/null
+++ b/x11-plugins/pidgin-gfire/files/pidgin-gfire-0.9.4-libnotify-0.7-support.patch
@@ -0,0 +1,29 @@
+Patch taken from Sabayon.
+--- src/gf_util.c.orig
++++ src/gf_util.c
+@@ -612,7 +612,13 @@
+ 	if(!gfire_notify_init() || !p_title)
+ 		return;
+ 
++	/* the fourth argument was removed in libnotify 0.7.0 */
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
+ 	NotifyNotification *notification = notify_notification_new(p_title, p_msg, NULL, NULL);
++#else
++	NotifyNotification *notification = notify_notification_new (p_title, p_msg, NULL);
++#endif
++
+ 	notify_notification_set_urgency(notification, NOTIFY_URGENCY_NORMAL);
+ 	notify_notification_set_timeout(notification, NOTIFY_EXPIRES_DEFAULT);
+ 	g_signal_connect(notification, "closed", G_CALLBACK(gfire_notify_closed_cb), NULL);
+@@ -637,7 +643,11 @@
+ 		return;
+ 	}
+ 
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
+ 	notification = notify_notification_new(p_title, p_msg, NULL, NULL);
++#else
++	notification = notify_notification_new (p_title, p_msg, NULL);
++#endif
+ 
+ 	// Get Buddy Icon
+ 	PurpleBuddyIcon *icon = purple_buddy_get_icon(p_buddy);
diff --git a/x11-plugins/pidgin-gfire/pidgin-gfire-0.9.4.ebuild b/x11-plugins/pidgin-gfire/pidgin-gfire-0.9.4.ebuild
new file mode 100644
index 000000000..d82edd012
--- /dev/null
+++ b/x11-plugins/pidgin-gfire/pidgin-gfire-0.9.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Pidgin plugin for adding Xfire accounts and connecting to the Xfire network"
+HOMEPAGE="http://gfireproject.org/"
+SRC_URI="mirror://sourceforge/gfire/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kmess-status libnotify nls"
+
+RDEPEND="
+	net-im/pidgin[gtk]
+	x11-libs/gtk+:2
+	kmess-status? ( dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7-support.patch
+	epatch "${FILESDIR}"/${P}-disabled-nls-fix.patch
+}
+
+src_configure() {
+	# Note: --enable-dbus-status is hard-coded to only publish
+	# your status to net-im/kmess via dbus; it does nothing else.
+	econf \
+		--enable-gtk \
+		--disable-update-notify \
+		$(use_enable kmess-status dbus-status) \
+		$(use_enable libnotify) \
+		$(use_enable debug) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS README ChangeLog
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' +
+}
+
+pkg_postinst() {
+	elog "Please note that unlike other Pidgin plugins, the Gfire plugin"
+	elog "needs Pidgin to be restarted before it is activated."
+}