Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-control-center: ChangeLog gnome-control-center-3.12.1.ebuild
Date: Sun, 27 Apr 2014 16:50:43
Message-Id: 20140427165040.16A642004B@flycatcher.gentoo.org
1 eva 14/04/27 16:50:40
2
3 Modified: ChangeLog
4 Added: gnome-control-center-3.12.1.ebuild
5 Log:
6 Version bump for Gnome 3.12.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C6085806)
9
10 Revision Changes Path
11 1.149 gnome-base/gnome-control-center/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?rev=1.149&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?rev=1.149&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?r1=1.148&r2=1.149
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v
20 retrieving revision 1.148
21 retrieving revision 1.149
22 diff -u -r1.148 -r1.149
23 --- ChangeLog 18 Apr 2014 10:54:06 -0000 1.148
24 +++ ChangeLog 27 Apr 2014 16:50:39 -0000 1.149
25 @@ -1,6 +1,13 @@
26 # ChangeLog for gnome-base/gnome-control-center
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.148 2014/04/18 10:54:06 pacho Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.149 2014/04/27 16:50:39 eva Exp $
30 +
31 +*gnome-control-center-3.12.1 (27 Apr 2014)
32 +
33 + 27 Apr 2014; Gilles Dartiguelongue <eva@g.o>
34 + +gnome-control-center-3.12.1.ebuild,
35 + +files/gnome-control-center-3.12.1-optional.patch:
36 + Version bump for Gnome 3.12.
37
38 18 Apr 2014; Pacho Ramos <pacho@g.o>
39 -files/gnome-control-center-3.8.0-paths-makefiles.patch,
40
41
42
43 1.1 gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: gnome-control-center-3.12.1.ebuild
49 ===================================================================
50 # Copyright 1999-2014 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild,v 1.1 2014/04/27 16:50:39 eva Exp $
53
54 EAPI="5"
55 GCONF_DEBUG="yes"
56 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
57
58 inherit autotools bash-completion-r1 eutils gnome2
59
60 DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
61 HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
62
63 LICENSE="GPL-2+"
64 SLOT="2"
65 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
66 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
67
68 # False positives caused by nested configure scripts
69 QA_CONFIGURE_OPTIONS=".*"
70
71 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
72 # g-s-d[policykit] needed for bug #403527
73 #
74 # kerberos unfortunately means mit-krb5; build fails with heimdal
75
76 # FIXME: modemmanager is not optional
77 # networkmanager is not optional
78
79 COMMON_DEPEND="
80 >=dev-libs/glib-2.39.91:2
81 >=x11-libs/gdk-pixbuf-2.23.0:2
82 >=x11-libs/gtk+-3.11.1:3
83 >=gnome-base/gsettings-desktop-schemas-3.9.91
84 >=gnome-base/gnome-desktop-3.11.3:3=
85 >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
86 >=gnome-base/libgnomekbd-2.91.91
87
88 >=dev-libs/libpwquality-1.2.2
89 dev-libs/libxml2:2
90 gnome-base/gnome-menus:3
91 gnome-base/libgtop:2
92 media-libs/fontconfig
93 >=media-libs/grilo-0.2.6:0.2
94
95 >=media-libs/libcanberra-0.13[gtk3]
96 >=media-sound/pulseaudio-2[glib]
97 >=sys-auth/polkit-0.97
98 >=sys-power/upower-0.99
99 >=x11-libs/libnotify-0.7.3:0=
100
101 >=gnome-extra/nm-applet-0.9.7.995
102 >=net-misc/networkmanager-0.9.8[modemmanager]
103 >=net-misc/modemmanager-0.7.990
104
105 virtual/opengl
106 x11-apps/xmodmap
107 x11-libs/libX11
108 x11-libs/libXxf86misc
109 >=x11-libs/libXi-1.2
110
111 bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
112 colord? (
113 net-libs/libsoup:2.4
114 >=x11-misc/colord-0.1.34:0= )
115 cups? (
116 >=net-print/cups-1.4[dbus]
117 || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
118 gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
119 i18n? ( >=app-i18n/ibus-1.5.2 )
120 kerberos? ( app-crypt/mit-krb5 )
121 v4l? (
122 media-libs/gstreamer:1.0
123 media-libs/clutter-gtk:1.0
124 >=media-video/cheese-3.5.91 )
125 input_devices_wacom? (
126 >=dev-libs/libwacom-0.7
127 >=media-libs/clutter-1.11.3:1.0
128 media-libs/clutter-gtk:1.0
129 >=x11-libs/libXi-1.2 )
130 "
131 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
132 RDEPEND="${COMMON_DEPEND}
133 || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
134 >=sys-apps/accountsservice-0.6.30
135 x11-themes/gnome-icon-theme-symbolic
136 colord? (
137 >=gnome-extra/gnome-color-manager-3
138 >=x11-misc/colord-0.1.34
139 >=x11-libs/colord-gtk-0.1.24 )
140 cups? (
141 >=app-admin/system-config-printer-gnome-1.3.5
142 net-print/cups-pk-helper )
143 input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
144
145 !<gnome-base/gdm-2.91.94
146 !<gnome-extra/gnome-color-manager-3.1.2
147 !gnome-extra/gnome-media[pulseaudio]
148 !<gnome-extra/gnome-media-2.32.0-r300
149 !<net-wireless/gnome-bluetooth-3.3.2
150 "
151 # PDEPEND to avoid circular dependency
152 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
153
154 DEPEND="${COMMON_DEPEND}
155 x11-proto/xproto
156 x11-proto/xf86miscproto
157 x11-proto/kbproto
158
159 dev-libs/libxml2:2
160 dev-libs/libxslt
161 >=dev-util/intltool-0.40.1
162 >=sys-devel/gettext-0.17
163 virtual/pkgconfig
164
165 cups? ( sys-apps/sed )
166
167 gnome-base/gnome-common
168 "
169 # Needed for autoreconf
170 # gnome-base/gnome-common
171
172 src_prepare() {
173 # Gentoo handles completions in a different directory, bugs #465094 and #477390
174 sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
175 shell/Makefile.am || die "sed completiondir failed"
176
177 # Make some panels and dependencies optional; requires eautoreconf
178 # https://bugzilla.gnome.org/686840, 697478, 700145
179 epatch "${FILESDIR}"/${PN}-3.12.1-optional.patch
180
181 # Fix some absolute paths to be appropriate for Gentoo
182 epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
183
184 epatch_user
185
186 eautoreconf
187
188 # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
189 # We need to touch timedated{c,h} to prevent them from being
190 # regenerated (bug #415901)
191 # Upstream think they should be removed, preventing compilation errors too
192 # (https://bugzilla.gnome.org/704822)
193 [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
194 [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
195
196 gnome2_src_prepare
197 }
198
199 src_configure() {
200 gnome2_src_configure \
201 --disable-update-mimedb \
202 --disable-static \
203 --enable-documentation \
204 $(use_enable bluetooth) \
205 $(use_enable colord color) \
206 $(use_enable cups) \
207 $(use_enable gnome-online-accounts goa) \
208 $(use_enable i18n ibus) \
209 $(use_enable kerberos) \
210 $(use_with v4l cheese) \
211 $(use_enable input_devices_wacom wacom)
212 }