Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/workrave/files/, app-misc/workrave/
Date: Mon, 25 Sep 2017 16:56:48
Message-Id: 1506357932.8f90da38a25d22a4990af637947bf20c799b76da.leio@gentoo
1 commit: 8f90da38a25d22a4990af637947bf20c799b76da
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 25 16:45:32 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 25 16:45:32 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f90da38
7
8 app-misc/workrave: remove old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 app-misc/workrave/Manifest | 1 -
13 .../files/workrave-1.10.15-gsettings.patch | 31 ------
14 app-misc/workrave/workrave-1.10.15.ebuild | 109 ---------------------
15 3 files changed, 141 deletions(-)
16
17 diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
18 index f270ae408f5..f4ee7f40c0f 100644
19 --- a/app-misc/workrave/Manifest
20 +++ b/app-misc/workrave/Manifest
21 @@ -1,2 +1 @@
22 -DIST workrave-1.10.15.tar.gz 6375380 SHA256 fa05bedbb32baae9d22ef2b1ac25e90bc9f1363ce588b396190b0240559f471c SHA512 e741f5d0748ffaba9c8e69bcbd67f7b371424423ec8cea81d082462e8c33751c3e322301ae0749037668dc53cab28b19ec2b162f98eb7afbbd5ab85bae33cf7e WHIRLPOOL 02c9f25f06ae0753f7edc418ade789c82bf39736b975e755265a86b2677842098efc966530cf9063401e2e63d9f1670e4fd4ba5d9b635d05faa5cc71b9146afa
23 DIST workrave-1.10.16.tar.gz 6375438 SHA256 4368306db0d06e76a3a90fc8e81b3648c1218259833b01cdc6899b1e98e5895c SHA512 f768c46a5b7dfbaca2984fabff92e64d5fd14f3b4e4d018f5a1cf46a87fbf7ec7fbaec9b660e899f7064a93338224d159b75052ed8e532ecaf507d2f249732f2 WHIRLPOOL 2352b05bc1e3fb3787e4c350ab37cb877e9fdce543e4f6e117083f46e79af673b9ae3c21e3e625ed9e1b11c1e5e4072adeff1b6b059b7cd1c6c01bc8ce3a04ac
24
25 diff --git a/app-misc/workrave/files/workrave-1.10.15-gsettings.patch b/app-misc/workrave/files/workrave-1.10.15-gsettings.patch
26 deleted file mode 100644
27 index 6203761ff7c..00000000000
28 --- a/app-misc/workrave/files/workrave-1.10.15-gsettings.patch
29 +++ /dev/null
30 @@ -1,31 +0,0 @@
31 -From e0516ff9a2a49b3fa5698ab1902b2579609c45b5 Mon Sep 17 00:00:00 2001
32 -From: Sebastian Wagner <sebix@×××××.at>
33 -Date: Fri, 13 May 2016 23:32:35 +0200
34 -Subject: [PATCH] Fix ifdef in GSettings hh, so gconf headers work
35 -
36 -Signed-off-by: Sebastian Wagner <sebix@×××××.at>
37 ----
38 - backend/src/GSettingsConfigurator.hh | 6 +++---
39 - 1 file changed, 3 insertions(+), 3 deletions(-)
40 -
41 -diff --git a/backend/src/GSettingsConfigurator.hh b/backend/src/GSettingsConfigurator.hh
42 -index 9b8c5d6..3974396 100644
43 ---- a/backend/src/GSettingsConfigurator.hh
44 -+++ b/backend/src/GSettingsConfigurator.hh
45 -@@ -17,8 +17,8 @@
46 - // along with this program. If not, see <http://www.gnu.org/licenses/>.
47 - //
48 -
49 --#ifndef GCONFCONFIGURATOR_HH
50 --#define GCONFCONFIGURATOR_HH
51 -+#ifndef GSETTINGSCONFIGURATOR_HH
52 -+#define GSETTINGSCONFIGURATOR_HH
53 -
54 - #include <string>
55 - #include <map>
56 -@@ -69,4 +69,4 @@ private:
57 - };
58 -
59 -
60 --#endif // GCONFCONFIGURATOR_HH
61 -+#endif // GGSETTINGSCONFIGURATOR_HH
62
63 diff --git a/app-misc/workrave/workrave-1.10.15.ebuild b/app-misc/workrave/workrave-1.10.15.ebuild
64 deleted file mode 100644
65 index 1524ad00ad5..00000000000
66 --- a/app-misc/workrave/workrave-1.10.15.ebuild
67 +++ /dev/null
68 @@ -1,109 +0,0 @@
69 -# Copyright 1999-2017 Gentoo Foundation
70 -# Distributed under the terms of the GNU General Public License v2
71 -
72 -EAPI=6
73 -PYTHON_COMPAT=( python2_7 )
74 -
75 -inherit autotools gnome2 python-single-r1 versionator vcs-snapshot
76 -
77 -DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
78 -HOMEPAGE="http://www.workrave.org/"
79 -MY_PV=$(replace_all_version_separators '_')
80 -SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
81 -
82 -LICENSE="GPL-3+"
83 -SLOT="0"
84 -KEYWORDS="amd64 ~ppc x86"
85 -
86 -# dbus support looks to be used only for trying to use panel applets on gnome3!
87 -IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
88 -REQUIRED_USE="ayatana? ( introspection ) ${PYTHON_REQUIRED_USE}"
89 -
90 -RDEPEND="
91 - >=dev-libs/glib-2.28.0:2
92 - >=x11-libs/gtk+-3.0:3[introspection?,X]
93 - >=dev-cpp/gtkmm-3.0.0:3.0
94 - >=dev-cpp/glibmm-2.28.0:2
95 - >=dev-libs/libsigc++-2.2.4.2:2
96 - ayatana? (
97 - >=dev-libs/libdbusmenu-0.4[gtk3,introspection]
98 - >=dev-libs/libindicator-0.4:3 )
99 - gnome? ( >=gnome-base/gnome-shell-3.6.2 )
100 - gstreamer? (
101 - media-libs/gstreamer:1.0[introspection?]
102 - media-libs/gst-plugins-base:1.0[introspection?]
103 - media-plugins/gst-plugins-meta:1.0 )
104 - introspection? ( dev-libs/gobject-introspection:= )
105 - mate? ( mate-base/mate-applets )
106 - pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
107 - xfce? (
108 - >=x11-libs/gtk+-2.6.0:2[introspection?]
109 - >=xfce-base/xfce4-panel-4.4 )
110 - x11-libs/libXScrnSaver
111 - x11-libs/libSM
112 - x11-libs/libX11
113 - x11-libs/libXtst
114 - x11-libs/libXt
115 - x11-libs/libXmu
116 - ${PYTHON_DEPS}
117 -"
118 -# dbus? (
119 -# >=sys-apps/dbus-1.2
120 -# dev-libs/dbus-glib )
121 -
122 -DEPEND="${RDEPEND}
123 - dev-python/cheetah
124 - >=dev-util/intltool-0.40.0
125 - sys-devel/autoconf-archive
126 - x11-proto/xproto
127 - x11-proto/inputproto
128 - x11-proto/recordproto
129 - virtual/pkgconfig
130 - doc? (
131 - app-text/docbook-sgml-utils
132 - app-text/xmlto )
133 - nls? ( >=sys-devel/gettext-0.17 )
134 -"
135 -
136 -pkg_setup() {
137 - python-single-r1_pkg_setup
138 -}
139 -
140 -src_unpack() {
141 - vcs-snapshot_src_unpack
142 -}
143 -
144 -src_prepare() {
145 - # Fix gstreamer slot automagic dependency, bug #563584
146 - # http://issues.workrave.org/show_bug.cgi?id=1179
147 - eapply "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch
148 -
149 - # Fix build issue, fixed in next release.
150 - eapply "${FILESDIR}"/${P}-gsettings.patch
151 -
152 - eautoreconf
153 - gnome2_src_prepare
154 -}
155 -
156 -src_configure() {
157 - # gnet ("distribution") is dead for ages and other distributions stopped
158 - # relying on it for such time too.
159 - gnome2_src_configure \
160 - --disable-dbus \
161 - --disable-distribution \
162 - --enable-exercises \
163 - --disable-experimental \
164 - --disable-gnome2 \
165 - --disable-static \
166 - --disable-xml \
167 - $(use_enable ayatana indicator) \
168 - $(use_enable doc manual) \
169 - $(use_enable gnome gnome3) \
170 - $(use_enable gstreamer) \
171 - $(use_enable introspection) \
172 - $(use_enable mate) \
173 - $(use_enable nls) \
174 - $(use_enable pulseaudio pulse) \
175 - $(use_enable test tests) \
176 - $(use_enable xfce)
177 -}