Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/
Date: Thu, 14 Mar 2019 09:35:57
Message-Id: 1552556080.a44cda6d9b3b5df9cb9fef130105d3d18763d626.leio@gentoo
1 commit: a44cda6d9b3b5df9cb9fef130105d3d18763d626
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 14 09:19:51 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 14 09:34:40 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44cda6d
7
8 gnome-base/gnome-control-center: bump to 3.30.3
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 gnome-base/gnome-control-center/Manifest | 2 +
14 .../gnome-control-center-3.30.3.ebuild | 151 +++++++++++++++++++++
15 2 files changed, 153 insertions(+)
16
17 diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
18 index 72ad065bb98..633ab568c15 100644
19 --- a/gnome-base/gnome-control-center/Manifest
20 +++ b/gnome-base/gnome-control-center/Manifest
21 @@ -4,3 +4,5 @@ DIST gnome-control-center-3.26.2-patchset.tar.xz 159088 BLAKE2B 521af115f7d4372e
22 DIST gnome-control-center-3.26.2.tar.xz 7386516 BLAKE2B 156c24bc2ab60943ade1e255976e29478c9b0e9dbad12921a835ec55f09ad62c71886750a50fa74f2a0afb660cac073c9ff54cef4b72c790b6dd91c7cac8aaa9 SHA512 d3ad9067c7e66a3a6bf5b6c058f3862f6e4b59c0254fd47f0b4a9093f3b7e2d7f1900b510aba8bbdac7c1212a0f6cdd4974c3d04003af63edb72ed3e56f7dbca
23 DIST gnome-control-center-3.28.2-patchset.tar.xz 75820 BLAKE2B 7f7cda69248862eb9ddba5d69d84c6cf1e550a9db6d914d4f5327b107d01bcb4b40152889ffc13700a8e777b805b037a267e9b641df65612a86099e0851ab417 SHA512 927287e98d1b958b27a644a90fe3da38ba3040a60e4318268f46e764226906d851148370635ab232748f5ef78cf9406b71025738cdec951582042ce4282914c6
24 DIST gnome-control-center-3.28.2.tar.xz 5857128 BLAKE2B 253c220fdc759a26f23210a7665323ccdfb18e5f76652791718f2523badbac1f42c9c0fd75e5505c1e3d5f7391abc344b47cb101741ef35ed60859c4c16d7988 SHA512 3e1b54cf1a603ee7c47d8b0f1fb025405c8d133c9e0dbe0eaf2f287eff82109e95581c79f131d227422d682b7049ccb6e6297dba1ff2276cff5f715308195d7f
25 +DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e628401ea74fa90582721aaffddfb0e3f8e78013edde0d2f712d4433c316b3da08c9ec1038200cfd4e9b1a315b224d2e881d056b0f685f7067eb SHA512 99519c54ef223b94d5101987b7d7dc203c447765ef79374a3f0911282cd77917f64dea7318d70c63b8df8506c058fa1fcb1d71b23488b3ca9be993667509b7d1
26 +DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc
27
28 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
29 new file mode 100644
30 index 00000000000..0e9bf5c64ab
31 --- /dev/null
32 +++ b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
33 @@ -0,0 +1,151 @@
34 +# Copyright 1999-2019 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +inherit gnome.org gnome2-utils meson xdg
40 +
41 +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
42 +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
43 +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
44 +
45 +LICENSE="GPL-2+"
46 +SLOT="2"
47 +IUSE="+bluetooth +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
48 +REQUIRED_USE="flickr? ( gnome-online-accounts )"
49 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
50 +
51 +# kerberos unfortunately means mit-krb5; build fails with heimdal
52 +# display panel requires colord and gnome-settings-daemon[colord]
53 +# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
54 +# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
55 +# >=polkit-0.114 for .policy files gettext ITS
56 +clutter_gtk_dep="media-libs/clutter-gtk:1.0"
57 +# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
58 +COMMON_DEPEND="
59 + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
60 + >=media-sound/pulseaudio-2.0[glib]
61 + >=sys-apps/accountsservice-0.6.39
62 + >=x11-misc/colord-0.1.34:0=
63 + >=x11-libs/gdk-pixbuf-2.23.0:2
64 + >=dev-libs/glib-2.53.0:2
65 + >=gnome-base/gnome-desktop-3.27.90:3=
66 + >=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?]
67 + >=gnome-base/gsettings-desktop-schemas-3.27.2
68 + dev-libs/libxml2:2
69 + >=sys-auth/polkit-0.114
70 + >=sys-power/upower-0.99:=
71 + x11-libs/libX11
72 + >=x11-libs/libXi-1.2
73 + flickr? ( >=media-libs/grilo-0.3.0:0.3= )
74 + >=x11-libs/gtk+-3.22.0:3[X,wayland=]
75 + cups? (
76 + >=net-print/cups-1.7[dbus]
77 + >=net-fs/samba-4.0.0[client]
78 + )
79 + v4l? (
80 + ${clutter_gtk_dep}
81 + >=media-video/cheese-3.28.0 )
82 + ibus? ( >=app-i18n/ibus-1.5.2 )
83 + wayland? ( virtual/libgudev )
84 + networkmanager? (
85 + >=gnome-extra/nm-applet-1.8.0
86 + >=net-misc/networkmanager-1.10.0:=[modemmanager]
87 + >=net-misc/modemmanager-0.7.990 )
88 + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
89 + input_devices_wacom? (
90 + ${clutter_gtk_dep}
91 + >=dev-libs/libwacom-0.27
92 + >=media-libs/clutter-1.11.3:1.0 )
93 + kerberos? ( app-crypt/mit-krb5 )
94 +
95 + x11-libs/cairo[glib]
96 + >=x11-libs/colord-gtk-0.1.24
97 + net-libs/libsoup:2.4
98 + media-libs/fontconfig
99 + gnome-base/libgtop:2=
100 + app-crypt/libsecret
101 + >=media-libs/libcanberra-0.13[gtk3]
102 + >=dev-libs/libpwquality-1.2.2
103 +"
104 +# libgnomekbd needed only for gkbd-keyboard-display tool
105 +# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
106 +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
107 +#
108 +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
109 +# Also we need newer driver versions to allow wacom and libinput drivers to
110 +# not collide
111 +#
112 +# system-config-printer provides org.fedoraproject.Config.Printing service and interface
113 +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
114 +RDEPEND="${COMMON_DEPEND}
115 + || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
116 + x11-themes/adwaita-icon-theme
117 + >=gnome-extra/gnome-color-manager-3.1.2
118 + cups? (
119 + app-admin/system-config-printer
120 + net-print/cups-pk-helper )
121 + >=gnome-base/libgnomekbd-3
122 + wayland? ( dev-libs/libinput )
123 + !wayland? (
124 + >=x11-drivers/xf86-input-libinput-0.19.0
125 + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
126 + flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
127 +
128 + !<gnome-base/gdm-2.91.94
129 + !gnome-extra/gnome-media[pulseaudio]
130 + !<gnome-extra/gnome-media-2.32.0-r300
131 + !<net-wireless/gnome-bluetooth-3.3.2
132 +"
133 +# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
134 +# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
135 +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
136 +
137 +DEPEND="${COMMON_DEPEND}
138 + dev-libs/libxslt
139 + app-text/docbook-xsl-stylesheets
140 + app-text/docbook-xml-dtd:4.2
141 + x11-base/xorg-proto
142 + dev-libs/libxml2:2
143 + dev-util/gdbus-codegen
144 + dev-util/glib-utils
145 + >=sys-devel/gettext-0.19.8
146 + virtual/pkgconfig
147 +"
148 +
149 +PATCHES=(
150 + # Patches from gnome-3-28 branch on top of 3.28.2
151 + # Makes some panels and dependencies optional
152 + # https://bugzilla.gnome.org/686840, 697478, 700145
153 + # Fix some absolute paths to be appropriate for Gentoo
154 + "${WORKDIR}"/patches/
155 +)
156 +
157 +src_configure() {
158 + local emesonargs=(
159 + $(meson_use bluetooth)
160 + $(meson_use v4l cheese)
161 + -Dcups=$(usex cups enabled disabled)
162 + -Ddocumentation=true # manpage
163 + -Dgoa=$(usex gnome-online-accounts enabled disabled)
164 + -Dgrilo=$(usex flickr enabled disabled)
165 + $(meson_use ibus)
166 + -Dkerberos=$(usex kerberos enabled disabled)
167 + $(meson_use networkmanager network_manager)
168 + -Dtracing=false
169 + $(meson_use input_devices_wacom wacom)
170 + $(meson_use wayland)
171 + # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
172 + )
173 + meson_src_configure
174 +}
175 +
176 +pkg_postinst() {
177 + xdg_pkg_postinst
178 + gnome2_schemas_update
179 +}
180 +
181 +pkg_postrm() {
182 + xdg_pkg_postrm
183 + gnome2_schemas_update
184 +}