4 files changed, 85 insertions, 10 deletions
diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index 08a26edf296a..3676fae7ce84 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/workrave
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.26 2005/01/01 15:30:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.27 2005/03/28 20:50:07 leonardop Exp $
+
+  28 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> workrave-1.6.2.ebuild,
+  files/workrave-1.6.2-nls_macros.patch:
+  New patch to fix a compilation problem with nls-related macros. Resolves
+  bug #86939.
 
   26 Oct 2004; Malcolm Lashley <malc@gentoo.org> workrave-1.6.2.ebuild:
   ~amd64 bug #65132
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index c90dff552f5c..7a94d57c0729 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,7 +1,8 @@
-MD5 9e0acb6206e86eb7670921f1e43c1ae7 ChangeLog 3647
+MD5 6713c781cfbe45a04446c523b45e9e05 ChangeLog 3855
 MD5 67c79a367364e0cd7ae0e3592f0c35e0 metadata.xml 530
 MD5 1b10694143b12156cfe587a9ced8319b workrave-1.4.0-r1.ebuild 2219
-MD5 62803603e6466d86e51bdb11720b1075 workrave-1.6.2.ebuild 1338
+MD5 363ccc963a59674c0de75d8937950559 workrave-1.6.2.ebuild 1404
 MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0-r1 66
-MD5 27bae5033a65f662821f75b0f95f252b files/workrave-1.4.0-gcc2_fixes.patch 899
 MD5 f8c83ac6d4824692b2baaf5acd4c9f5f files/digest-workrave-1.6.2 67
+MD5 27bae5033a65f662821f75b0f95f252b files/workrave-1.4.0-gcc2_fixes.patch 899
+MD5 76dba7475a2cf72d9fc5d11df9d35881 files/workrave-1.6.2-nls_macros.patch 1875
diff --git a/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch b/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch
new file mode 100644
index 000000000000..0a72400da1e2
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch
@@ -0,0 +1,63 @@
+diff -NurdB workrave-1.6.2-orig/common/include/nls.h workrave-1.6.2/common/include/nls.h
+--- workrave-1.6.2-orig/common/include/nls.h	2005-03-28 11:42:00.000000000 -0500
++++ workrave-1.6.2/common/include/nls.h	2005-03-28 14:40:17.000000000 -0500
+@@ -27,28 +27,23 @@
+ 
+ #include <glib/glist.h>
+ 
+-#ifdef HAVE_GNOME
+-#  include <gnome.h>
+-#else
+-#  ifdef ENABLE_NLS
+-#    include <locale.h>
+-#      include <libintl.h>
+-#      define _(String) gettext (String)
+-#      ifdef gettext_noop
+-#          define N_(String) gettext_noop (String)
+-#      else
+-#          define N_(String) (String)
+-#      endif
++#ifdef ENABLE_NLS
++#  ifdef HAVE_GNOME
++#    include <gnome.h>
+ #  else
+-/* Stubs that do something close enough.  */
+-#      define textdomain(String) (String)
+-#      define gettext(String) (String)
+-#      define dgettext(Domain,Message) (Message)
+-#      define dcgettext(Domain,Message,Type) (Message)
+-#      define bindtextdomain(Domain,Directory) (Domain)
+-#      define _(String) (String)
++#    include <locale.h>
++#    include <libintl.h>
++#    define _(String) gettext (String)
++#    ifdef gettext_noop
++#      define N_(String) gettext_noop (String)
++#    else
+ #      define N_(String) (String)
++#    endif
+ #  endif
++#else
++/* Stubs that do something close enough.  */
++#  define _(String) (String)
++#  define N_(String) (String)
+ #endif
+ 
+ #ifdef __cplusplus
+diff -NurdB workrave-1.6.2-orig/frontend/gtkmm/src/RemoteControl.cc workrave-1.6.2/frontend/gtkmm/src/RemoteControl.cc
+--- workrave-1.6.2-orig/frontend/gtkmm/src/RemoteControl.cc	2005-03-28 11:42:00.000000000 -0500
++++ workrave-1.6.2/frontend/gtkmm/src/RemoteControl.cc	2005-03-28 15:17:39.000000000 -0500
+@@ -22,12 +22,12 @@
+ 
+ #include "debug.hh"
+ 
+-#include "RemoteControl.hh"
+ 
+ #include "GUI.hh"
+ #include "AppletWindow.hh"
+ 
+ #include "Menus.hh"
++#include "RemoteControl.hh"
+ 
+ WR_INIT()
+ 
diff --git a/app-misc/workrave/workrave-1.6.2.ebuild b/app-misc/workrave/workrave-1.6.2.ebuild
index e5044e0a4aa9..5950a1acc8e1 100644
--- a/app-misc/workrave/workrave-1.6.2.ebuild
+++ b/app-misc/workrave/workrave-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.6.2.ebuild,v 1.4 2005/01/01 15:30:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.6.2.ebuild,v 1.5 2005/03/28 20:50:07 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -35,14 +35,20 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 DOCS="AUTHORS ChangeLog NEWS README"
 
-G2CONF="${G2CONF} $(use_enable distribution)"
-G2CONF="${G2CONF} $(use_enable nls)"
-G2CONF="${G2CONF} $(use_enable xml2 xml)"
-G2CONF="${G2CONF} $(use_enable gnome)"
+G2CONF="${G2CONF} $(use_enable distribution) $(use_enable nls) \
+$(use_enable xml2 xml) $(use_enable gnome)"
 
-use gnome          && G2CONF="${G2CONF} --enable-gconf"
+use gnome && G2CONF="${G2CONF} --enable-gconf"
 
 if ! use gnome && ! use xml2
 then
 	G2CONF="${G2CONF} --enable-gconf"
 fi
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Removes a few broken macros. See bug #86939.
+	epatch ${FILESDIR}/${P}-nls_macros.patch
+}