Correct gtkmm dep for 1.4.0. Removed silly USE flags.

6 files changed, 17 insertions, 64 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index dd8f051914d9..7e2ed77aed34 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/workrave
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.22 2004/08/09 16:10:41 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.23 2004/09/18 07:39:12 leonardop Exp $
+
+  17 Sep 2004; L. Boshell <leonardop@gentoo.org> workrave-1.4.0-r1.ebuild,
+  workrave-1.6.1.ebuild, workrave-1.6.2.ebuild:
+  Reworked gtkmm dep for 1.4.0-r1. See bug #63418.
+  Removed 1.6.1. See bug #52093.
+  Removed local USE flags: noexperimental, noexercises.
 
 *workrave-1.6.2 (10 Aug 2004)
 
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 37e33705a470..92bb394029c2 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,9 +1,7 @@
-MD5 c3a00fec9e9214e21b95c96d67d577d6 workrave-1.6.1.ebuild 1495
-MD5 17de6e98fa52c268850581c6a2b1e825 workrave-1.4.0-r1.ebuild 2218
-MD5 e706eafe0de88e7311ad5ce4e4ceb63d ChangeLog 3146
+MD5 ee38a449347ef20c245754b55b995712 ChangeLog 3416
 MD5 67c79a367364e0cd7ae0e3592f0c35e0 metadata.xml 530
-MD5 5e03c543b06168e8e4c98d39f1b45529 workrave-1.6.2.ebuild 1503
-MD5 27bae5033a65f662821f75b0f95f252b files/workrave-1.4.0-gcc2_fixes.patch 899
-MD5 9359bb4e6eb58db8f008fdf27b255f75 files/digest-workrave-1.6.1 67
-MD5 f8c83ac6d4824692b2baaf5acd4c9f5f files/digest-workrave-1.6.2 67
+MD5 0dcb94522fb7cc30a976dcb2fcb781c8 workrave-1.4.0-r1.ebuild 2219
+MD5 1b43c1e7ef5f66afb19d6cd06302e1a2 workrave-1.6.2.ebuild 1330
 MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0-r1 66
+MD5 f8c83ac6d4824692b2baaf5acd4c9f5f files/digest-workrave-1.6.2 67
+MD5 27bae5033a65f662821f75b0f95f252b files/workrave-1.4.0-gcc2_fixes.patch 899
diff --git a/app-misc/workrave/files/digest-workrave-1.6.1 b/app-misc/workrave/files/digest-workrave-1.6.1
deleted file mode 100644
index f1304a7b1bfb..000000000000
--- a/app-misc/workrave/files/digest-workrave-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a00ecf1ff9526fe9c625d0ce28ea95f8 workrave-1.6.1.tar.gz 1189458
diff --git a/app-misc/workrave/workrave-1.4.0-r1.ebuild b/app-misc/workrave/workrave-1.4.0-r1.ebuild
index f508d0c965a6..e678a27a845f 100644
--- a/app-misc/workrave/workrave-1.4.0-r1.ebuild
+++ b/app-misc/workrave/workrave-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.12 2004/06/28 04:18:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.13 2004/09/18 07:39:12 leonardop Exp $
 
 # This is the first workrave ebuild with gnome support,
 # which should be considered experimental. The next
@@ -21,7 +21,7 @@ IUSE="debug gnome nls xml2 noexercises noexperimental distribution"
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2
-	=dev-cpp/gtkmm-2.2.11
+	=dev-cpp/gtkmm-2.2*
 	>=dev-libs/libsigc++-1.2
 	distribution? ( >=net-libs/gnet-2 )
 	gnome? ( >=gnome-base/libgnomeui-2
diff --git a/app-misc/workrave/workrave-1.6.1.ebuild b/app-misc/workrave/workrave-1.6.1.ebuild
deleted file mode 100644
index 382f15cd3261..000000000000
--- a/app-misc/workrave/workrave-1.6.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.6.1.ebuild,v 1.5 2004/06/28 04:18:34 vapier Exp $
-
-inherit eutils gnome2
-
-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"
-# Internal USE flags: noexercises noexperimental distribution
-IUSE="gnome nls xml2 noexercises noexperimental distribution"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	=dev-cpp/gtkmm-2.2.11
-	>=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="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)"
-
-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
diff --git a/app-misc/workrave/workrave-1.6.2.ebuild b/app-misc/workrave/workrave-1.6.2.ebuild
index 90ddd3ac4ba0..39173d22ea3b 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-2004 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.1 2004/08/09 16:10:41 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.6.2.ebuild,v 1.2 2004/09/18 07:39:12 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -11,8 +11,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-# Internal USE flags: noexercises noexperimental distribution
-IUSE="gnome nls xml2 noexercises noexperimental distribution"
+# Internal USE flags: distribution
+IUSE="gnome nls xml2 distribution"
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2
@@ -41,8 +41,6 @@ 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