New release (bug #49779). Removed old ebuilds.

11 files changed, 77 insertions, 211 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index c4969f5bc34f..50cb87772268 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for app-misc/workrave
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.14 2004/04/25 22:27:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.15 2004/05/06 07:57:17 leonardop Exp $
 
+*workrave-1.6.0 (06 May 2004)
+
+  06 May 2004; L. Boshell <leonardop@gentoo.org> workrave-1.6.0.ebuild:
+  New release. Use gnome2 eclass, reworked local USE flags and several
+  style changes. Resolves bug #49779.
+  
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> workrave-1.2.2.ebuild:
   Add die following econf for bug 48950
 
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 2f6aaf6a7f70..927e9478e616 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,10 +1,8 @@
-MD5 a12c0cac9d5eeb9b748a2785baa4365a workrave-1.4.0-r1.ebuild 2247
-MD5 83d524c9b905ce733484a812bb014a8b workrave-1.4.1.ebuild 2074
 MD5 502e009e114d64c40dbc6e3012c08b27 ChangeLog 2215
+MD5 6f79e2ef82d5874024fd2e7a864c3472 workrave-1.4.0-r1.ebuild 2271
 MD5 978ca7de1eb30365afc7555b471468a6 metadata.xml 219
-MD5 70edbdca2b5b20637698cafb2be78a36 workrave-1.2.2.ebuild 1346
+MD5 8f8d50af2f7b8d6db9bd7ed669546897 workrave-1.6.0.ebuild 1676
+MD5 af335c413f7630562b1885f73fd1dbaa files/digest-workrave-1.6.0 67
+MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0-r1 66
 MD5 27bae5033a65f662821f75b0f95f252b files/workrave-1.4.0-gcc2_fixes.patch 899
-MD5 5c5d367dc02b77f1af5c9fe0b0bddf6f files/digest-workrave-1.2.2 66
-MD5 1b31fa48ef903e83bf7aa9edeb3c38ae files/digest-workrave-1.4.1 66
 MD5 1916d0da66305260c2926ef7d68f4510 files/workrave-1.4.1-gcc2_fixes.patch 2585
-MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0-r1 66
diff --git a/app-misc/workrave/files/digest-workrave-1.2.2 b/app-misc/workrave/files/digest-workrave-1.2.2
deleted file mode 100644
index b7c4b8a88844..000000000000
--- a/app-misc/workrave/files/digest-workrave-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 412e373059da6a31bdec5833ecbef878 workrave-1.2.2.tar.gz 574390
diff --git a/app-misc/workrave/files/digest-workrave-1.4.1 b/app-misc/workrave/files/digest-workrave-1.4.1
deleted file mode 100644
index 926b52d3b6d7..000000000000
--- a/app-misc/workrave/files/digest-workrave-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68f9cbb2b20e4295abed174c51d018b5 workrave-1.4.1.tar.gz 987241
diff --git a/app-misc/workrave/files/digest-workrave-1.6.0 b/app-misc/workrave/files/digest-workrave-1.6.0
new file mode 100644
index 000000000000..126e5aeb499c
--- /dev/null
+++ b/app-misc/workrave/files/digest-workrave-1.6.0
@@ -0,0 +1 @@
+MD5 3c87e892eb4670325d9004d2382cc33d workrave-1.6.0.tar.gz 1189091
diff --git a/app-misc/workrave/files/workrave-1.4.1-gcc2_fixes.patch b/app-misc/workrave/files/workrave-1.4.1-gcc2_fixes.patch
deleted file mode 100644
index 708475f3152e..000000000000
--- a/app-misc/workrave/files/workrave-1.4.1-gcc2_fixes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -NurB workrave-1.4.1-orig/src/app/gtkmm/AppletWindow.cc workrave-1.4.1/src/app/gtkmm/AppletWindow.cc
---- workrave-1.4.1-orig/src/app/gtkmm/AppletWindow.cc	2003-11-06 11:29:43.000000000 -0500
-+++ workrave-1.4.1/src/app/gtkmm/AppletWindow.cc	2003-11-06 14:20:59.000000000 -0500
-@@ -40,6 +40,7 @@
- #include "ConfiguratorInterface.hh"
- #include "CoreInterface.hh"
- #include "CoreFactory.hh"
-+#include <gtkmm/eventbox.h>
- 
- 
- //! Constructor.
-diff -NurB workrave-1.4.1-orig/src/app/gtkmm/gnome_applet/WorkraveApplet.c workrave-1.4.1/src/app/gtkmm/gnome_applet/WorkraveApplet.c
---- workrave-1.4.1-orig/src/app/gtkmm/gnome_applet/WorkraveApplet.c	2003-11-06 11:29:43.000000000 -0500
-+++ workrave-1.4.1/src/app/gtkmm/gnome_applet/WorkraveApplet.c	2003-11-06 11:30:57.000000000 -0500
-@@ -850,6 +850,7 @@
-   GdkPixbuf *pixbuf = NULL;
-   GtkWidget *hbox = NULL;
-   BonoboUIComponent *ui = NULL;
-+  GtkWidget *event_box = NULL;
-   
-   // Create menus.
-   panel_applet_setup_menu_from_file(applet, NULL, "GNOME_WorkraveApplet.xml", 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 -NurB workrave-1.4.1-orig/src/app/gtkmm/StatisticsDialog.cc workrave-1.4.1/src/app/gtkmm/StatisticsDialog.cc
---- workrave-1.4.1-orig/src/app/gtkmm/StatisticsDialog.cc	2003-11-06 11:29:43.000000000 -0500
-+++ workrave-1.4.1/src/app/gtkmm/StatisticsDialog.cc	2003-11-06 13:14:35.000000000 -0500
-@@ -35,6 +35,7 @@
- #include <unistd.h>
- #include <assert.h>
- #include <sstream>
-+#include <stdio.h>
- 
- #include <gtkmm/notebook.h>
- #include <gtkmm/calendar.h>
-diff -NurB workrave-1.4.1-orig/src/app/shared/Exercise.cc workrave-1.4.1/src/app/shared/Exercise.cc
---- workrave-1.4.1-orig/src/app/shared/Exercise.cc	2003-11-06 11:29:43.000000000 -0500
-+++ workrave-1.4.1/src/app/shared/Exercise.cc	2003-11-06 13:06:58.000000000 -0500
-@@ -28,6 +28,7 @@
- 
- #include <unistd.h>
- #include <assert.h>
-+#include <stdio.h>
- 
- #include <glib.h>
- 
-@@ -274,9 +275,11 @@
- Exercise::parse_exercises(const char *file_name,
-                           std::list<Exercise> &exe)
- {
-+  FILE *stream = NULL;
-+  
-   TRACE_ENTER_MSG("ExercisesParser::get_exercises", file_name);
-   
--  FILE *stream = fopen(file_name, "rb");
-+  stream = fopen(file_name, "rb");
-   if (stream)
-     {
-       GMarkupParser parser;
diff --git a/app-misc/workrave/metadata.xml b/app-misc/workrave/metadata.xml
index 9ee05a43f8e1..f7f59bc4221b 100644
--- a/app-misc/workrave/metadata.xml
+++ b/app-misc/workrave/metadata.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<maintainer><email>leonardop@gentoo.org</email></maintainer>
+  <herd>gnome</herd>
+  <maintainer>
+    <email>leonardop@gentoo.org</email>
+    <name>Leonardo Boshell</name>
+  </maintainer>
+  <longdescription>
+    Workrave is a program that assists in the recovery and prevention
+    of Repetitive Strain Injury (RSI). The program frequently alerts
+    you to take micro-pauses, rest breaks and restricts you to your
+    daily limit.
+  </longdescription>
 </pkgmetadata>
diff --git a/app-misc/workrave/workrave-1.2.2.ebuild b/app-misc/workrave/workrave-1.2.2.ebuild
deleted file mode 100644
index 50abd817c924..000000000000
--- a/app-misc/workrave/workrave-1.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.2.2.ebuild,v 1.6 2004/04/25 22:27:19 agriffis Exp $
-
-DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
-HOMEPAGE="http://workrave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls xml2"
-KEYWORDS="x86"
-
-DEPEND="dev-lang/perl
-	>=dev-libs/libsigc++-1.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=dev-cpp/gtkmm-2
-	xml2? ( dev-libs/gdome2 )
-	nls? ( sys-devel/gettext )"
-#	gnome? ( >=gnome-base/libgnomeui-2 )
-
-src_compile() {
-	local myconf=""
-
-	# Right now, options like --disable-gui-gtk and --enable-gui-text seem
-	# to be broken. Aditionally, gnome support depends now on
-	# gnome-extra/libgnomeuimm which is masked right now, so we're not
-	# going to try and build it at the moment.
-	use nls   || myconf="--disable-nls"
-	#use gnome && myconf="${myconf} --enable-gnome --enable-gconf"
-	use xml2  && myconf="${myconf} --enable-xml"
-
-	econf ${myconf} || die "econf failed"
-
-	# emake will bring nothing but trouble if you're using the `nls' USE
-	# var
-	make || die "Compilation failed"
-}
-
-src_install() {
-	einstall
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README*
-}
diff --git a/app-misc/workrave/workrave-1.4.0-r1.ebuild b/app-misc/workrave/workrave-1.4.0-r1.ebuild
index 7fa69d8795c2..45d817262445 100644
--- a/app-misc/workrave/workrave-1.4.0-r1.ebuild
+++ b/app-misc/workrave/workrave-1.4.0-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2004 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.6 2004/03/16 11:26:05 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.7 2004/05/06 07:57:17 leonardop Exp $
 
 inherit eutils
 
-IUSE="debug gnome nls xml2"
-# Internal USE flags
-IUSE="${IUSE} no-exercises no-experimental distribution"
+# Internal USE flags: noexercises noexperimental distribution
+IUSE="debug gnome nls xml2 noexercises noexperimental distribution"
 
 DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
 HOMEPAGE="http://workrave.sourceforge.net/"
diff --git a/app-misc/workrave/workrave-1.4.1.ebuild b/app-misc/workrave/workrave-1.4.1.ebuild
deleted file mode 100644
index a4e798399375..000000000000
--- a/app-misc/workrave/workrave-1.4.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2004 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.1.ebuild,v 1.3 2004/03/16 11:26:05 leonardop Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=dev-cpp/gtkmm-2
-	>=dev-libs/libsigc++-1.2
-	distribution? ( >=net-libs/gnet-2 )
-	gnome? ( >=gnome-base/libgnomeui-2
-		>=dev-cpp/libgnomeuimm-2
-		>=gnome-base/gnome-panel-2.0.10
-		>=gnome-base/libbonobo-2
-		>=gnome-base/gconf-2 )
-	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/gdome2 )
-	!xml2? ( !gnome? ( >=gnome-base/gconf-2 ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gcc2_fixes.patch
-
-	# need to remove the configure specified CFLAGS
-	sed -i \
-		-e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
-		-e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
-		configure
-}
-
-src_compile() {
-	local myconf=""
-
-	use debug           && myconf="${myconf} --enable-debug"
-	use distribution    || myconf="${myconf} --disable-distribution"
-	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"
-
-	if [ `use gnome` ]
-	then
-		myconf="${myconf} --enable-gconf"
-	else
-		myconf="${myconf} --disable-gnome"
-	fi
-
-	if [ ! `use gnome` ] && [ ! `use xml2` ]
-	then
-		myconf="${myconf} --enable-gconf"
-	fi
-
-	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
-}
-
diff --git a/app-misc/workrave/workrave-1.6.0.ebuild b/app-misc/workrave/workrave-1.6.0.ebuild
new file mode 100644
index 000000000000..435345cb1475
--- /dev/null
+++ b/app-misc/workrave/workrave-1.6.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.6.0.ebuild,v 1.1 2004/05/06 07:57:17 leonardop Exp $
+
+inherit eutils gnome2
+
+# Internal USE flags: noexercises noexperimental distribution
+IUSE="debug gnome nls xml2 noexercises noexperimental distribution"
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://workrave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=dev-cpp/gtkmm-2
+	>=dev-libs/libsigc++-1.2
+	distribution? ( >=net-libs/gnet-2 )
+	gnome? ( >=gnome-base/libgnomeui-2
+		>=dev-cpp/libgnomeuimm-2
+		>=gnome-base/gnome-panel-2.0.10
+		>=gnome-base/libbonobo-2
+		>=gnome-base/gconf-2 )
+	nls? ( sys-devel/gettext )
+	xml2? ( dev-libs/gdome2 )
+	!xml2? ( !gnome? ( >=gnome-base/gconf-2 ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README"
+
+G2CONF="${G2CONF} $(use_enable distribution)"
+G2CONF="${G2CONF} $(use_enable nls)"
+G2CONF="${G2CONF} $(use_enable xml2 xml)"
+G2CONF="${G2CONF} $(use_enable gnome)"
+
+use gnome          && G2CONF="${G2CONF} --enable-gconf"
+use noexercises    && G2CONF="${G2CONF} --disable-exercises"
+use noexperimental && G2CONF="${G2CONF} --disable-experimental"
+
+if [ ! `use gnome` ] && [ ! `use xml2` ]
+then
+	G2CONF="${G2CONF} --enable-gconf"
+fi
+