Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/
Date: Sun, 29 May 2016 12:42:40
Message-Id: 1464525669.7acce8434004d1356015e9a26c2871c609859d1a.pacho@gentoo
1 commit: 7acce8434004d1356015e9a26c2871c609859d1a
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 29 11:48:26 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun May 29 12:41:09 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7acce843
7
8 gnome-extra/cinnamon-settings-daemon: Drop old
9
10 Package-Manager: portage-2.3.0_rc1
11
12 gnome-extra/cinnamon-settings-daemon/Manifest | 2 -
13 .../cinnamon-settings-daemon-2.6.3.ebuild | 105 ---------------------
14 .../cinnamon-settings-daemon-2.8.2-r1.ebuild | 105 ---------------------
15 3 files changed, 212 deletions(-)
16
17 diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
18 index 7a22736..9c248ab 100644
19 --- a/gnome-extra/cinnamon-settings-daemon/Manifest
20 +++ b/gnome-extra/cinnamon-settings-daemon/Manifest
21 @@ -1,3 +1 @@
22 -DIST cinnamon-settings-daemon-2.6.3.tar.gz 2992102 SHA256 b71a515f9eed5efd35ef134f291a9dd9674d81026b23c85377493b53ec1cf0ae SHA512 ff6ec6be7a134414a525bd5dce6d90570800d0dbfc5f1641b02fbe17389bcf32d47832f5fcd736cdff8dfa09f129f998acd99d9358b1edf5315edb91c8b553ba WHIRLPOOL 9d2fb909fca23f7db2124e56e285e6c7623a9e7d710309f92894a2ab19b6a5a7e92b4e5c947e0cc74513eec30f7fa7bc7464997a1fdc3ff27ad19040579efdb0
23 -DIST cinnamon-settings-daemon-2.8.2.tar.gz 2935087 SHA256 fc18a16c843c66d5488d73f29b24a1b5dec82fe17d148d97bbab666280c79624 SHA512 ba24a8411732a21399c91eae0aa562859992bec08dc540897ac132bdfc55834dfffcebd93f687d193da5e92de936078dd47f774b9c8454cfcf174527ee6b8367 WHIRLPOOL 67a5c054f9510bfcd4c1778a17d4a33b5742b66e0c131090a963674360bb371b35a8b783fdcc521c28ae0fed2d263ff48ca80a0b9ddf186a3025d581d23e7271
24 DIST cinnamon-settings-daemon-2.8.3.tar.gz 2935149 SHA256 bc04333674ee10886b6c2644bd74c21ce6d3f6f1e005ebce63693cb14bb1a298 SHA512 a66ab0943f4a370fb203ba73dfa9f938ab2fc418c7876b7a048fc438ed8eaef3f5f7789ce86c0c2039ed61473c1b3fb9c60205571140291448854c03cba36f76 WHIRLPOOL 93ecc021ffa76a493d65fcd001253da6ebbd2c8f92be716f4d0de0df53867fb24177a6f31027611586e965d1e378a8b53662dd3c5a73df026d13d3a7fd5ae080
25
26 diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild
27 deleted file mode 100644
28 index 76c5726..0000000
29 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild
30 +++ /dev/null
31 @@ -1,105 +0,0 @@
32 -# Copyright 1999-2015 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI="5"
37 -GCONF_DEBUG="yes"
38 -GNOME2_LA_PUNT="yes"
39 -
40 -inherit autotools eutils gnome2 virtualx
41 -
42 -DESCRIPTION="Cinnamon's settings daemon"
43 -HOMEPAGE="http://cinnamon.linuxmint.com/"
44 -SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
45 -
46 -LICENSE="GPL-2+"
47 -SLOT="0"
48 -KEYWORDS="amd64 x86"
49 -IUSE="+colord cups input_devices_wacom smartcard systemd"
50 -
51 -# udev is non-optional since lots of plugins, not just gudev, pull it in
52 -RDEPEND="
53 - >=dev-libs/glib-2.38:2
54 - >=gnome-base/libgnomekbd-3.6
55 - >=gnome-base/librsvg-2.36.2
56 - >=gnome-extra/cinnamon-desktop-2.6.3:0=
57 - media-libs/fontconfig
58 - >=media-libs/lcms-2.2:2
59 - media-libs/libcanberra:0=[gtk3]
60 - >=media-sound/pulseaudio-0.9.16:0=
61 - sys-apps/dbus
62 - >=sys-auth/polkit-0.97
63 - || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
64 - x11-libs/gdk-pixbuf:2
65 - >=x11-libs/gtk+-3.9.10:3
66 - >=x11-libs/libnotify-0.7.3:0=
67 - x11-libs/libX11
68 - x11-libs/libXext
69 - x11-libs/libXfixes
70 - x11-libs/libXi
71 - x11-libs/libxklavier
72 - virtual/libgudev:=
73 -
74 - colord? ( >=x11-misc/colord-0.1.27:= )
75 - cups? ( >=net-print/cups-1.4[dbus] )
76 - input_devices_wacom? (
77 - >=dev-libs/libwacom-0.7
78 - x11-drivers/xf86-input-wacom
79 - x11-libs/libXtst )
80 - smartcard? ( >=dev-libs/nss-3.11.2 )
81 - systemd? ( sys-apps/systemd:0= )
82 - !systemd? ( sys-auth/consolekit:0= )
83 -"
84 -DEPEND="${RDEPEND}
85 - dev-libs/libxml2:2
86 - >=dev-util/intltool-0.37.1
87 - x11-proto/kbproto
88 - virtual/pkgconfig
89 -"
90 -
91 -src_prepare() {
92 - # make colord and wacom optional
93 - epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
94 -
95 - # Disable broken test
96 - sed -e '/g_test_add_func ("\/color\/edid/d' \
97 - -i plugins/color/gcm-self-test.c || die
98 -
99 - # Fix intltool unittest
100 - cat >>"${S}"/po/POTFILES.in <<EOF
101 -data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
102 -data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
103 -data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
104 -plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
105 -plugins/keyboard/csd-keyboard-xkb.c
106 -plugins/wacom/csd-wacom-device.c
107 -plugins/wacom/csd-wacom-osd-window.c
108 -plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
109 -EOF
110 -
111 - epatch_user
112 -
113 - eautoreconf
114 - gnome2_src_prepare
115 -}
116 -
117 -src_configure() {
118 - DOCS="AUTHORS ChangeLog MAINTAINERS README"
119 -
120 - # no point in disabling gudev since other plugins pull it in
121 - gnome2_src_configure \
122 - --disable-static \
123 - --enable-gudev \
124 - --enable-man \
125 - --enable-polkit \
126 - $(use_enable colord color) \
127 - $(use_enable cups) \
128 - $(use_enable smartcard smartcard-support) \
129 - $(use_enable systemd logind) \
130 - $(use_enable input_devices_wacom wacom)
131 -}
132 -
133 -src_test() {
134 - unset DISPLAY
135 - Xemake check
136 -}
137
138 diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild
139 deleted file mode 100644
140 index 4235b31..0000000
141 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild
142 +++ /dev/null
143 @@ -1,105 +0,0 @@
144 -# Copyright 1999-2015 Gentoo Foundation
145 -# Distributed under the terms of the GNU General Public License v2
146 -# $Id$
147 -
148 -EAPI="5"
149 -GCONF_DEBUG="yes"
150 -GNOME2_LA_PUNT="yes"
151 -
152 -inherit autotools eutils gnome2 virtualx
153 -
154 -DESCRIPTION="Cinnamon's settings daemon"
155 -HOMEPAGE="http://cinnamon.linuxmint.com/"
156 -SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
157 -
158 -LICENSE="GPL-2+"
159 -SLOT="0"
160 -KEYWORDS="~amd64 ~x86"
161 -IUSE="+colord cups input_devices_wacom smartcard systemd"
162 -
163 -# udev is non-optional since lots of plugins, not just gudev, pull it in
164 -RDEPEND="
165 - >=dev-libs/glib-2.38:2
166 - >=gnome-base/libgnomekbd-3.6
167 - >=gnome-base/librsvg-2.36.2
168 - >=gnome-extra/cinnamon-desktop-2.6.3:0=
169 - media-libs/fontconfig
170 - >=media-libs/lcms-2.2:2
171 - media-libs/libcanberra:0=[gtk3]
172 - >=media-sound/pulseaudio-0.9.16:0=
173 - sys-apps/dbus
174 - >=sys-auth/polkit-0.97
175 - x11-libs/gdk-pixbuf:2
176 - >=x11-libs/gtk+-3.9.10:3
177 - >=x11-libs/libnotify-0.7.3:0=
178 - x11-libs/libX11
179 - x11-libs/libXext
180 - x11-libs/libXfixes
181 - x11-libs/libXi
182 - x11-libs/libxklavier
183 - virtual/libgudev:=
184 -
185 - colord? ( >=x11-misc/colord-0.1.27:= )
186 - cups? ( >=net-print/cups-1.4[dbus] )
187 - input_devices_wacom? (
188 - >=dev-libs/libwacom-0.7
189 - x11-drivers/xf86-input-wacom
190 - x11-libs/libXtst )
191 - smartcard? ( >=dev-libs/nss-3.11.2 )
192 - || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
193 - systemd? ( sys-apps/systemd:0= )
194 - !systemd? ( sys-auth/consolekit:0= )
195 -"
196 -DEPEND="${RDEPEND}
197 - dev-libs/libxml2:2
198 - >=dev-util/intltool-0.37.1
199 - x11-proto/kbproto
200 - virtual/pkgconfig
201 -"
202 -
203 -src_prepare() {
204 - # make colord and wacom optional
205 - epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
206 -
207 - # Disable broken test
208 - sed -e '/g_test_add_func ("\/color\/edid/d' \
209 - -i plugins/color/gcm-self-test.c || die
210 -
211 - # Fix intltool unittest
212 - cat >>"${S}"/po/POTFILES.in <<EOF
213 -data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
214 -data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
215 -data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
216 -plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
217 -plugins/keyboard/csd-keyboard-xkb.c
218 -plugins/wacom/csd-wacom-device.c
219 -plugins/wacom/csd-wacom-osd-window.c
220 -plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
221 -EOF
222 -
223 - epatch_user
224 -
225 - eautoreconf
226 - gnome2_src_prepare
227 -}
228 -
229 -src_configure() {
230 - DOCS="AUTHORS ChangeLog MAINTAINERS README"
231 -
232 - # no point in disabling gudev since other plugins pull it in
233 - gnome2_src_configure \
234 - --disable-static \
235 - --enable-gudev \
236 - --enable-man \
237 - --enable-polkit \
238 - $(use_enable colord color) \
239 - $(use_enable cups) \
240 - $(use_enable smartcard smartcard-support) \
241 - $(use_enable systemd logind) \
242 - $(use_enable input_devices_wacom wacom)
243 -}
244 -
245 -src_test() {
246 - unset DISPLAY
247 - Xemake check
248 -}