commit: b62db7c94cf9b636dd0206fb571741a921e9e2d5 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Fri Jun 11 16:40:13 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 12 03:55:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62db7c9
gnome-extra/cinnamon-settings-daemon: drop old Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Signed-off-by: Sam James <sam <AT> gentoo.org> gnome-extra/cinnamon-settings-daemon/Manifest | 1 - .../cinnamon-settings-daemon-4.6.4.ebuild | 114 --------------------- ...amon-settings-daemon-3.8.0-accountservice.patch | 57 ----------- 3 files changed, 172 deletions(-) diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest index 9aa971d4d2e..35b6896bbd7 100644 --- a/gnome-extra/cinnamon-settings-daemon/Manifest +++ b/gnome-extra/cinnamon-settings-daemon/Manifest @@ -1,3 +1,2 @@ -DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208 DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a DIST cinnamon-settings-daemon-5.0.0.tar.gz 662485 BLAKE2B 33c7cf208f66f480ab3d70e4e7627e65f059ae13a3f24142f6cd0743752f9d636066c2ed8a805c649726280887b882bc0bc53e4c590888937bb977183a43e4ef SHA512 0e2ef144717ca41d946d6467931fb45eabf3468025e6bc4cf25f9b11f2d94dae07f7649874d801b312d94905d30d4e74202bf8f01af53689179039865ea54052 diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild deleted file mode 100644 index 41f1514f1b0..00000000000 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools eutils gnome2-utils virtualx xdg - -DESCRIPTION="Cinnamon's settings daemon" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/"; -SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+colord cups input_devices_wacom smartcard systemd" -RESTRICT="test" - -# udev is non-optional since lots of plugins, not just gudev, pull it in -RDEPEND=" - >=dev-libs/glib-2.38:2 - dev-libs/libgudev:= - >=gnome-base/libgnomekbd-3.6 - >=gnome-extra/cinnamon-desktop-4.6:0= - media-libs/fontconfig - >=media-libs/lcms-2.2:2 - media-libs/libcanberra:0=[gtk3] - >=sys-apps/dbus-1.1.2 - dev-libs/dbus-glib - >=sys-auth/polkit-0.97 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.9.10:3 - >=x11-libs/libnotify-0.7.3:0= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - >=x11-libs/libxklavier-5.0 - >=sys-power/upower-0.9.11 - - colord? ( >=x11-misc/colord-0.1.27:= ) - cups? ( - >=net-print/cups-1.4[dbus] - app-admin/system-config-printer - net-print/cups-pk-helper ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=gnome-base/librsvg-2.36.2 - x11-drivers/xf86-input-wacom - x11-libs/libXtst ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - systemd? ( sys-apps/systemd:0= ) - !systemd? ( sys-auth/elogind:0= ) -" -DEPEND="${RDEPEND} - dev-libs/libxml2:2 - x11-base/xorg-proto -" -BDEPEND=" - dev-util/glib-utils - dev-util/gdbus-codegen - >=dev-util/intltool-0.37.1 - virtual/pkgconfig -" - -PATCHES=( - # Make account-services optional - "${FILESDIR}"/${PN}-3.8.0-accountservice.patch -) - -src_prepare() { - xdg_src_prepare - eautoreconf - gnome2_disable_deprecation_warning - - # Disable broken test - sed -e '/g_test_add_func ("\/color\/edid/d' \ - -i plugins/color/gcm-self-test.c || die -} - -src_configure() { - # no point in disabling gudev since other plugins pull it in - econf \ - --disable-maintainer-mode \ - --disable-schemas-compile \ - --enable-compile-warnings=minimum \ - --disable-static \ - --enable-gudev \ - --enable-polkit \ - --enable-logind \ - --disable-accountservice \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(use_enable smartcard smartcard-support) \ - $(use_enable input_devices_wacom wacom) -} - -src_test() { - virtx emake check -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - dodoc MAINTAINERS -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch deleted file mode 100644 index c12f2730cea..00000000000 --- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 15b1c1488f28e69cee86ff25bf0c95ebf5245add Mon Sep 17 00:00:00 2001 -From: Kristian Fiskerstrand <[email protected]> -Date: Sat, 30 Jun 2018 22:35:52 +0200 -Subject: [PATCH] Make account service optional - ---- - configure.ac | 6 ++++++ - plugins/background/csd-background-manager.c | 4 ++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index af5d3a4..a30126e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -166,6 +166,12 @@ else - fi - AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) - -+AC_ARG_ENABLE(accountservice, AS_HELP_STRING([--disable-accountservice],[Disable accountservice]), enable_accountservice=$enableval) -+ -+if test x$enable_accountservice = "xyes"; then -+ AC_DEFINE(HAVE_ACCOUNTSERVICE, 1, [define if accountservice is available]) -+fi -+ - dnl --------------------------------------------------------------------------- - dnl - common - dnl --------------------------------------------------------------------------- -diff --git a/plugins/background/csd-background-manager.c b/plugins/background/csd-background-manager.c -index 282094a..a692c6e 100644 ---- a/plugins/background/csd-background-manager.c -+++ b/plugins/background/csd-background-manager.c -@@ -135,9 +135,9 @@ settings_change_event_cb (GSettings *settings, - { - gnome_bg_load_from_preferences (manager->priv->bg, - manager->priv->settings); -- -+#ifdef HAVE_ACCOUNTSERVICE - gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg)); -- -+#endif - return FALSE; - } - -diff --git a/plugins/background/csd-background-manager.c -b/plugins/background/csd-background-manager.c -index a692c6e..a99b478 100644 ---- a/plugins/background/csd-background-manager.c -+++ b/plugins/background/csd-background-manager.c -@@ -186,8 +186,9 @@ setup_bg (CsdBackgroundManager *manager) - watch_bg_preferences (manager); - gnome_bg_load_from_preferences (manager->priv->bg, - manager->priv->settings); -- -+#ifdef HAVE_ACCOUNTSERVICE - gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg)); -+#endif - }
