Version bump, remove old.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 33 insertions, 97 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index ed1cffab00b1..1173d07ce83b 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/workrave
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.76 2011/03/22 18:46:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.77 2011/06/08 17:42:27 pacho Exp $
+
+*workrave-1.9.4 (08 Jun 2011)
+
+  08 Jun 2011; Pacho Ramos <pacho@gentoo.org> -workrave-1.9.1-r1.ebuild,
+  -workrave-1.9.2.ebuild, +workrave-1.9.4.ebuild:
+  Version bump, remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> workrave-1.9.3.ebuild:
   Marking workrave-1.9.3 ppc stable for bug 353436
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index a7aff79d3ea6..e03c21a35da0 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX workrave-1.9.1-gtkmm_api.patch 1041 RMD160 436431b265b109753cf221fd40afe4c04bcad8c5 SHA1 cd09599a441a60a15b43350a8dc2de55c507ab2d SHA256 beb7b94a9812114135ea75379e69c32f83a93c030a152050e4acec5ab93af457
 AUX workrave-1.9.1-nogst-crash.patch 581 RMD160 47cb28e0b754e29f4fdef5f4d6b01679ea990033 SHA1 166f906d0246e6ea391343f0fe4ae7488cb5394f SHA256 99df167e289fdd2d6fa8399fa03ac78abb46e3585e6aadc605c424563791eab9
-DIST workrave-1.9.1.tar.gz 6594737 RMD160 1a1215358b0f47a6ab3535caa9aa746dcf071abf SHA1 aaf093bd4dbfaaf661b5ca277a01e915d3a33cfb SHA256 5c23af4b36fc6dd27b0f1b58373868d925fb91ec9ff40b7c7bbcec52a1b28ab9
-DIST workrave-1.9.2.tar.gz 6685860 RMD160 5fe7ed7a773b838a9c6e4285caeb97ec23e11ef5 SHA1 60f7bfeccf88094b3400402604cd0b3356aff87f SHA256 7607a8a7de644f99a744cb10c648814fd9781370a81b2fb85d26e9df292c19ae
 DIST workrave-1.9.3.tar.gz 6703225 RMD160 0033b222792ef4a08809e2ce6e6566c81f6c1c7b SHA1 9f2eab0a7033d9de96869921e709584c6a87bdc5 SHA256 cd1c074bd9d15a62475bd04ad1e9c176e778ed24e437f8bd11eed76fe016ec77
-EBUILD workrave-1.9.1-r1.ebuild 2042 RMD160 2814dd5f3be84344c448d3fb1b93f5b3c563b151 SHA1 124ce90f936eddf1ff9026d15bd085e4834a885e SHA256 d893e7007d70650134838781a9e0968904cd1aa0614bd66c8e121826ef533257
-EBUILD workrave-1.9.2.ebuild 1765 RMD160 3e48ff393c15fba9f61816c95efef1349b0cafe8 SHA1 d353b83a47ad2a0c6cf39c2d62628b8bb93d629c SHA256 d645c9c88176e8b89948675a9ec4ec7b32857e1f68aafdee017612cd9f769e2f
+DIST workrave-1.9.4.tar.gz 6748495 RMD160 f8b5a867f1c709b1572736e868082859033b8e6b SHA1 2fc1c8ba067dd9721adb94d1f836a0b7cc2c6c65 SHA256 ce1efa57a37192029c4dcbe8a0ac2b893b2286c42828f19b0fb86867cbbcde1a
 EBUILD workrave-1.9.3.ebuild 1828 RMD160 27a9bfd9eb5c267a90dc19e09650ee4253a78241 SHA1 84a92090bfced2a5a4fc0dca39d6298ba218cf50 SHA256 3c5e3b65c8ca0aaa2909a9a235f71eddeefed2d3ace4bf431edb9c4f2430c022
-MISC ChangeLog 12375 RMD160 5d74bcc351a3d21e507c949499b936b4cf639226 SHA1 ce80fe874748b0bc29c9b3a8c720b38f7ac84101 SHA256 ed5f2278f81087c72be7b09b7526ac0234abb63bdb65b31b5b9dced6f2cdacb6
+EBUILD workrave-1.9.4.ebuild 1874 RMD160 9a3d65b81a37d7ecf91e27f513cad66357a86dd9 SHA1 4cde646a5757b37d31941a659ff077c37315b8bf SHA256 4fd17f03b40dafe063b3c0c8d777557ddb5abfd99a3bfa051068758c6ccadcb9
+MISC ChangeLog 12557 RMD160 edb278653342466af8b2cda0f52cdab044027347 SHA1 78343aae6c1d1eca673bfbfedb5cec79f94f2f3e SHA256 34570a11f5e272d46af0a71b4c3d713806ca992ae9a68a8ee278493f706f9595
 MISC metadata.xml 520 RMD160 36e3d789618562107f56faf8171d4c3adcd362ea SHA1 2a3ef0c57f60f739323f6422d9ebc443ed5514b6 SHA256 f614aee5f506fa3a49b3a4e9e8a20940c1b9795eca18c6d444b26048aa1c6fbc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3vtIkACgkQCaWpQKGI+9R6lwCfdva8xq+zgfCOoRCy3M07hsEL
