summaryrefslogtreecommitdiff
path: root/gnome-base
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/Manifest.gzbin5198 -> 5211 bytes
-rw-r--r--gnome-base/gdm/Manifest2
-rw-r--r--gnome-base/gdm/gdm-3.36.4.ebuild43
-rw-r--r--gnome-base/gnome-control-center/Manifest6
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild180
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.38.3.ebuild176
-rw-r--r--gnome-base/gnome-desktop/Manifest6
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild77
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-3.38.3.ebuild (renamed from gnome-base/gnome-desktop/gnome-desktop-3.38.2.ebuild)2
-rw-r--r--gnome-base/gnome-keyring/Manifest2
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild11
-rw-r--r--gnome-base/gnome-shell/Manifest2
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild186
-rw-r--r--gnome-base/libgnomekbd/Manifest2
-rw-r--r--gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild5
-rw-r--r--gnome-base/libgtop/Manifest2
-rw-r--r--gnome-base/libgtop/libgtop-2.40.0-r1.ebuild5
17 files changed, 581 insertions, 126 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index c3a8f571824d..157ee9966880 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
Binary files differ
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 506c67ecba12..60318bd94085 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -10,5 +10,5 @@ DIST gdm-3.36.3.tar.xz 1218972 BLAKE2B 8e4d3dcd1dc84de276a6426feae206d43cfcbd8c8
DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eaecce8767dbab01eead68bddde21edc999eaf6b7ce747084ac9f88ab71cd7bf602e3bdc5bfe09038e3b01ad3a SHA512 ee8a4ae4a1c4846e4d52fda0b115dfc79ef76b78a2349977767e4212910b5ad331b908601f252292a8a944973372d1dce3124d9ccb8a2519a98d0e4813a6ec61
DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
EBUILD gdm-3.36.3.ebuild 7890 BLAKE2B 85a72c96ec7a8ca887e62c08dc6de3155750cdd0f7c991177d59e624f5a1f671eea74bd658d91a04e29627320b84adfa225f854b554385df7475812dbcd872d3 SHA512 03311a54858c5184eb9ded700a3302ca1f9eef6a35b7ade2b3b3d0d004c620ff99d53568f6c56ff34f6f2f91652f6fbc6250f7471f33f8f5a059a1e7e676602c
-EBUILD gdm-3.36.4.ebuild 7892 BLAKE2B d0bc4d82f8582bc86b41555f9c3d214e3c6c8da4ebebf085f991538e6c7b643f92f7b136fb8e9aad45e0981244532814fd6a281e4a32445cde7ce7d7bf97de1e SHA512 f9e2ce355ac24b17fca48d8f1fe80e4d0393d5d23a5b4dfbe687cb2eefe2e7a69abbb43efdb4fcbe365521647f4a429bad7809cd9bfbc99542dd627ae9c2be95
+EBUILD gdm-3.36.4.ebuild 7216 BLAKE2B 616d7e0e5a87180e53ed7a48356029d464ad072879b7c4949e18662ef0217e102d275af78f4336cc0a41dbb24e7eb7e18c8e5a3884a56431618e5736d4651b07 SHA512 7955211e0fe7e63e9622f457a5fd970015c6ad128f40b1c43968432054e26f4dedec5da8680112d50673c0810d67a8aa3150d5e17d1ecf690bb0575facc6871d
MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/gdm-3.36.4.ebuild b/gnome-base/gdm/gdm-3.36.4.ebuild
index 8a86e224747e..484f7ecbf18c 100644
--- a/gnome-base/gdm/gdm-3.36.4.ebuild
+++ b/gnome-base/gdm/gdm-3.36.4.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
GNOME2_EAUTORECONF="yes"
-inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user
+inherit gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev
DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
@@ -72,6 +71,8 @@ COMMON_DEPEND="
# fprintd is used via dbus by gdm-fingerprint-extension
# gnome-session-3.6 needed to avoid freezing with orca
RDEPEND="${COMMON_DEPEND}
+ acct-group/gdm
+ acct-user/gdm
>=gnome-base/gnome-session-3.6
>=gnome-base/gnome-shell-3.1.90
x11-apps/xhost
@@ -79,18 +80,19 @@ RDEPEND="${COMMON_DEPEND}
accessibility? (
>=app-accessibility/orca-3.10
gnome-extra/mousetweaks )
- fprint? (
- sys-auth/fprintd
- sys-auth/pam_fprint )
+ fprint? ( sys-auth/fprintd[pam] )
"
DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
app-text/docbook-xml-dtd:4.1.2
dev-util/gdbus-codegen
dev-util/glib-utils
dev-util/itstool
+ >=gnome-base/dconf-0.20
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
- x11-base/xorg-proto
test? ( >=dev-libs/check-0.9.4 )
app-text/yelp-tools
" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup)
@@ -111,23 +113,6 @@ DOC_CONTENTS="
for smartcard support
"
-pkg_setup() {
- enewgroup gdm
- enewgroup video # Just in case it hasn't been created yet
- enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
- # For compatibility with certain versions of nvidia-drivers, etc., need to
- # ensure that gdm user is in the video group
- if ! egetent group video | grep -q gdm; then
- # FIXME XXX: is this at all portable, ldap-safe, etc.?
- # XXX: egetent does not have a 1-argument form, so we can't use it to
- # get the list of gdm's groups
- local g=$(groups gdm)
- elog "Adding user gdm to video group"
- usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
- fi
-}
-
src_prepare() {
# ssh-agent handling must be done at xinitrc.d, bug #220603
eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
@@ -209,10 +194,6 @@ src_install() {
newexe "${FILESDIR}/49-keychain-r1" 49-keychain
newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
- # gdm user's home directory
- keepdir /var/lib/gdm
- fowners gdm:gdm /var/lib/gdm
-
if ! use bluetooth-sound ; then
# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
# bug #679526
@@ -235,9 +216,9 @@ pkg_postinst() {
# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
ret=0
- ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
- chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1
- for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
+ ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
+ chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
+ for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
done
eend ${ret}
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 90f78ceb19e5..0499d56590ee 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,4 +1,10 @@
DIST gnome-control-center-3.36.4-patchset.tar.xz 12320 BLAKE2B a387d793186c898a14d54060214fbd075389afe402b1ad937a00295eed339a529863752324ba26f691ad468f214acda60be5bc23167d95fdf842f26a24442e55 SHA512 6f11425f13590e7850114613efa82e8762bd62687839c9374d2618ab81a08f1abb871d2a8f452811e46fa53af7007167f7b9ca68e0822daee22e9de33e0be94b
DIST gnome-control-center-3.36.4.tar.xz 6304992 BLAKE2B 7c52faf2a9a0f642f24f59e2035ae57e7816d69c8ee639cde76db7d69f8063c9eff2e068b95710d13316c267b5cf6c6647cb1359ac592968b1c5021730081130 SHA512 e6c398256215a139042e5bb0db7c83fc0e39f99ab893760e37ba303ec4c932a37da352b92487ed1bdc61f2e8f61352c752b48ab549269e3f84e21a71cdf32abf
+DIST gnome-control-center-3.36.5-patchset.tar.xz 7288 BLAKE2B 56f71bc1a8c9f5a62e10d8484b085a5a6024fc3c98f76980adb390806f8daeaf1deefc7d843e702a1813e46196963f3342c99fde8441127e95b5db1215270fdf SHA512 77162ff6ad5b52ab9a90c09d6bd8ec35ea0e7f8f00a7507c793e7955fabd37e7c732b302a6ec835e54fc9612c7aca5262c30e2f0de53cb2c22475ef965aebfd0
+DIST gnome-control-center-3.36.5.tar.xz 6304804 BLAKE2B c4e95784ff1877e716f23ea421d0d4997691e2aa15ce24eae35d9ecac167c48443e8f5180ff3359be75914512c240e4ef2ef8a2fdc51f1c6b15275eadef2c3bb SHA512 4a5470dc18366172198a68f8e0598647c0cae1fbcc00eec26dccf7320f0e3aca4a7326fbf0e616fd7e44ab1faacefaa9342322efcf79039122216c644c490b52
+DIST gnome-control-center-3.38.3-patchset.tar.xz 7308 BLAKE2B 72acdb825d48c7077d15f7273765db2ccbef89a839466a4482d9f6ae9eae3a2144556a048f2a6e146ea4e3435c13f0a72bf499c44d34bcbed505d6186d8bf008 SHA512 2498abd83e0100efa4c83886ce3e7f7d4468e41aab12c5338987832cb305c215abe75b4fff65217511bbe174b6b1b601af988c5588523e0346855aba7842092b
+DIST gnome-control-center-3.38.3.tar.xz 6434672 BLAKE2B e95a9a1c487e1a3d6a0e64c61fd9502d1983827ff0a26ed03a0e48339917ae49855016ac3699c3940764185041659d865db51fd95e19bbb588c62277218c609d SHA512 25b8ff6e44be5e679666ae44e12deedf5dbef9317089381cd2075efc2321abca91ac1ad268242fb16a0b7f411ad98d9ab50073f745060d6525e0648585333e3e
EBUILD gnome-control-center-3.36.4.ebuild 6336 BLAKE2B 1c77dcaf7ce58bad205e7c8c4f95c8fe364d7a7372131861395004cfa3c9b5a8419bf6b33ade7b289e702f2c3b75129c4d5c7ae402cb7ae0b69247f4994fe719 SHA512 48687fa14af525b41da88b39b4d2b67d6129e03feaccba629c19a7c8a8851af117c03d160a4114bcc433702777c899a6836d93790d6799675f53e4eba6360dc2
+EBUILD gnome-control-center-3.36.5.ebuild 6341 BLAKE2B cef26ea02bcf08043b49ceffd655e652c253abad47ccd411c4a8ffcb98fcdaa297c8626af80fd99ae7a13a782d36bc20f1c22ca4076a2b96be72dc3a22578130 SHA512 5def13278973a7bcc6f7109e8babbb3a7896cc1f25409e12ca9fae70af7ae0d0175e77b755c9c61b84d05252ef71ba0ffad047e970014404ef12b2c508c5fd9f
+EBUILD gnome-control-center-3.38.3.ebuild 6227 BLAKE2B 38cd9e8f90f91d6ae67083b5681113dc8c9c205ccf63566926438587d0b26681a13138affca2bacbe630d186669446a6151870645bd81867101bd7bc82001fbc SHA512 c5ee11098c5d1f5aaf521274d714906a1a47e2dac94cfa5c40c807fdf19431b9bd52ecd6a7b4f71b3274d362bfc1270be5323344453edf87b128c2ffc25d5c0e
MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild
new file mode 100644
index 000000000000..a4f3f20fd8a1
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ flickr? ( gnome-online-accounts )
+ ^^ ( elogind systemd )
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# display panel requires colord and gnome-settings-daemon[colord]
+# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
+# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
+# 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
+DEPEND="
+ >=gui-libs/libhandy-0.0.9:0.0=
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
+ >=media-sound/pulseaudio-2.0[glib]
+ >=sys-apps/accountsservice-0.6.39
+ >=x11-misc/colord-0.1.34:0=
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=dev-libs/glib-2.56.0:2
+ >=gnome-base/gnome-desktop-3.27.90:3=
+ >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
+ >=gnome-base/gsettings-desktop-schemas-3.31.0
+ dev-libs/libxml2:2
+ >=sys-auth/polkit-0.114
+ >=sys-power/upower-0.99.8:=
+ >=dev-libs/libgudev-232
+ x11-libs/libX11
+ >=x11-libs/libXi-1.2
+ media-libs/libepoxy
+ flickr? ( >=media-libs/grilo-0.3.0:0.3= )
+ >=x11-libs/gtk+-3.22.0:3[X,wayland=]
+ cups? (
+ >=net-print/cups-1.7[dbus]
+ >=net-fs/samba-4.0.0[client]
+ )
+ v4l? (
+ >=media-video/cheese-3.28.0 )
+ ibus? ( >=app-i18n/ibus-1.5.2 )
+ networkmanager? (
+ >=net-libs/libnma-1.8.0
+ >=net-misc/networkmanager-1.12.0:=[modemmanager]
+ >=net-misc/modemmanager-0.7.990 )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
+ input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+ kerberos? ( app-crypt/mit-krb5 )
+
+ x11-libs/cairo[glib]
+ >=x11-libs/colord-gtk-0.1.24
+ net-libs/libsoup:2.4
+ media-libs/fontconfig
+ gnome-base/libgtop:2=
+ >=sys-fs/udisks-2.1.8:2
+ app-crypt/libsecret
+ media-libs/gsound
+ >=dev-libs/libpwquality-1.2.2
+"
+# systemd/elogind USE flagged because package manager will potentially try to satisfy a
+# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
+# libgnomekbd needed only for gkbd-keyboard-display tool
+# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${DEPEND}
+ systemd? ( >=sys-apps/systemd-31 )
+ elogind? ( app-admin/openrc-settingsd
+ sys-auth/elogind )
+ x11-themes/adwaita-icon-theme
+ >=gnome-extra/gnome-color-manager-3.1.2
+ cups? (
+ app-admin/system-config-printer
+ net-print/cups-pk-helper )
+ >=gnome-base/libgnomekbd-3
+ wayland? ( dev-libs/libinput )
+ !wayland? (
+ >=x11-drivers/xf86-input-libinput-0.19.0
+ input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+ flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
+
+ !<gnome-base/gdm-2.91.94
+ !gnome-extra/gnome-media[pulseaudio]
+ !<gnome-extra/gnome-media-2.32.0-r300
+ !<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
+# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
+ networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
+
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.2
+ x11-base/xorg-proto
+ dev-libs/libxml2:2
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep '
+ dev-python/dbusmock[${PYTHON_USEDEP}]
+ ') )
+"
+
+PATCHES=(
+ # Patches from gnome-3-36 branch on top of 3.36.4
+ # Makes some panels and dependencies optional
+ # https://bugzilla.gnome.org/686840, 697478, 700145
+ # Fix some absolute paths to be appropriate for Gentoo
+ "${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+ use test && \
+ has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ xdg_src_prepare
+ # Mark python tests with shebang executable, so that meson will launch them directly, instead
+ # of via its own python-single-r1 version, which might not match what we get from python_check_deps
+ chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use bluetooth)
+ $(meson_use v4l cheese)
+ -Dcups=$(usex cups enabled disabled)
+ -Ddocumentation=true # manpage
+ -Dgoa=$(usex gnome-online-accounts enabled disabled)
+ -Dgrilo=$(usex flickr enabled disabled)
+ $(meson_use ibus)
+ -Dkerberos=$(usex kerberos enabled disabled)
+ $(meson_use networkmanager network_manager)
+ -Dprivileged_group=wheel
+ -Dsnap=false
+ $(meson_use test tests)
+ $(meson_use debug tracing)
+ $(meson_use input_devices_wacom wacom)
+ #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
+ # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.38.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.38.3.ebuild
new file mode 100644
index 000000000000..ea7b34ab2c84
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.38.3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ flickr? ( gnome-online-accounts )
+ ^^ ( elogind systemd )
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# display panel requires colord and gnome-settings-daemon[colord]
+# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
+# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
+# 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
+DEPEND="
+ >=gui-libs/libhandy-1:1=
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
+ >=media-sound/pulseaudio-2.0[glib]
+ >=sys-apps/accountsservice-0.6.39
+ >=x11-misc/colord-0.1.34:0=
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=dev-libs/glib-2.56.0:2
+ >=gnome-base/gnome-desktop-3.27.90:3=
+ >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
+ >=gnome-base/gsettings-desktop-schemas-3.37.0
+ dev-libs/libxml2:2
+ >=sys-auth/polkit-0.114
+ >=sys-power/upower-0.99.8:=
+ >=dev-libs/libgudev-232
+ x11-libs/libX11
+ >=x11-libs/libXi-1.2
+ media-libs/libepoxy
+ flickr? ( >=media-libs/grilo-0.3.0:0.3= )
+ >=x11-libs/gtk+-3.22.0:3[X,wayland=]
+ cups? (
+ >=net-print/cups-1.7[dbus]
+ >=net-fs/samba-4.0.0[client]
+ )
+ v4l? (
+ >=media-video/cheese-3.28.0 )
+ ibus? ( >=app-i18n/ibus-1.5.2 )
+ networkmanager? (
+ >=net-libs/libnma-1.8.0
+ >=net-misc/networkmanager-1.20.0:=[modemmanager]
+ >=net-misc/modemmanager-0.7.990 )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
+ input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+ kerberos? ( app-crypt/mit-krb5 )
+
+ x11-libs/cairo[glib]
+ >=x11-libs/colord-gtk-0.1.24
+ net-libs/libsoup:2.4
+ media-libs/fontconfig
+ gnome-base/libgtop:2=
+ >=sys-fs/udisks-2.1.8:2
+ app-crypt/libsecret
+ media-libs/gsound
+ >=dev-libs/libpwquality-1.2.2
+"
+# systemd/elogind USE flagged because package manager will potentially try to satisfy a
+# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
+# libgnomekbd needed only for gkbd-keyboard-display tool
+# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${DEPEND}
+ systemd? ( >=sys-apps/systemd-31 )
+ elogind? ( app-admin/openrc-settingsd
+ sys-auth/elogind )
+ x11-themes/adwaita-icon-theme
+ >=gnome-extra/gnome-color-manager-3.1.2
+ cups? (
+ app-admin/system-config-printer
+ net-print/cups-pk-helper )
+ >=gnome-base/libgnomekbd-3
+ wayland? ( dev-libs/libinput )
+ !wayland? (
+ >=x11-drivers/xf86-input-libinput-0.19.0
+ input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+ flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
+"
+# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
+# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
+ networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
+
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.2
+ x11-base/xorg-proto
+ dev-libs/libxml2:2
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep '
+ dev-python/dbusmock[${PYTHON_USEDEP}]
+ ') )
+"
+
+PATCHES=(
+ # Patches from gnome-3-38 branch on top of 3.38.3
+ # Makes some panels and dependencies optional
+ # https://bugzilla.gnome.org/686840, 697478, 700145
+ # Fix some absolute paths to be appropriate for Gentoo
+ "${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+ use test && \
+ has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ xdg_src_prepare
+ # Mark python tests with shebang executable, so that meson will launch them directly, instead
+ # of via its own python-single-r1 version, which might not match what we get from python_check_deps
+ chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use bluetooth)
+ $(meson_use v4l cheese)
+ -Dcups=$(usex cups enabled disabled)
+ -Ddocumentation=true # manpage
+ -Dgoa=$(usex gnome-online-accounts enabled disabled)
+ -Dgrilo=$(usex flickr enabled disabled)
+ $(meson_use ibus)
+ -Dkerberos=$(usex kerberos enabled disabled)
+ -Dmalcontent=false # unpackaged
+ $(meson_use networkmanager network_manager)
+ -Dprivileged_group=wheel
+ -Dsnap=false
+ $(meson_use test tests)
+ $(meson_use debug tracing)
+ $(meson_use input_devices_wacom wacom)
+ #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
+ # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 96c056c414df..49b905ff87c4 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,8 +1,6 @@
AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-3.36.5.tar.xz 738956 BLAKE2B 6c419df487e908f57a1dc8798a8dfe8b574d8c5c9aa5d83e45aed233ba856ba398367a990aa83fb1b8966aad02c868cd0e41805908863ea8fef24cc3ade3687c SHA512 0b5ad42c0832d58552270e9e24dabf56668c4fbb84d07812e4a2a34cff0a67344a7c8ee963a53a703b2e4bb28c67035bf2ce854ea271194511dc66e051481b1b
DIST gnome-desktop-3.36.8.tar.xz 739236 BLAKE2B 378cf551787863543e30b0e69dd7447a5a9fd1026c3c85f32f140874658f803e6e8d2a82c79a1a9c4aadd08043905f1b0486e900596e855c2650248ac9478d01 SHA512 d9a447ec1c34e98d19ed6f5ef7e48f19d89009bd20368e2d731ff0cea30adc2dea6c0293df9b07f39e4573035edd25815ccd7d740f09ba421ebee74b7c8c90a2
-DIST gnome-desktop-3.38.2.tar.xz 745252 BLAKE2B cdbc3ae5bf78dfed0dcedfd83c01ab13f551c312d4eb5e680a9e22932d55ee9cf9334bec84cd99186d43afcf3fe707a12b469409d5c2094a8bbd8a1d36a75ed2 SHA512 93e98c10cac0f1c035af33fc61f945dfdbe12e88e4c42d44b5ba0570f8d81bb3f40f5e0d9fd6c4e4d9faf674f38ded0fc99dfffd57b824d62b92368df6239da8
-EBUILD gnome-desktop-3.36.5.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
+DIST gnome-desktop-3.38.3.tar.xz 745372 BLAKE2B d5df6d8bead6f65f655c7fbb65ea07937250318ee1fdc3e15c7d74a6e5933389640a06d162079dfce0137db11ceb67b4d86dcff787ecee9dbbbdf750e7aaa252 SHA512 023121316d308d8d69a26bd595657f2d7471da82395c7208cdd642a5e58927d2af05b27b6a0e52eaa10f9fa5a27c1146d5496c042ae3a9cf7e134875d3b2c84f
EBUILD gnome-desktop-3.36.8.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
-EBUILD gnome-desktop-3.38.2.ebuild 1927 BLAKE2B befbd291e5a488f81c53ad4da33ed3ddf05ccd51525018bbab13b020be432c0c47cbdf7823b6330bd4e58a6930994558ab977afdb9cb04520bad203ce7a47466 SHA512 8639565b2cfaa893a1b692f7a39b4a269c1a9b4ae8b1586487b8e0779f79e9a07c30bd3680b8675e060c6a8d60826f2f0f00b8f7ab1f84dfe2167c245b9c51f1
+EBUILD gnome-desktop-3.38.3.ebuild 1927 BLAKE2B 4df2c7f4106735ba0b75111cb9573db0849c6e34e910e17eed037eb6ee3e79e62a783c1890ed5ffe86a6a5d7407fa1e5613aa55ef43a99ebca3f9bedf9f51a6e SHA512 ce16a220725338c8ede87ed48b29dbc06482b7f25073838721853d999e93e8d858d4fed4b90876544a4f26dedc9557b3497065aba0bb4272b56ba3d4a176fe19
MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild
deleted file mode 100644
index bcd26befee5f..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
- >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
- >=dev-libs/glib-2.53.0:2
- >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
- x11-misc/xkeyboard-config
- app-text/iso-codes
- x11-libs/libX11
- systemd? ( sys-apps/systemd:= )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
- seccomp? ( sys-libs/libseccomp )
-
- x11-libs/cairo:=[X]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
- media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
- seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- gtk-doc? ( >=dev-util/gtk-doc-1.14 )
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
- "${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
- # Don't build manual test programs that will never get run
- sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Dgnome_distributor=Gentoo
- -Ddate_in_gnome_version=true
- -Ddesktop_docs=true
- $(meson_use debug debug_tools)
- $(meson_use introspection)
- $(meson_feature udev)
- $(meson_feature systemd)
- $(meson_use gtk-doc gtk_doc)
- -Dinstalled_tests=false
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.3.ebuild
index f2127cb11f3b..6ec27d919253 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.38.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index a8abe06f6c41..825e79ec9764 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,3 @@
DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194 SHA512 e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed
-EBUILD gnome-keyring-3.36.0.ebuild 2261 BLAKE2B af850ab3e1f8cf880a68432638eb2d8839a8058a6a5919d554a125f0e0451040962eb6a3a648fa7735d973b386681f7ce857606dcfbb9326c5b27a82b92871af SHA512 d4c54487c420115db2c4c4b21de3236a3ec1086f10dc7cc91124f6c0ad743ba2426b4bdbe632f6542fe46b7091cad14d1c9a7f9fc394481abf9911664ad1e61b
+EBUILD gnome-keyring-3.36.0.ebuild 2287 BLAKE2B 21c26fe56eeea29cacbc0ef63d512eac665fe5dbb22f2dd6bf32714b4839e3ff2f931ffbe6c5f0b3baf46fe5ec018c8a9e9dc33b9b7c235b35a3c6139d2517c6 SHA512 ca4d338d3f5e6681e9faf117f5e68b4b1335328b9bc0e69f18874f7c4438df5fd4dc0b272c1dbdc021ad8c533b9b79732d15653c7f9b5b6de0b7e657bf6f1be9
MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
index c28cbcaedec6..9315b7b2daba 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
@@ -1,8 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit fcaps gnome2 pam python-any-r1 virtualx
@@ -19,16 +18,18 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
RDEPEND="
>=app-crypt/gcr-3.27.90:=[gtk]
- >=dev-libs/glib-2.44:2
+ >=app-crypt/gnupg-2.0.28:=
+ >=app-eselect/eselect-pinentry-0.5
app-misc/ca-certificates
+ >=dev-libs/glib-2.44:2
>=dev-libs/libgcrypt-1.2.2:0=
caps? ( sys-libs/libcap-ng )
pam? ( sys-libs/pam )
selinux? ( sec-policy/selinux-gnome )
- >=app-crypt/gnupg-2.0.28:=
ssh-agent? ( net-misc/openssh )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=app-eselect/eselect-pinentry-0.5
app-text/docbook-xml-dtd:4.3
dev-libs/libxslt
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index d24de19eb16d..3eeb1eb49481 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -3,6 +3,8 @@ AUX 3.36-defaults.patch 1463 BLAKE2B c529ac85d19699d0837f4060011b8b7dd03773af442
DIST gnome-shell-3.36.7-patchset.tar.xz 6364 BLAKE2B 80a2e2a03e4cc3b15db6af872a2330c0921a63bcd03db78a970190fee93c982296b381d08ac4bd1cb5dbe5b14d9732e447445f5dcc06d607826a9026395f10bb SHA512 6f9145fd00117e6b4170e7457c83a8c3bbbbfc6086ce3bcd07813b5a4f05e58f42e889cc90799d6988af05fce9791a792e4d8d60ffe58818563c852f9923930d
DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85c1979122ee71e7e0d7c55626a608ba4598071bf8659338c960ba4b0349e5b621b97f294a4961cf021b9047753136af5 SHA512 7275d1e2d2629abd2fbfae910a77c25485464e39f8317ba1b0e8e1ae3368e69af4eb85c2611e82ea04270bfd8185e24f13002df9b13335adbdff144847790656
DIST gnome-shell-3.38.2.tar.xz 1814152 BLAKE2B 765f584ad8f71ac185e9dc6683f1866308c126d8ce8ba9330068e324ea9586b57315cf7feade62eb4142bb3a4effd80c7e6e0d7b36b6c5fb7d547e3bff9c2ab2 SHA512 ac37549039a11f4f1b2cdd8b0f8cab72093efca74a5909ad187121565cce737c6a6f296c7241ac5f2174fdfcf11070f7584e713e244fafc911fe039d8fd05f04
+DIST gnome-shell-3.38.3.tar.xz 1815204 BLAKE2B 1df05f0a3709d851d9bb01c8d8f82b3e36aa1da68256198afe7f5663bbf3dc3b88148220b4f90a1ab3eb3d2a14e370dc038e9afd73c57133f9535423b074ac27 SHA512 695446a934b3e5f8512084cb4eaba3e27aec0e03041890fb2a7a9eb4d91d3a9f2f5ca94a8616ce4e7303a2073fda7878425ba31bf590c448132f379fa7138d47
EBUILD gnome-shell-3.36.7.ebuild 6667 BLAKE2B 5fbfd1bf5a20ad8a7262a4bdc8c8b797ac3e5d34652fa2e50ad875778eb84f1a0f5be7c23ce7ed57d3d1e293c439a0dfad7bd7840d23e58ae1c83be31e1c6736 SHA512 bf5b0add1c462998859e3f32e8bae687ec53f9cd1911110a1246bd39361d1f219c326ccb2cf12e12b56e8673311fd7e5895cfdceb8a800f3d114b8cfee5f79ac
EBUILD gnome-shell-3.38.2.ebuild 6304 BLAKE2B 3afdd773e134f62a466f6b9800477babd04446ede7bb7b8768f82b90bf540be0c6944b3c30805a51a17524a1afadc332d95bd34513ee8fc5f54dc63d0b632897 SHA512 abf9a4c80031a686b6332c506f452d8ebf0fe04cdccdd2d9798b8cdd933f8bac88c3302f6f591c4195c3b358246064349fdc6a04e9a88f6c0bc38d35cf9c863d
+EBUILD gnome-shell-3.38.3.ebuild 6304 BLAKE2B 3afdd773e134f62a466f6b9800477babd04446ede7bb7b8768f82b90bf540be0c6944b3c30805a51a17524a1afadc332d95bd34513ee8fc5f54dc63d0b632897 SHA512 abf9a4c80031a686b6332c506f452d8ebf0fe04cdccdd2d9798b8cdd933f8bac88c3302f6f591c4195c3b358246064349fdc6a04e9a88f6c0bc38d35cf9c863d
MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild
new file mode 100644
index 000000000000..e8428c44af46
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+# * gstreamer/pipewire support is currently automagic
+DEPEND="
+ >=gnome-extra/evolution-data-server-3.33.1:=
+ >=app-crypt/gcr-3.7.5[introspection]
+ >=dev-libs/glib-2.57.2:2
+ >=dev-libs/gobject-introspection-1.49.1:=
+ >=dev-libs/gjs-1.65.1
+ >=x11-libs/gtk+-3.15.0:3[introspection]
+ >=x11-wm/mutter-3.38.0:0/7[introspection]
+ >=sys-auth/polkit-0.100[introspection]
+ >=gnome-base/gsettings-desktop-schemas-3.33.1
+ >=x11-libs/startup-notification-0.11
+ >=app-i18n/ibus-1.5.2
+ >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+ >=media-libs/gstreamer-0.11.92:1.0
+ media-libs/gst-plugins-base:1.0
+ >=media-video/pipewire-0.3.0:0/0.3
+ networkmanager? (
+ >=net-misc/networkmanager-1.10.4:=[introspection]
+ net-libs/libnma[introspection]
+ >=app-crypt/libsecret-0.18
+ dev-libs/dbus-glib )
+ systemd? ( >=sys-apps/systemd-242
+ >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+ elogind? ( >=sys-auth/elogind-237 )
+ app-arch/gnome-autoar
+ dev-libs/json-glib
+
+ >=app-accessibility/at-spi2-atk-2.5.3
+ x11-libs/gdk-pixbuf:2[introspection]
+ dev-libs/libxml2:2
+ x11-libs/libX11
+
+ >=media-sound/pulseaudio-2[glib]
+ >=dev-libs/atk-2[introspection]
+ dev-libs/libical:=
+ >=x11-libs/libXfixes-5.0
+
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
+ media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+ >=sys-apps/accountsservice-0.6.14[introspection]
+ app-accessibility/at-spi2-core:2[introspection]
+ app-misc/geoclue[introspection]
+ >=dev-libs/libgweather-3.26:2[introspection]
+ >=sys-power/upower-0.99:=[introspection]
+ x11-libs/pango[introspection]
+ gnome-base/librsvg:2[introspection]
+
+ >=gnome-base/gnome-session-2.91.91
+ >=gnome-base/gnome-settings-daemon-3.8.3
+
+ x11-misc/xdg-utils
+
+ >=x11-themes/adwaita-icon-theme-3.26
+
+ networkmanager? (
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data )
+ ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+ telepathy? (
+ >=net-im/telepathy-logger-0.2.4[introspection]
+ >=net-libs/telepathy-glib-0.19[introspection] )
+ media-fonts/cantarell
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection]
+ >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+ browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+ dev-lang/sassc
+ dev-libs/libxslt
+ app-text/asciidoc
+ >=dev-util/gdbus-codegen-2.45.3
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.17
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ "${FILESDIR}"/3.34-optional-bluetooth.patch
+ # Change favorites defaults, bug #479918
+ "${FILESDIR}"/3.36-defaults.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ # Hack in correct python shebang
+ sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use bluetooth)
+ -Dextensions_tool=true
+ -Dextensions_app=true
+ $(meson_use gtk-doc gtk_doc)
+ -Dman=true
+ $(meson_use networkmanager)
+ $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+ # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+ ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+ ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+ fi
+
+ if ! has_version "media-libs/mesa[llvm]"; then
+ elog "llvmpipe is used as fallback when no 3D acceleration"
+ elog "is available. You will need to enable llvm USE for"
+ elog "media-libs/mesa if you do not have hardware 3D setup."
+ fi
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=563084
+ # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+ if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+ ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+ ewarn "otherwise Gnome will fail to start"
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 39bbafbbbff3..d871f6930437 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,3 +1,3 @@
DIST libgnomekbd-3.26.1.tar.xz 450636 BLAKE2B 241f2f9af95696600f82ab3a1f53f80c6e76f6e81636419407957f172a2758ee16f5c6d419ab1c1c37d2e054c42b65404062471eceabc0fba45099481eb7b214 SHA512 8e83522f4d96001f9635278a001e0208d6d37e74b19a8c1702ec6de651036ad37a03385e66adbd3bae01d845a9a6181bb76f45bffec31eac98d600b49ab4360c
-EBUILD libgnomekbd-3.26.1.ebuild 800 BLAKE2B dcd8aaa43244bc4323987db630ce52d8f9aac63f2c9070ebe383a92bd987ccac9328c658d1f05881e507e16cd47bf6fa3c70801faf4db270cdfdc0f242a7356e SHA512 0b2a0e1e29ecde0ac275ad9bc68a61a92ccd497f9d277d338f00f494811e4e5f0ef46de62e997ca07aa9c28d5c3686d8626bf1da4736a102b85cf8b91ae6847f
+EBUILD libgnomekbd-3.26.1.ebuild 811 BLAKE2B 24edfe4511de6f99340fd73d0614ab9990276c9db0e23fc17bdc3aea5f4a088184e78129d5afc14698b740b2773a8d8a7fb5a72344e3fb9745e52aca595a8509 SHA512 308b9178b2a8c5e5dfec170099e6b0ea235aa01be74623c03d50ef7de652a3276819c283ccb843b5d261e1306b18a875f675188f060857cd35c64dabc3fe2c06
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
index 8ba0aec7a5c2..8b6422e1ad97 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit gnome2
@@ -21,7 +21,8 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/glib-utils
>=sys-devel/gettext-0.19.4
virtual/pkgconfig
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 3b227267fccd..286cbb1d2734 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6
DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b
DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
-EBUILD libgtop-2.40.0-r1.ebuild 1211 BLAKE2B 0318bb4dbc3326e0d1692ad3e84db5d25910891909e924bc0995e762b2bd6bdce13f20632ca14d7810f6dcdb5aa553204217d8dbb0a61e34a2d741d0b981e87d SHA512 2a476fef7deee533b3a6cc5549f8bfe17e81972577f5a2f359a8db1eb4aef6f0a08c781eb938e06ceced2305864f209d19548cd18d4ee823d1b67d175cb04edb
+EBUILD libgtop-2.40.0-r1.ebuild 1222 BLAKE2B 3afb05e70ac310e78660ff870a2d7824f6b2b276c6a77a292c6cc65006ae44d6a6ef29c188ccd290efb04675c34d2717595b8ebb5db07ef55819056004515715 SHA512 b4d77a90adb0a94f50708028b8a7754994108861dab59fcf1708026363fcc0c97fbe108779fb71cfa1a74772d326fc429e90661995ac72b5c06c76ffa20ccdf0
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
index 454fa3ec2244..a724366d9e2f 100644
--- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
GNOME2_EAUTORECONF="yes"
inherit flag-o-matic gnome2
@@ -18,7 +18,8 @@ RDEPEND="
>=dev-libs/glib-2.26:2
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=dev-util/gtk-doc-am-1.4
>=sys-devel/gettext-0.19.6
virtual/pkgconfig