xml2 -> xml (bug #116346). Pruning old ebuild/patch.

(Portage version: 2.1_pre7-r5)

6 files changed, 13 insertions, 114 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index 4430363aac5f..fadbb8dae90d 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/workrave
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.36 2006/02/24 00:43:57 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.37 2006/04/09 19:19:17 leonardop Exp $
+
+  09 Apr 2006; Leonardo Boshell <leonardop@gentoo.org>
+  workrave-1.8.1-r1.ebuild, workrave-1.8.2.ebuild:
+  Changed 'xml2' USE flag for 'xml' (bug #116346).
 
   24 Feb 2006; John N. Laliberte <allanonjl@gentoo.org>
   workrave-1.4.0-r1.ebuild, workrave-1.8.1-r1.ebuild, workrave-1.8.2.ebuild:
diff --git a/app-misc/workrave/files/digest-workrave-1.4.0-r1 b/app-misc/workrave/files/digest-workrave-1.4.0-r1
deleted file mode 100644
index e50380500ef1..000000000000
--- a/app-misc/workrave/files/digest-workrave-1.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6a59419b20f0..000000000000
--- a/app-misc/workrave/files/workrave-1.4.0-gcc2_fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/workrave-1.4.0-r1.ebuild b/app-misc/workrave/workrave-1.4.0-r1.ebuild
deleted file mode 100644
index 699dff8ef410..000000000000
--- a/app-misc/workrave/workrave-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# 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.16 2006/02/24 00:43:57 allanonjl Exp $
-
-# 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>
-
-inherit eutils
-
-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"
-# Internal USE flags: noexercises noexperimental distribution
-IUSE="debug gnome nls xml2 noexercises noexperimental distribution"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	=dev-cpp/gtkmm-2.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 )
-	xml2? ( dev-libs/gdome2 )
-	!xml2? ( !gnome? ( >=gnome-base/gconf-2 ) )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	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 noexercises    || myconf="${myconf} --enable-exercises"
-	use noexperimental && 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 AUTHORS ChangeLog NEWS README
-}
diff --git a/app-misc/workrave/workrave-1.8.1-r1.ebuild b/app-misc/workrave/workrave-1.8.1-r1.ebuild
index fc27b911f447..e252cbf5183c 100644
--- a/app-misc/workrave/workrave-1.8.1-r1.ebuild
+++ b/app-misc/workrave/workrave-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.1-r1.ebuild,v 1.6 2006/02/24 00:43:57 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.1-r1.ebuild,v 1.7 2006/04/09 19:19:17 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="arts dbus distribution gnome kde nls xml2"
+IUSE="arts dbus distribution gnome kde nls xml"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/gconf-2
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=dev-libs/libsigc++-2.0
 	distribution? ( >=net-libs/gnet-2 )
 	dbus? ( >=sys-apps/dbus-0.22 )
-	xml2? ( dev-libs/gdome2 )
+	xml? ( dev-libs/gdome2 )
 	kde? (
 		=x11-libs/qt-3*
 		kde-base/kdelibs )
@@ -45,7 +45,7 @@ pkg_setup() {
 	G2CONF="--enable-gconf \
 		$(use_enable distribution)  \
 		$(use_enable nls)           \
-		$(use_enable xml2 xml)      \
+		$(use_enable xml)           \
 		$(use_enable gnome)         \
 		$(use_enable gnome gnomemm) \
 		$(use_enable dbus)          \
diff --git a/app-misc/workrave/workrave-1.8.2.ebuild b/app-misc/workrave/workrave-1.8.2.ebuild
index cfaab6227876..3c58c299fe81 100644
--- a/app-misc/workrave/workrave-1.8.2.ebuild
+++ b/app-misc/workrave/workrave-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.2.ebuild,v 1.2 2006/02/24 00:43:57 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.2.ebuild,v 1.3 2006/04/09 19:19:17 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="arts dbus distribution gnome kde nls xml2"
+IUSE="arts dbus distribution gnome kde nls xml"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/gconf-2
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2
 		>=gnome-base/orbit-2.8.3 )
 	distribution? ( >=net-libs/gnet-2 )
 	dbus? ( >=sys-apps/dbus-0.22 )
-	xml2? ( dev-libs/gdome2 )
+	xml? ( dev-libs/gdome2 )
 	kde? (
 		=x11-libs/qt-3*
 		kde-base/kdelibs )
@@ -55,7 +55,7 @@ pkg_setup() {
 	G2CONF="--enable-gconf \
 		$(use_enable distribution)  \
 		$(use_enable nls)           \
-		$(use_enable xml2 xml)      \
+		$(use_enable xml)           \
 		$(use_enable gnome)         \
 		$(use_enable gnome gnomemm) \
 		$(use_enable dbus)          \