Version bump

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 60 insertions, 36 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index 41acb59528de..1e50dd550321 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/workrave
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.97 2014/07/23 15:13:29 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.98 2015/01/14 11:10:45 pacho Exp $
+
+*workrave-1.10.6 (14 Jan 2015)
+
+  14 Jan 2015; Pacho Ramos <pacho@gentoo.org> +workrave-1.10.6.ebuild,
+  -workrave-1.10.ebuild, metadata.xml:
+  Version bump
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> workrave-1.10.1.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 6d95f87a4249..33f5b7bb43b4 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -2,26 +2,16 @@
 Hash: SHA256
 
 AUX workrave-1.10.1-desktop.patch 400 SHA256 5a94ae8cb15b6821b8d8ff77646d857b6bed9ffa3ead946092e0aebade75223c SHA512 03007f23a37d97ebc09ddc34cbb468a1f32af3e110ba0ea71a5491768393e5f06a88a3f79e76c6252420f67a51769fc9d6484557739d7f2b1597179c80db9c6c WHIRLPOOL e9b22d4e28636de4e434f2a289cfc348fd9fb2de885a073d231d07469c134cd52f9fe6b4f3cfe4f1a33629e1f29eca8d5261eb64f2e98d551a725f2aa21f939c
+DIST v1_10_6.tar.gz 6444740 SHA256 f8699fbbfef7f3de2226f5f7dc4c74d98de3b59bfed4c6dac70bb231ec405760 SHA512 5c2a7dac1614751edf925eefa945e08e0b2fb318903b12fc8d4acde0b6027ecb534c90933da14796edc958f0d9a2f892815fddea9ab41ac921756fc5577acd8e WHIRLPOOL 91c47a66f0ab60f2560b103ef7ac6591088296b470d3403d6d9f511d44e361fc6841d9fda85d9c24d6c60595ea66b2a18ebb34c806d3ab4b465895a427a6d819
 DIST workrave-1.10.1.tar.gz 6800197 SHA256 6ef89aebd278e27d3b73896485e7d8aaef415e7d18318d3bb7ba0d0507bd48de SHA512 4f721ebaceb43f542c25b0eb3fcd2e2d205290c982ddb57628c56bfed0c63fdde85adf304b4fdaf07908e31e8e31942ffdf17a9f1f0a3e62fec71aa5722d946a WHIRLPOOL f365ba528ef56cc6475dc7898b98d08532724a5cebab81e0a7b25534eaa78871a7ac2e7d7d016fd6812099031355d4950b7eecd671befa2127295cbc68dca498
-DIST workrave-1.10.tar.gz 6800389 SHA256 b6733907ed0f2d42f234a0ce4f000b03329c1c50b3028defcb892e6b3a4541ba SHA512 3a73d0fe8ba85dd6396666f6ea00e7a2992038d1eba06d97741ffc7ad43afef5528995fee24d9f306d8c207ef924d677c8a3223ac83f68126284d8a02c328506 WHIRLPOOL c53632b4ef7f014c4bb8783450b5f076f96a19eb0b26a96258574d3809a58e827424a140abba1a7a5ef300a9363dd43f64e256456746b577920a0542d8eafea4
 EBUILD workrave-1.10.1.ebuild 1757 SHA256 1bdd8094fbe805da2ca4e64fb941a32f3840101278ca99288def96ea5fa70d98 SHA512 50a91fb0626f829d7cbd4137fd685f0ba26f7224373cb2b6080605c61bc76283aadf5bc6e3d8728eae62d25c5e6f94629df53e3dee43478c7606ec83ab8cfa7d WHIRLPOOL f314a1b5b296181cf37f631931397ee6749273bfcb38c940ba74ed47c991c42f4dce71cac42287f30cbd64405196fed16027753c51e7ceee1ad62c3f97491235
