Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-settings-daemon: gnome-settings-daemon-3.2.1.ebuild ChangeLog metadata.xml
Date: Sat, 29 Oct 2011 02:11:53
Message-Id: 20111029021142.196572004C@flycatcher.gentoo.org
1 tetromino 11/10/29 02:11:42
2
3 Modified: ChangeLog metadata.xml
4 Added: gnome-settings-daemon-3.2.1.ebuild
5 Log:
6 Bump to 3.2.1 from the gnome overlay. Numerous changes and improvements.
7
8 (Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.93 gnome-base/gnome-settings-daemon/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?rev=1.93&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?rev=1.93&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?r1=1.92&r2=1.93
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v
20 retrieving revision 1.92
21 retrieving revision 1.93
22 diff -u -r1.92 -r1.93
23 --- ChangeLog 28 Oct 2011 20:07:36 -0000 1.92
24 +++ ChangeLog 29 Oct 2011 02:11:41 -0000 1.93
25 @@ -1,6 +1,15 @@
26 # ChangeLog for gnome-base/gnome-settings-daemon
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.92 2011/10/28 20:07:36 maekke Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.93 2011/10/29 02:11:41 tetromino Exp $
30 +
31 +*gnome-settings-daemon-3.2.1 (29 Oct 2011)
32 +
33 + 29 Oct 2011; Alexandre Rostovtsev <tetromino@g.o>
34 + +files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch,
35 + +gnome-settings-daemon-3.2.1.ebuild,
36 + +files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch,
37 + +files/gnome-settings-daemon-3.2.1-optional-colord.patch, metadata.xml:
38 + Bump to 3.2.1 from the gnome overlay. Numerous changes and improvements.
39
40 28 Oct 2011; Markus Meier <maekke@g.o>
41 gnome-settings-daemon-2.32.1-r2.ebuild:
42
43
44
45 1.4 gnome-base/gnome-settings-daemon/metadata.xml
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/metadata.xml?rev=1.4&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/metadata.xml?rev=1.4&content-type=text/plain
49 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/metadata.xml?r1=1.3&r2=1.4
50
51 Index: metadata.xml
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/metadata.xml,v
54 retrieving revision 1.3
55 retrieving revision 1.4
56 diff -u -r1.3 -r1.4
57 --- metadata.xml 18 Aug 2011 20:56:07 -0000 1.3
58 +++ metadata.xml 29 Oct 2011 02:11:42 -0000 1.4
59 @@ -3,6 +3,8 @@
60 <pkgmetadata>
61 <herd>gnome</herd>
62 <use>
63 + <flag name="colord">Support color management using
64 + <pkg>x11-misc/colord</pkg></flag>
65 <flag name="packagekit">Enable support for the distro-neutral package
66 manager GUI <pkg>app-admin/packagekit</pkg></flag>
67 <flag name="short-touchpad-timeout">Change the touchpad timeout so that
68
69
70
71 1.1 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild
72
73 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild?rev=1.1&view=markup
74 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild?rev=1.1&content-type=text/plain
75
76 Index: gnome-settings-daemon-3.2.1.ebuild
77 ===================================================================
78 # Copyright 1999-2011 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild,v 1.1 2011/10/29 02:11:41 tetromino Exp $
81
82 EAPI="4"
83 GCONF_DEBUG="no"
84 GNOME2_LA_PUNT="yes"
85
86 inherit autotools eutils gnome2 virtualx
87
88 DESCRIPTION="Gnome Settings Daemon"
89 HOMEPAGE="http://www.gnome.org"
90
91 LICENSE="GPL-2"
92 SLOT="0"
93 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
94 IUSE="+colord +cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
95
96 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92
97 # Latest gnome-desktop needed to fix the DPMS timeout bug #385063
98 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
99 # upower-0.9.11 needed for UpSleepKind
100 COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
101 >=dev-libs/glib-2.29.14:2
102 >=x11-libs/gtk+-2.99.3:3
103 >=gnome-base/gconf-2.6.1:2
104 >=gnome-base/libgnomekbd-2.91.1
105 >=gnome-base/gnome-desktop-3.2.0-r1:3
106 >=gnome-base/gsettings-desktop-schemas-0.1.7.1
107 media-fonts/cantarell
108 media-libs/fontconfig
109 >=media-libs/lcms-2.2:2
110 media-libs/libcanberra[gtk3]
111 >=media-sound/pulseaudio-0.9.16
112 >=sys-power/upower-0.9.11
113 >=x11-libs/libnotify-0.7.3
114 x11-libs/libX11
115 x11-libs/libXi
116 x11-libs/libXext
117 x11-libs/libXfixes
118 x11-libs/libXxf86misc
119 >=x11-libs/libxklavier-5.0
120 >=media-sound/pulseaudio-0.9.16
121
122 colord? ( >=x11-misc/colord-0.1.13 )
123 cups? ( >=net-print/cups-1.4[dbus] )
124 packagekit? (
125 || ( sys-fs/udev[gudev]
126 sys-fs/udev[extras] )
127 >=app-admin/packagekit-base-0.6.12 )
128 policykit? (
129 >=sys-auth/polkit-0.97
130 >=sys-apps/dbus-1.1.2[X] )
131 smartcard? ( >=dev-libs/nss-3.11.2 )
132 udev? ( || ( sys-fs/udev[gudev]
133 sys-fs/udev[extras] ) )"
134 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
135 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
136 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
137 RDEPEND="${COMMON_DEPEND}
138 gnome-base/dconf
139 >=x11-themes/gnome-themes-standard-2.91
140 >=x11-themes/gnome-icon-theme-2.91
141 >=x11-themes/gnome-icon-theme-symbolic-2.91
142 !<gnome-base/gnome-control-center-2.22
143 !<gnome-extra/gnome-color-manager-3.1.1
144 !<gnome-extra/gnome-power-manager-3.1.3"
145 # xproto-7.0.15 needed for power plugin
146 DEPEND="${COMMON_DEPEND}
147 cups? ( sys-apps/sed )
148 sys-devel/gettext
149 >=dev-util/intltool-0.40
150 >=dev-util/pkgconfig-0.19
151 x11-proto/inputproto
152 x11-proto/kbproto
153 x11-proto/xf86miscproto
154 >=x11-proto/xproto-7.0.15"
155
156 pkg_setup() {
157 # README is empty
158 DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
159 G2CONF="${G2CONF}
160 --disable-static
161 --disable-schemas-compile
162 --enable-gconf-bridge
163 --with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
164 $(use_enable colord color)
165 $(use_enable cups)
166 $(use_enable debug)
167 $(use_enable debug more-warnings)
168 $(use_enable packagekit)
169 $(use_enable policykit polkit)
170 $(use_enable smartcard smartcard-support)
171 $(use_enable udev gudev)"
172 }
173
174 src_prepare() {
175 # Upstream patch to fix undefined symbol, will be in next release
176 epatch "${FILESDIR}/${P}-WEXITSTATUS.patch"
177
178 # Backport patch from git master branch (not in gnome-3-2 branch yet)
179 # fixing loading color profiles at startup
180 epatch "${FILESDIR}/${PN}-3.2.0-color-unbreak-loading-profiles.patch"
181
182 # https://bugzilla.gnome.org/show_bug.cgi?id=621836
183 # Apparently this change severely affects touchpad usability for some
184 # people, so revert it if USE=short-touchpad-timeout.
185 # Revisit if/when upstream adds a setting for customizing the timeout.
186 use short-touchpad-timeout &&
187 epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
188
189 # Make colord optional; requires eautoreconf
190 epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
191 eautoreconf
192
193 gnome2_src_prepare
194 }
195
196 src_test() {
197 Xemake check
198 }
199
200 src_install() {
201 gnome2_src_install
202
203 echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
204 doenvd 51gsettings-dconf || die "doenvd failed"
205 }