diff options
Diffstat (limited to 'gnome-base/gnome-control-center')
| -rw-r--r-- | gnome-base/gnome-control-center/Manifest | 15 | ||||
| -rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild | 180 | ||||
| -rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild | 180 | ||||
| -rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-3.38.3.ebuild | 176 | ||||
| -rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild | 2 | ||||
| -rw-r--r-- | gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild (renamed from gnome-base/gnome-control-center/gnome-control-center-3.38.4.ebuild) | 11 |
6 files changed, 10 insertions, 554 deletions
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 43cb4fba93ea..ebd1a956614a 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,14 +1,7 @@ -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 -DIST gnome-control-center-3.38.4.tar.xz 6434656 BLAKE2B 6201344c3ce4a1e85c8becde5df24d0aaa294ba0f135220fa1bd1ca079fb99ea30a4bb9f6403f17584bb1299b7d3edf1300fa94fca44a75bd947c84cc257be35 SHA512 9fa90b33af09fe5458c2db8782079d992f18bc36cdd6623239b48d6c8f242fa9b56275ee7c6920f313efcd2f8f1c65a43a8f3f1c100489a0bcade26d045eb3c7 DIST gnome-control-center-3.38.5.tar.xz 6435648 BLAKE2B 6bcb91433540278850008b1a015caa157fede8533fc5fdf22b58a9f7511fe39a9c3dc195ed9aa1fcf729b6eaa2cf18cf67781300d43ed23ea63c3c6fc5cfb64f SHA512 d173dc863bb62010577a99c3f6705fd92c7e1b9fba124c7ab7fb32b22e01b23b75dea976b45e8d65e7329edca50fb892fe298e8ca2861c7e1185318b7be6cb67 -EBUILD gnome-control-center-3.36.4.ebuild 6333 BLAKE2B e2710b49f78faedc5066a8c0c62d3a712c1eaae8118673d132f418ecdf0083d3051d1150cec64101da212e6f7b02f9119c9e62d491b70169d1fb3c27e482d3e2 SHA512 1c27bd276acf3f80caea1a67487eb885752726850127bc39ee4edb4b74f7f4e0b69034f2954b29d71a4f0efa097b7d09cc983263d3269465d92ec9b61b8a6316 -EBUILD gnome-control-center-3.36.5.ebuild 6341 BLAKE2B 6e8255b594daef3763ec65ef68ec32b6e09c8087abb0c6e42003737000ea5687b40b4d52a3a066d4c3590a3a211c03fc9e60d3fea107c9ccdf5831dd9d0af911 SHA512 306f9e56bff6c11b0e2b364391894633aa18614d7a632100e333fcab7e00a64806da39f7005191403c08241d90cac28bbaba524778a2b7babc3818894858dcac -EBUILD gnome-control-center-3.38.3.ebuild 6226 BLAKE2B d3f722ecacaa770962b4f859bafe4e9427934c04205d421b9824c1a5381314631f9065bbb5207912a7887d8bcfbc7613d572cb27bda1ccaac06d1e282f94d634 SHA512 b142a2399ac3c5d5b5316a87b10722b2af9ca40d1e88c706e6b4fd34e2c5310f3393ef3fc56575357c4f720976288c3a34efa812833af5309c8b1158b741d5be -EBUILD gnome-control-center-3.38.4.ebuild 6235 BLAKE2B 1691b82677c5ab8ee1afd37a121fd20383be5e69c347ca870aa0a58362c2865ac04c6d247a328a4b753249947de2fe55e42c3d6bff8592b85dee98e66eafc990 SHA512 46b694410f5755a5c360e027668d6b5ed4130cb650259ef3497d8191e6b2976b61f8c7b0490b4c29517bce4472b7e6c6191b6fa06d74096d3edaedf3fc09271e -EBUILD gnome-control-center-3.38.5.ebuild 6235 BLAKE2B 1691b82677c5ab8ee1afd37a121fd20383be5e69c347ca870aa0a58362c2865ac04c6d247a328a4b753249947de2fe55e42c3d6bff8592b85dee98e66eafc990 SHA512 46b694410f5755a5c360e027668d6b5ed4130cb650259ef3497d8191e6b2976b61f8c7b0490b4c29517bce4472b7e6c6191b6fa06d74096d3edaedf3fc09271e +DIST gnome-control-center-40.0-patchset-2.tar.xz 7396 BLAKE2B 9d3c0461c065cbf0f2051847e516066a38ebffc0972f12060fc41a7d283dd0eecd1a3e581518e13c1dcd545d600e7a2bece5d33d10e8c50adcb2b05f9558e8d0 SHA512 3a93c0c2f0f2bc422e6992c259334d9a90678151882e2df3035e4c233fa8e6c557073cc6679044b27bbfaafaa06d59b76724154dcd63612724e1e89817c99a36 +DIST gnome-control-center-40.0.tar.xz 6463616 BLAKE2B 7c79b79a0cb9bb847cdeb31613e9520b446f7720031fc7cda927a82b6e0acc6af03a047fe296a45f6e171c4ab1659b4ed5c6d07f83c9ffa554b1bdcce6fa26fe SHA512 26980cd18c414b12d2bf7e61be200e02302e170d53aba4f064154eda4c006648160919b6d4c9d168d8c5a461c05dc6593a52066b144af577c6aac420b9723cb9 +EBUILD gnome-control-center-3.38.5.ebuild 6232 BLAKE2B 865c1b617db05afcc0106051e65d0d18972ee8303fd591ed2c6184868fa63a52a9a329a088f7f0258359c4895db066835241bd04168a640d7eef8856a9a596f6 SHA512 082c2932be4304dbe110e873413b3802055df356577d0c293b57a68776245002894809ba79411a181f24f40eb07bc89043a1c7ba0481229a1efb6135cc25c0fa +EBUILD gnome-control-center-40.0.ebuild 6226 BLAKE2B 1f0edbd5ade2e3e6776a22a7745fb155da0349a186a975d82a6c0a1a3fd1b9b0420c75dad049b870fc432c42843290c93e1cd2dd8e7eea02dc404573adbf74e1 SHA512 7a1c4ec192e8013e60decbf7dd6791d969f35b41a2078e57bf45848fb10335ed244ff51e6a1d56b103a4b2e98bfef527e841b61f3741fb8ab0d328dd12c24458 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild deleted file mode 100644 index a0f077088574..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) - -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/~leio/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.36.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild deleted file mode 100644 index 3452770f5c7e..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.36.5.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..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 deleted file mode 100644 index ff89e2e1c520..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.38.3.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..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-control-center/gnome-control-center-3.38.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild index ac894c3d8ce2..164c4de68f62 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild @@ -18,7 +18,7 @@ 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" +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] diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.38.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild index ac894c3d8ce2..04001bc83850 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.38.4.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild @@ -8,7 +8,7 @@ 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/${PN}-3.38.3-patchset.tar.xz" +SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-40.0-patchset-2.tar.xz" LICENSE="GPL-2+" SLOT="2" @@ -33,7 +33,7 @@ DEPEND=" >=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-desktop-3.33.4: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 @@ -54,7 +54,7 @@ DEPEND=" ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.0 - >=net-misc/networkmanager-1.20.0:=[modemmanager] + >=net-misc/networkmanager-1.24.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) @@ -119,7 +119,7 @@ BDEPEND=" " PATCHES=( - # Patches from gnome-3-38 branch on top of 3.38.3 + # Patches from gnome-40 branch on top of 40.0 # Makes some panels and dependencies optional # https://bugzilla.gnome.org/686840, 697478, 700145 # Fix some absolute paths to be appropriate for Gentoo @@ -127,8 +127,7 @@ PATCHES=( ) python_check_deps() { - use test && \ - has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" + use test && has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" } pkg_setup() { |