-EBUILD workrave-1.10.ebuild 1638 SHA256 595f7d3e6b79d04545ff33ed3a1e41c247cb2f260d05531c05e41a13189179c4 SHA512 e18405576880f2dd5f2edd201ae98828631e4e0d8b7e6085e925680f983558d47f5e7b07ae308012a0928b062731abd3a15170163fc0cbbca05e1b702f1753ad WHIRLPOOL 3b56146207b7d806afd48ac1e4b5579015c786497fc7a25addd9581d098a12a3989e4680435ae601b292135263af31c280f557e8b83964eee82663e8601b3406
-MISC ChangeLog 15136 SHA256 4537381683ac9b0ccf9038bd83881768ff6dd95c29c6cc236f8211ceb943fa16 SHA512 1291f427f9841e13740834546bfef7b4b64ae478a546c8e708d3f5bb364c77586dd5e43d6ff961f5cccc77d2ce2d22ab3a1df821b391a2843aad59d81910aca2 WHIRLPOOL 5f3b50411ff5955551d9dc30b947ca709302da79c4931a31c667dd07b8214a67fed929daa28a194566a31f5a5a488c60cac0d37d60add0d7e7e1c583782a8a53
-MISC metadata.xml 520 SHA256 f614aee5f506fa3a49b3a4e9e8a20940c1b9795eca18c6d444b26048aa1c6fbc SHA512 800b544b43f126fd83552cc58fb40f7e4f597a5080184aeb85042445f1e26d7d8c92ae9522f0794ed078cde18cb9f1e9f9515e5503c9c39c052a84592fb7d6cd WHIRLPOOL 3e1062431f70083756799b7ad253f61c17307a12d8c9094126a6117d0d55a1ac5f11bd21780c8f4806059f41c2adff2cac5e94401fdb49f8266e0044bd940bc7
+EBUILD workrave-1.10.6.ebuild 2394 SHA256 c486bff61c8b5b209b2d962174e2ca50f2574cd27db5e2031bf33d4be28ff9ff SHA512 bade1cfe396b4f7e56303cb7d357b47ae1ab1735cf170489f890682354911839b35acf9165414bae62e3ca9c94461e2abea0f187f05c867340ab17060f41a7b1 WHIRLPOOL b4de130dc9bd2f501df0638d1c5c6fcc4f41a7eb9085a9b4c38f20bf86c346b9c402a61c6c0e352f9b186bd3c74cd7e8d4ae084c09b23c6c89c73ad7ea47a9bb
+MISC ChangeLog 15296 SHA256 658120ed82c2da5cdad2998baab0aeaff83bfa1c6450317cfe827e6d736bd4cb SHA512 ce660b083c4cd623990a2be7f1c80b34c588c12b0bd0c1d74d773e07b1f3a6a436b8f89505e693c808a87117f00e8bac2783098470d6f6217175efbb22900ce2 WHIRLPOOL d50f1776790cdabec1610abee25da14f70de0c6d6b5f268947545c8c9f975ba09d6fc893c893e2165f1232f53b67efa4185a5f03d84fc4f519fc4c3703700e6b
+MISC metadata.xml 622 SHA256 14848ad965f69fb451aa9bdf728d19aa01acecbb75338c4168859fe2e9b11587 SHA512 d5ff9d9db0236d34f4f5a84565a8054d2dec36742f0a6ee1cdf97f06d5e08463fb2b561a6d72381344886ccb98ec853814322eee3a155d0c36c0dc15c7efc927 WHIRLPOOL 7cd3f6ef43dfbc89c84b53b9c1f1ab1deed3dc713f603ba07052172a4b8da2629fd51268c27b2c8eb677422b95a70ff8688bb9506e10c8159bd8b818035301a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9EaAAoJELp701BxlEWfM0AP/3HajBPiWMAivOcmQHim0hLQ
-YqvErx5xi/bdagndBEtyn7hGcSQ4Ew9UrpMjNkQczIvFSYyE6dyc9IERtWrLyEmV
-JGbmVNojJTydxZswVdYM1avhdMgY5YYg5W9WWhuRHQsvYW9F24pWCGqeTIvgyLFN
-sR4q0lsaUv+EFw5rp+0WELVI0bYtZcwBaZwx+Ck/RE+k4vfkfs+ulMMSAEgwO7fb
-ctzNCFCDq5rl45DyTcJUkMcLueBOinQPnE/FEoFsulYbsgrTYRNO5D0nOoflzoUh
-goDCsZ5dvoxhEssVXOw7MsfcB7F2y4vTI7UwsJZ4u5a6KT+U8qkdsRfPhVN4P8MM
-HQbDZNlbo4DWUUthkm5h+sKS6/FuwY6dl5PHjRasPPg0aArCsI7ryjWbO8POAwcp
-6RQmRdvOa32w4ee4bQNz1a3S3TrGp+vW85VBdhFdHZugKAp48IhTAP5tK4+jfeLA
-smNAzH03+guEu/Dd88SI0akjJQDj4xwIbjGRfqVhkpEbUhz8rUajan/FtgZTCOjU
-4r3UbVd08rkXNSqcCS51sIC0xpCS7iT62WD/7uUMwJaoZvnX+NYQwrkGBuLOiiNv
-EYwNmzlFuVcHdkNFlXDAmS6VsScpB8SzSVvwmB2/LidiC6FLM+l2uWerUnseGGNP
-c4YarLkLNHbIDn0i71OU
-=NDVv
+iEYEAREIAAYFAlS2TrgACgkQCaWpQKGI+9S+LwCfbnbNYYV8llpfkGCcesMEGOLk
+rEkAnRioKLoK2mnoKMZPNHMXGsyqBqn1
+=mPVv
 -----END PGP SIGNATURE-----