+Fy4AnRGU44bsu/upCXq0jL0Ts1y9DALA
+=rHNE
+-----END PGP SIGNATURE-----
diff --git a/app-misc/workrave/workrave-1.9.1-r1.ebuild b/app-misc/workrave/workrave-1.9.1-r1.ebuild
deleted file mode 100644
index 6e8a82ecbc9a..000000000000
--- a/app-misc/workrave/workrave-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.1-r1.ebuild,v 1.7 2011/03/16 09:24:00 nirbheek Exp $
-
-EAPI="2"
-
-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="amd64 ppc x86"
-IUSE="dbus doc distribution gnome gstreamer nls test xml"
-
-RDEPEND=">=dev-libs/glib-2.10:2
-	>=gnome-base/gconf-2:2
-	>=x11-libs/gtk+-2.8:2
-	>=dev-cpp/gtkmm-2.10:2.4
-	>=dev-cpp/glibmm-2.10:2
-	>=dev-libs/libsigc++-2
-	dbus? (
-		>=sys-apps/dbus-1.2
-		dev-libs/dbus-glib )
-	distribution? ( net-libs/gnet:2 )
-	gnome? (
-		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
-		>=gnome-base/libbonobo-2
-		>=gnome-base/orbit-2.8.3 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10 )
-	xml? ( dev-libs/gdome2 )
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libXmu"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/recordproto
-	dev-python/cheetah
-	>=dev-util/pkgconfig-0.9
-	doc? (
-		app-text/docbook-sgml-utils
-		app-text/xmlto )
-	nls? ( sys-devel/gettext )"
-# Currently freezes workrave
-
-DOCS="AUTHORS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--without-arts
-		--disable-kde
-		--enable-gconf
-		$(use_enable dbus)
-		$(use_enable doc manual)
-		$(use_enable distribution)
-		$(use_enable gnome)
-		$(use_enable gstreamer)
-		$(use_enable nls)
-		$(use_enable test tests)
-		$(use_enable xml)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltool tests
-	echo "frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in" >> po/POTFILES.skip
-
-	# Fix crash when building without gstreamer support; bug #316637
-	epatch "${FILESDIR}/${P}-nogst-crash.patch"
-
-	# Fix build with new gtkmm due API break reported in bug #327471
-	epatch "${FILESDIR}/${P}-gtkmm_api.patch"
-}
diff --git a/app-misc/workrave/workrave-1.9.2.ebuild b/app-misc/workrave/workrave-1.9.4.ebuild
index 4bbda26eed5d..0bd42db02eac 100644
--- a/app-misc/workrave/workrave-1.9.2.ebuild
+++ b/app-misc/workrave/workrave-1.9.4.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.2.ebuild,v 1.4 2011/03/16 09:24:00 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.4.ebuild,v 1.1 2011/06/08 17:42:27 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="2:2.5"
 
 inherit eutils gnome2 python
 
@@ -16,22 +18,22 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="dbus doc distribution gnome gstreamer nls pulseaudio test xml"
 
 RDEPEND=">=dev-libs/glib-2.10:2
-	>=gnome-base/gconf-2:2
+	>=gnome-base/gconf-2
 	>=x11-libs/gtk+-2.8:2
 	>=dev-cpp/gtkmm-2.10:2.4
 	>=dev-cpp/glibmm-2.10:2
-	>=dev-libs/libsigc++-2
+	>=dev-libs/libsigc++-2:2
 	dbus? (
 		>=sys-apps/dbus-1.2
 		dev-libs/dbus-glib )
-	distribution? ( net-libs/gnet:2 )
+	distribution? ( >=net-libs/gnet-2 )
 	gnome? (
 		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 		>=gnome-base/libbonobo-2
 		>=gnome-base/orbit-2.8.3 )
 	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10 )
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 	xml? ( dev-libs/gdome2 )
 	x11-libs/libSM
@@ -51,13 +53,15 @@ DEPEND="${RDEPEND}
 		app-text/xmlto )
 	nls? ( sys-devel/gettext )"
 
-DOCS="AUTHORS NEWS README TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS NEWS README TODO"
 	G2CONF="${G2CONF}
 		--without-arts
 		--disable-kde
 		--enable-gconf
+		--disable-x11-monitoring-fallback
+		--disable-gnome3
+		--disable-experimental
 		$(use_enable dbus)
 		$(use_enable doc manual)
 		$(use_enable distribution)