Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/
Date: Fri, 16 Apr 2021 03:05:46
Message-Id: 1618542327.2a9794b78a710261a29d8815123ccb8d0b657f8a.mattst88@gentoo
1 commit: 2a9794b78a710261a29d8815123ccb8d0b657f8a
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 16 02:35:55 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 16 03:05:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9794b7
7
8 gnome-base/gnome-control-center: Version bump to 40.0
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 gnome-base/gnome-control-center/Manifest | 2 +
13 .../gnome-control-center-40.0.ebuild | 175 +++++++++++++++++++++
14 2 files changed, 177 insertions(+)
15
16 diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
17 index 40f31ad0d64..de48d22a020 100644
18 --- a/gnome-base/gnome-control-center/Manifest
19 +++ b/gnome-base/gnome-control-center/Manifest
20 @@ -1,2 +1,4 @@
21 DIST gnome-control-center-3.38.3-patchset.tar.xz 7308 BLAKE2B 72acdb825d48c7077d15f7273765db2ccbef89a839466a4482d9f6ae9eae3a2144556a048f2a6e146ea4e3435c13f0a72bf499c44d34bcbed505d6186d8bf008 SHA512 2498abd83e0100efa4c83886ce3e7f7d4468e41aab12c5338987832cb305c215abe75b4fff65217511bbe174b6b1b601af988c5588523e0346855aba7842092b
22 DIST gnome-control-center-3.38.5.tar.xz 6435648 BLAKE2B 6bcb91433540278850008b1a015caa157fede8533fc5fdf22b58a9f7511fe39a9c3dc195ed9aa1fcf729b6eaa2cf18cf67781300d43ed23ea63c3c6fc5cfb64f SHA512 d173dc863bb62010577a99c3f6705fd92c7e1b9fba124c7ab7fb32b22e01b23b75dea976b45e8d65e7329edca50fb892fe298e8ca2861c7e1185318b7be6cb67
23 +DIST gnome-control-center-40.0-patchset.tar.xz 7176 BLAKE2B 0830ef0f0a93ffe86110f268f33c84318b015b1c36ce14adb35b51fe4c61f68a5f1cbaf82943bee3e4b692a6b74f89510baa1281d843668cd8d7b065fdab6701 SHA512 ad19226266a1f096cb1d917bd83becb3a859f8e262dc5be090fdf1f83bc084cdbbc6fbefa119ca35526b5c1e96b8b82c5fa8c542f170cfc0d7791446e541caf5
24 +DIST gnome-control-center-40.0.tar.xz 6463616 BLAKE2B 7c79b79a0cb9bb847cdeb31613e9520b446f7720031fc7cda927a82b6e0acc6af03a047fe296a45f6e171c4ab1659b4ed5c6d07f83c9ffa554b1bdcce6fa26fe SHA512 26980cd18c414b12d2bf7e61be200e02302e170d53aba4f064154eda4c006648160919b6d4c9d168d8c5a461c05dc6593a52066b144af577c6aac420b9723cb9
25
26 diff --git a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
27 new file mode 100644
28 index 00000000000..611b9cbc692
29 --- /dev/null
30 +++ b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
31 @@ -0,0 +1,175 @@
32 +# Copyright 1999-2021 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=7
36 +PYTHON_COMPAT=( python3_{7..9} )
37 +
38 +inherit gnome.org gnome2-utils meson python-any-r1 xdg
39 +
40 +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
41 +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
42 +SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-40.0-patchset.tar.xz"
43 +
44 +LICENSE="GPL-2+"
45 +SLOT="2"
46 +IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
47 +RESTRICT="!test? ( test )"
48 +REQUIRED_USE="
49 + flickr? ( gnome-online-accounts )
50 + ^^ ( elogind systemd )
51 +" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
52 +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
53 +
54 +# kerberos unfortunately means mit-krb5; build fails with heimdal
55 +# display panel requires colord and gnome-settings-daemon[colord]
56 +# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
57 +# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
58 +# 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
59 +DEPEND="
60 + >=gui-libs/libhandy-1:1=
61 + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
62 + >=media-sound/pulseaudio-2.0[glib]
63 + >=sys-apps/accountsservice-0.6.39
64 + >=x11-misc/colord-0.1.34:0=
65 + >=x11-libs/gdk-pixbuf-2.23.0:2
66 + >=dev-libs/glib-2.56.0:2
67 + >=gnome-base/gnome-desktop-3.33.4:3=
68 + >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
69 + >=gnome-base/gsettings-desktop-schemas-3.37.0
70 + dev-libs/libxml2:2
71 + >=sys-auth/polkit-0.114
72 + >=sys-power/upower-0.99.8:=
73 + >=dev-libs/libgudev-232
74 + x11-libs/libX11
75 + >=x11-libs/libXi-1.2
76 + media-libs/libepoxy
77 + flickr? ( >=media-libs/grilo-0.3.0:0.3= )
78 + >=x11-libs/gtk+-3.22.0:3[X,wayland=]
79 + cups? (
80 + >=net-print/cups-1.7[dbus]
81 + >=net-fs/samba-4.0.0[client]
82 + )
83 + v4l? (
84 + >=media-video/cheese-3.28.0 )
85 + ibus? ( >=app-i18n/ibus-1.5.2 )
86 + networkmanager? (
87 + >=net-libs/libnma-1.8.0
88 + >=net-misc/networkmanager-1.24.0:=[modemmanager]
89 + >=net-misc/modemmanager-0.7.990 )
90 + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
91 + input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
92 + kerberos? ( app-crypt/mit-krb5 )
93 +
94 + x11-libs/cairo[glib]
95 + >=x11-libs/colord-gtk-0.1.24
96 + net-libs/libsoup:2.4
97 + media-libs/fontconfig
98 + gnome-base/libgtop:2=
99 + >=sys-fs/udisks-2.1.8:2
100 + app-crypt/libsecret
101 + media-libs/gsound
102 + >=dev-libs/libpwquality-1.2.2
103 +"
104 +# systemd/elogind USE flagged because package manager will potentially try to satisfy a
105 +# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
106 +# libgnomekbd needed only for gkbd-keyboard-display tool
107 +# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
108 +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
109 +#
110 +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
111 +# Also we need newer driver versions to allow wacom and libinput drivers to
112 +# not collide
113 +#
114 +# system-config-printer provides org.fedoraproject.Config.Printing service and interface
115 +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
116 +RDEPEND="${DEPEND}
117 + systemd? ( >=sys-apps/systemd-31 )
118 + elogind? ( app-admin/openrc-settingsd
119 + sys-auth/elogind )
120 + x11-themes/adwaita-icon-theme
121 + >=gnome-extra/gnome-color-manager-3.1.2
122 + cups? (
123 + app-admin/system-config-printer
124 + net-print/cups-pk-helper )
125 + >=gnome-base/libgnomekbd-3
126 + wayland? ( dev-libs/libinput )
127 + !wayland? (
128 + >=x11-drivers/xf86-input-libinput-0.19.0
129 + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
130 + flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
131 +"
132 +# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
133 +# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
134 +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
135 + networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
136 +
137 +BDEPEND="
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 + test? ( $(python_gen_any_dep '
148 + dev-python/dbusmock[${PYTHON_USEDEP}]
149 + ') )
150 +"
151 +
152 +PATCHES=(
153 + # Patches from gnome-40 branch on top of 40.0
154 + # Makes some panels and dependencies optional
155 + # https://bugzilla.gnome.org/686840, 697478, 700145
156 + # Fix some absolute paths to be appropriate for Gentoo
157 + "${WORKDIR}"/patches/
158 +)
159 +
160 +python_check_deps() {
161 + use test && has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
162 +}
163 +
164 +pkg_setup() {
165 + use test && python-any-r1_pkg_setup
166 +}
167 +
168 +src_prepare() {
169 + xdg_src_prepare
170 + # Mark python tests with shebang executable, so that meson will launch them directly, instead
171 + # of via its own python-single-r1 version, which might not match what we get from python_check_deps
172 + chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
173 +}
174 +
175 +src_configure() {
176 + local emesonargs=(
177 + $(meson_use bluetooth)
178 + $(meson_use v4l cheese)
179 + -Dcups=$(usex cups enabled disabled)
180 + -Ddocumentation=true # manpage
181 + -Dgoa=$(usex gnome-online-accounts enabled disabled)
182 + -Dgrilo=$(usex flickr enabled disabled)
183 + $(meson_use ibus)
184 + -Dkerberos=$(usex kerberos enabled disabled)
185 + -Dmalcontent=false # unpackaged
186 + $(meson_use networkmanager network_manager)
187 + -Dprivileged_group=wheel
188 + -Dsnap=false
189 + $(meson_use test tests)
190 + $(meson_use debug tracing)
191 + $(meson_use input_devices_wacom wacom)
192 + #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
193 + # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
194 + )
195 + meson_src_configure
196 +}
197 +
198 +pkg_postinst() {
199 + xdg_pkg_postinst
200 + gnome2_schemas_update
201 +}
202 +
203 +pkg_postrm() {
204 + xdg_pkg_postrm
205 + gnome2_schemas_update
206 +}