diff --git a/app-misc/workrave/metadata.xml b/app-misc/workrave/metadata.xml
index 2aa813d4252f..d5b1a9a499d8 100644
--- a/app-misc/workrave/metadata.xml
+++ b/app-misc/workrave/metadata.xml
@@ -2,14 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="distribution">Enable networking. See
+	http://www.workrave.org/features/</flag>
+	<flag name="mate">Add support for MATE panel</flag>
+	<flag name="xfce">Add support for XFCE panel</flag>
+</use>
 <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>
-<use>
-  <flag name="distribution">Enable networking.
-    See http://www.workrave.org/features/</flag>
-</use>
 </pkgmetadata>
diff --git a/app-misc/workrave/workrave-1.10.ebuild b/app-misc/workrave/workrave-1.10.6.ebuild
index 60a3fa788def..04e3d53434f3 100644
--- a/app-misc/workrave/workrave-1.10.ebuild
+++ b/app-misc/workrave/workrave-1.10.6.ebuild
@@ -1,21 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.10.ebuild,v 1.6 2014/02/22 21:00:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.10.6.ebuild,v 1.1 2015/01/14 11:10:45 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="yes"
 PYTHON_COMPAT=( python2_{6,7} )
 
-inherit gnome2 python-single-r1
+inherit autotools eutils gnome2 python-single-r1 versionator
 
 DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
 HOMEPAGE="http://www.workrave.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+# SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+MY_PV=$(replace_all_version_separators '_')
+SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus doc distribution gstreamer nls pulseaudio test"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# dbus support looks to be used only for trying to use panel applets on gnome3!
+IUSE="ayatana doc distribution gnome gstreamer mate nls pulseaudio test xfce"
 
 RDEPEND="
 	>=dev-libs/glib-2.28.0:2
@@ -23,20 +28,30 @@ RDEPEND="
 	>=dev-cpp/gtkmm-3.0.0:3.0
 	>=dev-cpp/glibmm-2.28.0:2
 	>=dev-libs/libsigc++-2.2.4.2:2
-	dbus? (
-		>=sys-apps/dbus-1.2
-		dev-libs/dbus-glib )
+	ayatana? (
+		>=dev-libs/libdbusmenu-0.4:3[gtk]
+		>=dev-libs/libindicator-0.4:3 )
 	distribution? ( >=net-libs/gnet-2 )
+	gnome? ( >=gnome-base/gnome-shell-3.6.2 )
 	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10 )
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	mate? ( mate-base/mate-applets )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	xfce? (
+		>=x11-libs/gtk+-2.6.0:2
+		>=xfce-base/xfce4-panel-4.4 )
+	x11-libs/libXScrnSaver
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/libXt
 	x11-libs/libXmu
 "
+#        dbus? (
+#                >=sys-apps/dbus-1.2
+#                dev-libs/dbus-glib )
+
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.0
 	x11-proto/xproto
@@ -54,16 +69,27 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
 	gnome2_src_configure \
+		--disable-dbus \
+		--enable-exercises \
 		--disable-experimental \
+		--disable-gnome2 \
 		--disable-static \
 		--disable-xml \
-		$(use_enable dbus) \
+		$(use_enable ayatana indicator) \
 		$(use_enable doc manual) \
 		$(use_enable distribution) \
+		$(use_enable gnome gnome3) \
 		$(use_enable gstreamer) \
+		$(use_enable mate) \
 		$(use_enable nls) \
 		$(use_enable pulseaudio pulse) \
-		$(use_enable test tests)
+		$(use_enable test tests) \
+		$(use_enable xfce)
 }