Fix building with x11-libs/libnotify >= 0.7 wrt #358039 by Juergen Rose. Remove now deprecated check for sys-devel/gcc >= 4.1 since minimum supported version is 4.4.

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

4 files changed, 41 insertions, 22 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index 9efe11b8c512..79072f7f9752 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.61 2011/02/15 08:19:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.62 2011/03/09 16:18:31 ssuominen Exp $
+
+  09 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xchat-gnome-0.26.1-r1.ebuild, +files/xchat-gnome-0.26.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7 wrt #358039 by Juergen Rose.
+  Remove now deprecated check for sys-devel/gcc >= 4.1 since minimum supported
+  version is 4.4.
 
   15 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org>
   xchat-gnome-0.26.1-r1.ebuild, metadata.xml:
diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index 237c1acbd556..18d22cf7bf1d 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xchat-gnome-0.26.1-fix-it-help.patch 1721 RMD160 58bf6c92e578e370b7e56d7fbcbbc361d11b4c3a SHA1 3cb78244cfe21ad7136833f4faf791ae8d4d0b5f SHA256 227be5542be8539df66eb6b7bcbe7237d40e43c8f793f8baf35c1cc35da1ff56
+AUX xchat-gnome-0.26.1-libnotify-0.7.patch 914 RMD160 493644c3d499c3b2a4c4f115126e1765e97f5772 SHA1 d3e1b07baad3ca8461b4aa6f80a565393a516cf1 SHA256 49e829261fb658b22fc453561524d76179536d0b9ae0bb204325c965881a66aa
 DIST xchat-gnome-0.26.1.tar.bz2 1938676 RMD160 ff2228aa5258a2c5a3bd7c391e83a15b2f030aff SHA1 85d205baeca5f10be9245c582ae53fbb40a4ef17 SHA256 6234f14ddc7323faaa4f10f890786a0f69da00774855412a4382b11a6158cf4b
-EBUILD xchat-gnome-0.26.1-r1.ebuild 2447 RMD160 8cb34ffa8d4dc4390d7d5e78778a9b7ce7725f81 SHA1 904a31570e5df1a80e1bd2a64b9aa378653e5abe SHA256 7e1df881ef920ae8a8ce72e0e52e3eebbad5fbd88dea4706d2e9f867c5321865
-MISC ChangeLog 10011 RMD160 cc0a075680fb8e75468b073383dc6aec18c97ce2 SHA1 1f6934be1fa821ef962a0f073e40ddfbcc23ac97 SHA256 22e04d30fe850cb5954b6e536486137e4d11422feffd5a688439104f37f37f99
+EBUILD xchat-gnome-0.26.1-r1.ebuild 2171 RMD160 fe96d5d2092f71f700f0ce3a6b327211521224bf SHA1 f3f54599ee366ca06faaf0ecf6fe78098bc43090 SHA256 4a56f5a5a51327ba0b6cae973be351438a5099482790d10254c7818cf5751b1b
+MISC ChangeLog 10323 RMD160 376b0b0819e26d7f0c864db42575e5b94de7dcf5 SHA1 e48f24bb8263e7de9c2585176a83909a1a42de78 SHA256 3250a523d375168b6512a4fd9131c74f93199d078431ba0fbdfd508cf2254dd3
 MISC metadata.xml 179 RMD160 9d422d778271bb38d696f7d9045a4445d730b2a2 SHA1 ed52b66c15b2dd699d1e0518c5418b4906db06cc SHA256 bf1c049e4bdfc84d9c5f5cfdcc493b4cdeeda9b13e9d279a705c09fd457963c5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk1aNxIACgkQ1fmVwcYIWAaXnwCg50Y0EWRcWn8lzU+Q71ggZuLV
-B30An2oklS9FQ9St00g/rHENQM4ZPNPk
-=jWsy
------END PGP SIGNATURE-----
diff --git a/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-libnotify-0.7.patch b/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..386bd0dfd955
--- /dev/null
+++ b/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-libnotify-0.7.patch
@@ -0,0 +1,27 @@
+--- plugins/notify-osd/notify-osd.c
++++ plugins/notify-osd/notify-osd.c
+@@ -27,6 +27,10 @@
+ #include "xchat-plugin.h"
+ #include "xg-plugin.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #define NOTIFY_OSD_NAME        _("On-screen display")
+ #define NOTIFY_OSD_VERSION     "0.1"
+ #define NOTIFY_OSD_DESCRIPTION _("Pops up notification of important messages when XChat-GNOME doesn't have the focus")
+@@ -67,7 +71,12 @@
+ 	gchar *escaped;
+ 
+ 	escaped = g_markup_escape_text (message, strlen(message));
+-	notify = notify_notification_new (summary, escaped, NULL, NULL);
++	notify = notify_notification_new (summary, escaped, NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	);
++#else
++	, NULL);
++#endif
+ 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 	notify_notification_set_icon_from_pixbuf (notify, notify_icon);
+ 	if (!notify_notification_show (notify, &error)) {
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
index 7874f9e0cb0e..b8f92c9bc0a6 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild,v 1.7 2011/02/15 08:19:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild,v 1.8 2011/03/09 16:18:31 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="yes"
 PYTHON_DEPEND="python? 2"
 
-inherit eutils gnome2 python toolchain-funcs
+inherit eutils gnome2 python
 
 DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
 HOMEPAGE="http://xchat-gnome.navi.cx/"
@@ -40,13 +40,6 @@ DEPEND="${RDEPEND}
 # gnome-base/gnome-common needed when doing eautoreconf
 
 pkg_setup() {
-	if [[ $(gcc-major-version) -lt 4 || (
-		$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 1 || (
-			$(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 1 && $(gcc-micro-version) -lt 3 ) ) ]]; then
-			ewarn "${P} requires >=sys-devel/gcc-4.1.3 to compile"
-			die "Please select >=sys-devel/gcc-4.1.3"
-	fi
-
 	# Per configure.ac, shm is disable because of upstream bug #565958
 	# --enable-shm
 	G2CONF="${G2CONF}
@@ -72,6 +65,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	gnome2_src_prepare
 
 	# Fix build with it documentation, bug #341173