From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1713005-garchives=archives.gentoo.org@lists.gentoo.org> Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 741EA1580E0 for <garchives@archives.gentoo.org>; Sun, 26 Jan 2025 17:33:07 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 59D56343582 for <garchives@archives.gentoo.org>; Sun, 26 Jan 2025 17:33:07 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 57221110473; Sun, 26 Jan 2025 17:32:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 4DED4110473 for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jan 2025 17:32:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDAAE34352E for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jan 2025 17:32:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 302B3230A for <gentoo-commits@lists.gentoo.org>; Sun, 26 Jan 2025 17:32:57 +0000 (UTC) From: "Pacho Ramos" <pacho@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" <pacho@gentoo.org> Message-ID: <1737906605.2ee0b99420a925fc89f768c9ab365ff7418145ed.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-control-center/Manifest gnome-base/gnome-control-center/gnome-control-center-45.3-r1.ebuild gnome-base/gnome-control-center/gnome-control-center-45.4-r1.ebuild gnome-base/gnome-control-center/gnome-control-center-46.2-r1.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 2ee0b99420a925fc89f768c9ab365ff7418145ed X-VCS-Branch: master Date: Sun, 26 Jan 2025 17:32:57 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f7eebef7-cc63-4e4e-bf27-5882e84f6213 X-Archives-Hash: c3a98e7b371b6a4321a086ee1c3699f3 commit: 2ee0b99420a925fc89f768c9ab365ff7418145ed Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Jan 26 15:50:05 2025 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Jan 26 15:50:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee0b994 gnome-base/gnome-control-center: drop 45.3-r1, 45.4-r1, 46.2-r1 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> gnome-base/gnome-control-center/Manifest | 5 - .../gnome-control-center-45.3-r1.ebuild | 211 -------------------- .../gnome-control-center-45.4-r1.ebuild | 211 -------------------- .../gnome-control-center-46.2-r1.ebuild | 215 --------------------- 4 files changed, 642 deletions(-) diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 99dd50fb9831..235f774c2cb5 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,8 +1,3 @@ -DIST gnome-control-center-45.0-patchset.tar.xz 5888 BLAKE2B 7b7d818392e8758ca4d9247f55b84e4e8a37419859040e35d8fb3cef16f09423ad74a88a821a5f5947b3f36543ccc328f9a61cb71f92155b6a14669732569910 SHA512 e58adc6bb61d04f8c5ecf36335fedd190e063e42eed8e1023dcac95665a270d57c7cbd377fd0f5239f2c144040a9699b428536ffdbac798655b2c9aef25e71ae -DIST gnome-control-center-45.3.tar.xz 7757512 BLAKE2B 2f38b9b6a5c7171eefd8899bb9156b49f6b41f60ce2bfb36d7ade7261cd038ddb60bcc9a6a71e6c49209f0f3c13c49b38758a19f02cc9735cea2874368602434 SHA512 0aad27f3324940292551c0aa9fa79771d1d41cc5a633970c709836a2d6af575f688df8553755f936495f75a02268a5a1f89e7f3b5fb03512140c73bf14fc4cf5 -DIST gnome-control-center-45.4.tar.xz 7764264 BLAKE2B 5e3632901b1203fc71b839a71aad50f63741412dfc673b8b8f87c72716fda386a1c7641b64642be811f94d6b2c54263deb45c4624d828ec66726d2a833a272e4 SHA512 d16b3c1cffeb7db27e9743106b6bc7ad925a832162764d0714b4931d0c21c9e02137b5b5e101be93dd8a92aebaa8556f6ce52e83c5e05e9e3d7e40d46b8c11d5 -DIST gnome-control-center-46.2-patchset.tar.xz 5872 BLAKE2B 745e817b0fcec81d5e390cd35e0a14ab249af2861f6bb206f77ace93b0ffc9620479213bae69dd6ef1af01b50a647b7cae14d72ae831a66f11c44c6f91c886a3 SHA512 efa7e4f4c488d1f41501c2e7d36b07000eb659e0f7c98779490ee520914967c6644f7c112827327e0c4f43e5194044aa36f589a3c729c1ebbd10889cb932fdb2 -DIST gnome-control-center-46.2.tar.xz 8030924 BLAKE2B 2c51bc6929ae6692f2c52f1b7b38972ac563b511b321e2b09358ee75a6c78254b0f0b60a079fb22bd5019f4d49effb32967029c9526cf3acd399098cf5e2b975 SHA512 0c91a0480f4f46ae3a9ec62294716bb5dbd0e606f22f842a4f7bc1d388496f0a3a36ed1da4a9f31139d8fd07e23e22367c212c98a0afc00842920092d71aecf5 DIST gnome-control-center-46.4-patchset-r1.tar.xz 5996 BLAKE2B 0df54d229f05d8803d99d32d60afb40c2ccd08c79061301a568a854fe2a6462003391b5d71ccb8bfd828cb189a56320d03d97674a06429a8e129d6b87dc14f81 SHA512 e7a48d431aa432513c90b41ed20327a8d6b378801a02d8c77dba147db04d287a719a3fb24965b0aab5f54684a69917fa0799aa080275fb58b7edcc474fb4c2e2 DIST gnome-control-center-46.4.tar.xz 8031580 BLAKE2B f26c2fde336d94cd53b3e3044b2e82de16729cfd48dae7b8dace3512dec9e4a298cd42135a6b5f7e8127d6802862dc3289065c7ac2e0eb543814b4caa7269650 SHA512 83a935cea6bec668c64bfbe4c72fe872d85d393f7cbad8c09a996008c35253c76801739d9dddfada186185403dee3ef7838384218853cd076694085c39b44d69 DIST gnome-control-center-47.3-patchset.tar.xz 4980 BLAKE2B a9c8e8b20462d368d579c004e17ba837b7bae4d391ce5ecca5311dd3d3d11a20b7b06c1abe419adcda22e97ba0d3dd752926bccf27756353e9cbaaf8d0afed0a SHA512 a5ade6c98b3ba5b51e20ec22ea3d64c169b08f23c99fe988afd8d8699edaec8b158da652dacb236e0b16c446e9bd2d384cc4e383c5148acaa0792ca44a6e8bb1 diff --git a/gnome-base/gnome-control-center/gnome-control-center-45.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.3-r1.ebuild deleted file mode 100644 index 8d2500b29530..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-45.3-r1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-45.0-patchset.tar.xz" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg" -# Logo is CC-BY-SA-2.5 -LICENSE="GPL-2+ CC-BY-SA-2.5" -SLOT="2" -IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ^^ ( elogind systemd ) -" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, -# but needs testing if handled gracefully enough -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv 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=" - gnome-online-accounts? ( - x11-libs/gtk+:3 - >=net-libs/gnome-online-accounts-3.25.3:= - ) - >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.11.2:4[X,wayland=] - >=gui-libs/libadwaita-1.4_alpha:1 - >=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.75.0:2 - gnome-base/gnome-desktop:4= - >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-42_alpha - dev-libs/libxml2:2 - >=sys-power/upower-0.99.8:= - >=dev-libs/libgudev-232 - >=x11-libs/libX11-1.8 - >=x11-libs/libXi-1.2 - media-libs/libepoxy - app-crypt/gcr:0= - >=dev-libs/libpwquality-1.2.2 - >=sys-auth/polkit-0.114 - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - networkmanager? ( - >=net-libs/libnma-1.10.2 - >=net-misc/networkmanager-1.24.0[modemmanager] - >=net-misc/modemmanager-0.7.990:= - ) - bluetooth? ( net-wireless/gnome-bluetooth:3= ) - input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.3.0:= - media-libs/fontconfig - gnome-base/libgtop:2= - >=sys-fs/udisks-2.1.8:2 - app-crypt/libsecret - net-libs/gnutls:= - media-libs/gsound - - x11-libs/pango -" -# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in -# Settings/Sound/Output/Output Device, bug #814110 -# 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. -# 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} - media-libs/libcanberra[pulseaudio,sound(+)] - 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-extra/tecla - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) - ) -" -# 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 - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS} - 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/python-dbusmock[${PYTHON_USEDEP}] - ') - x11-apps/setxkbmap - ) -" - -PATCHES=( - # 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 || return 0 - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - xdg_environment_reset - # 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() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/889008 - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - local emesonargs=( - $(meson_use bluetooth) - -Dcups=$(usex cups enabled disabled) - -Ddocumentation=true # manpage - -Dgoa=$(usex gnome-online-accounts 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 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) - -Dmalcontent=false # unpackaged - -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg - -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - insinto /usr/share/pixmaps - doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg - doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg -} - -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-45.4-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.4-r1.ebuild deleted file mode 100644 index 9b23e641e3cc..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-45.4-r1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-45.0-patchset.tar.xz" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg" -# Logo is CC-BY-SA-2.5 -LICENSE="GPL-2+ CC-BY-SA-2.5" -SLOT="2" -IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ^^ ( elogind systemd ) -" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, -# but needs testing if handled gracefully enough -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~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=" - gnome-online-accounts? ( - x11-libs/gtk+:3 - >=net-libs/gnome-online-accounts-3.25.3:= - ) - >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.11.2:4[X,wayland=] - >=gui-libs/libadwaita-1.4_alpha:1 - >=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.75.0:2 - gnome-base/gnome-desktop:4= - >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-42_alpha - dev-libs/libxml2:2 - >=sys-power/upower-0.99.8:= - >=dev-libs/libgudev-232 - >=x11-libs/libX11-1.8 - >=x11-libs/libXi-1.2 - media-libs/libepoxy - app-crypt/gcr:0= - >=dev-libs/libpwquality-1.2.2 - >=sys-auth/polkit-0.114 - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - networkmanager? ( - >=net-libs/libnma-1.10.2 - >=net-misc/networkmanager-1.24.0[modemmanager] - >=net-misc/modemmanager-0.7.990:= - ) - bluetooth? ( net-wireless/gnome-bluetooth:3= ) - input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.3.0:= - media-libs/fontconfig - gnome-base/libgtop:2= - >=sys-fs/udisks-2.1.8:2 - app-crypt/libsecret - net-libs/gnutls:= - media-libs/gsound - - x11-libs/pango -" -# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in -# Settings/Sound/Output/Output Device, bug #814110 -# 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. -# 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} - media-libs/libcanberra[pulseaudio,sound(+)] - 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-extra/tecla - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) - ) -" -# 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 - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS} - 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/python-dbusmock[${PYTHON_USEDEP}] - ') - x11-apps/setxkbmap - ) -" - -PATCHES=( - # 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 || return 0 - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - xdg_environment_reset - # 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() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/889008 - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - local emesonargs=( - $(meson_use bluetooth) - -Dcups=$(usex cups enabled disabled) - -Ddocumentation=true # manpage - -Dgoa=$(usex gnome-online-accounts 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 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) - -Dmalcontent=false # unpackaged - -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg - -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - insinto /usr/share/pixmaps - doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg - doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg -} - -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-46.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-46.2-r1.ebuild deleted file mode 100644 index 87e7f2c931ed..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-46.2-r1.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center" -SRC_URI+=" https://dev.gentoo.org/~pacho/${PN}/${PN}-46.2-patchset.tar.xz" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg" -# Logo is CC-BY-SA-2.5 -LICENSE="GPL-2+ CC-BY-SA-2.5" -SLOT="2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" - -IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos +geolocation networkmanager systemd test wayland" -REQUIRED_USE=" - ^^ ( elogind systemd ) -" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, -# but needs testing if handled gracefully enough - -RESTRICT="!test? ( test )" - -# 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=" - gnome-online-accounts? ( - x11-libs/gtk+:3 - >=net-libs/gnome-online-accounts-3.49.1:= - ) - >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.11.2:4[X,wayland=] - >=gui-libs/libadwaita-1.4_alpha:1 - >=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.76.6:2 - gnome-base/gnome-desktop:4= - >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-46_beta - dev-libs/libxml2:2 - >=sys-power/upower-0.99.8:= - >=dev-libs/libgudev-232 - >=x11-libs/libX11-1.8 - >=x11-libs/libXi-1.2 - media-libs/libepoxy - >=app-crypt/gcr-4.1.0 - >=dev-libs/libpwquality-1.2.2 - >=sys-auth/polkit-0.114 - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - networkmanager? ( - >=net-libs/libnma-1.10.2 - >=net-misc/networkmanager-1.24.0[modemmanager] - >=net-misc/modemmanager-0.7.990:= - ) - bluetooth? ( net-wireless/gnome-bluetooth:3= ) - input_devices_wacom? ( >=dev-libs/libwacom-1.4:= ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.3.0:= - media-libs/fontconfig - gnome-base/libgtop:2= - >=sys-fs/udisks-2.1.8:2 - app-crypt/libsecret - net-libs/gnutls:= - media-libs/gsound - - x11-libs/pango -" -# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in -# Settings/Sound/Output/Output Device, bug #814110 -# 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. -# 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} - media-libs/libcanberra[pulseaudio,sound(+)] - 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-extra/tecla - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) - ) -" -# 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 - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS} - 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/python-dbusmock[${PYTHON_USEDEP}] - ') - x11-apps/setxkbmap - ) -" - -PATCHES=( - # 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 || return 0 - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - xdg_environment_reset - # 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() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/889008 - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - local emesonargs=( - $(meson_use bluetooth) - -Dcups=$(usex cups enabled disabled) - -Ddeprecated-declarations=disabled - -Ddocumentation=true # manpage - -Dlocation-services=$(usex geolocation enabled disabled) - -Dgoa=$(usex gnome-online-accounts 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 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) - -Dmalcontent=false # unpackaged - -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg - -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - insinto /usr/share/pixmaps - doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg - doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -}