New revision. Adds local USE flags. Includes a patch for compiling under gcc-2. Exercises are enabled by default

6 files changed, 108 insertions, 1 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index 9c2def5a220f..d7c627e49ea0 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/workrave
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.6 2003/09/14 15:10:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.7 2003/10/03 19:51:30 leonardop Exp $
+
+*workrave-1.4.0-r1 (03 Oct 2003)
+
+  03 Oct 2003; L. Boshell <leonardop@gentoo.org> workrave-1.4.0-r1.ebuild:
+  Modified DEPENDs and USE flags. Now exercises are enabled by default.
+  Added patch that fixes some issues when compiling under gcc-2.
 
   14 Sep 2003; David Holm <dholm@gentoo.org> workrave-1.4.0.ebuild:
   Added to ~ppc after testing.
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index a6cac934003e..356e9c46b35e 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -2,6 +2,8 @@ MD5 6d17e6207a1066f3e02f50b82be361ac ChangeLog 916
 MD5 80c52743a9a0fa5e38fff1e7463fc9dd workrave-1.0.0.ebuild 1013
 MD5 cc5c432bc40bd47f5ae7f5fb15fc4380 workrave-1.2.2.ebuild 1324
 MD5 ac2f35b01dc0f5ce0fd333e13ff56068 workrave-1.4.0.ebuild 1683
+MD5 eac9f8d351d3f10fe4553bd01b298ce6 workrave-1.4.0-r1.ebuild 1684
 MD5 eee2df47107a2d3cb227075415706c59 files/digest-workrave-1.0.0 66
+MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0-r1 66
 MD5 5c5d367dc02b77f1af5c9fe0b0bddf6f files/digest-workrave-1.2.2 66
 MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0 66
diff --git a/app-misc/workrave/files/digest-workrave-1.4.0-r1 b/app-misc/workrave/files/digest-workrave-1.4.0-r1
new file mode 100644
index 000000000000..e50380500ef1
--- /dev/null
+++ b/app-misc/workrave/files/digest-workrave-1.4.0-r1
@@ -0,0 +1 @@
+MD5 d5bd1127b533b6d613335f7f240005ad workrave-1.4.0.tar.gz 968636
diff --git a/app-misc/workrave/files/workrave-1.4.0-gcc2_fixes.patch b/app-misc/workrave/files/workrave-1.4.0-gcc2_fixes.patch
new file mode 100644
index 000000000000..6a59419b20f0
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.4.0-gcc2_fixes.patch
@@ -0,0 +1,20 @@
+diff -NurB workrave-1.4.0-orig/src/app/gtkmm/gnome_applet/WorkraveApplet.c workrave-1.4.0/src/app/gtkmm/gnome_applet/WorkraveApplet.c
+--- workrave-1.4.0-orig/src/app/gtkmm/gnome_applet/WorkraveApplet.c	2003-10-03 04:22:24.000000000 -0500
++++ workrave-1.4.0/src/app/gtkmm/gnome_applet/WorkraveApplet.c	2003-10-03 06:56:50.000000000 -0500
+@@ -848,6 +848,7 @@
+ workrave_applet_fill(PanelApplet *applet)
+ {
+   GdkPixbuf *pixbuf = NULL;
++  GtkWidget *event_box = NULL;
+   GtkWidget *hbox = NULL;
+   BonoboUIComponent *ui = NULL;
+   
+@@ -863,7 +864,7 @@
+   bonobo_ui_component_add_listener(ui, "Quiet", mode_callback, NULL);
+ 
+   // Eventbox
+-  GtkWidget *event_box = gtk_event_box_new();
++  event_box = gtk_event_box_new();
+   applet_control->event_box = event_box;
+   gtk_widget_set_events(event_box, gtk_widget_get_events(event_box) | GDK_BUTTON_PRESS_MASK);
+   gtk_widget_show(GTK_WIDGET(event_box));
diff --git a/app-misc/workrave/metadata.xml b/app-misc/workrave/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/app-misc/workrave/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-misc/workrave/workrave-1.4.0-r1.ebuild b/app-misc/workrave/workrave-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..996613b4de30
--- /dev/null
+++ b/app-misc/workrave/workrave-1.4.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.1 2003/10/03 19:51:30 leonardop Exp $
+
+IUSE="debug gnome nls xml2"
+# Internal USE flags
+IUSE="${IUSE} no-exercises no-experimental distribution"
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://workrave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+# This is the first workrave ebuild with gnome support,
+# which should be considered experimental. The next
+# step should be converting to the gnome2 eclass.
+# <obz@gentoo.org>
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=dev-cpp/gtkmm-2
+	>=dev-libs/libsigc++-1.2
+	dev-util/pkgconfig
+	distribution? ( >=net-libs/gnet-2 )
+	gnome? ( >=gnome-base/libgnomeui-2
+		>=dev-cpp/libgnomeuimm-1.3
+		>=gnome-base/gnome-panel-2.0.1
+		>=gnome-base/libbonobo-2
+		>=gnome-base/gconf-2 )
+	nls? ( sys-devel/gettext )
+	xml2? ( dev-libs/gdome2 )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc2_fixes.patch
+	# need to remove the configure specified CFLAGS
+	sed -e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
+		< configure > configure.sed
+	sed -e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
+		< configure.sed > configure
+
+}
+
+src_compile() {
+	local myconf=""
+
+	use debug           && myconf="${myconf} --enable-debug"
+	use distribution    || myconf="${myconf} --disable-distribution"
+	use gnome           && myconf="${myconf} --enable-gnome --enable-gconf"
+	use nls             || myconf="${myconf} --disable-nls"
+	use no-exercises    || myconf="${myconf} --enable-exercises"
+	use no-experimental && myconf="${myconf} --disable-experimental"
+	use xml2            && myconf="${myconf} --enable-xml"
+
+	econf ${myconf} || die
+
+	# emake will bring nothing but trouble if you're using the `nls' USE
+	# var
+	make || die "Compilation failed"
+}
+
+src_install() {
+	einstall || die
+
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README
+}
+