gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 8 insertions, 122 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index a2bf03a3a59a..27271f21cf77 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,8 +1,7 @@
 AUX cinnamon-control-center-6.0.0-c99.patch 1079 BLAKE2B 4ae36ae3b5810ed6e08964883519510e608153133544ab4c23ff7aefc3bca19d5a651eeaa92adb336719e788709ee8c888c5b5c6a53719f7132154f0521c1e06 SHA512 3eedfb9f393a6187f8cec18ad17191e3908700a8d85770bce57ad318410f341ce2dcace452df06b4a48d6c68b8026d0f0c683748f7315c7a04179f93bdb04753
 AUX cinnamon-control-center-6.0.0-fix-optional-wayland.patch 1702 BLAKE2B 442a793bc3574a2fea9ea1f4b3cdbaa1fd78a74baec80b6ff6d2d35e0ca0e3c7eb4981490347e645e7fa4cabffdaecd5faa0076d31df6cfd3fac51ba42d20c73 SHA512 eb4395fa7e8a5822ea62068ddde0eb118d747dbbe54228fa015dc97ca6d8f041ab64095a1bc42114d82d775fc1bf569708b8e027034a95aa2ab01e99993fe552
-DIST cinnamon-control-center-5.8.2.tar.gz 3820570 BLAKE2B 3bc009e696c7d469b2a2e15aecc62f290e26d08f65400418666e4a5564a3a113107996326e1edec93a45e9cb935ea96946e385376fe7f1b4b1185425bb4d4964 SHA512 b7b726659ca712a81c8b52bf514c8f061f5146a4728a3f2172ac5658b947e3e72c3194513ac815efaa727664e03ce2684d8d491bfcf0f6e91ea4566d832e86a2
 DIST cinnamon-control-center-6.0.0.tar.gz 3821056 BLAKE2B b856e4c258a76aa5e558cca53ac333df81ae135d731a5de65470282e741a95f2c179fbd9f28e8bb26824de5ee1f9b9fcb0143fee1760800149a345085c45f11b SHA512 e49b72590418da63c6db9c4224e6a32f9014bf4a4810e3a89babaa21d211ade135912e7be1a356c57328d85774517e0f696c724e62b2d3581c5f73c8a88cf486
-EBUILD cinnamon-control-center-5.8.2.ebuild 2494 BLAKE2B de7eabdb9d42d73e73c69e2715a566d92038402247792843fff208f90c19d49a35b452ef9de5cd5c89662c1a9113e3fcb0081a713616a47161542a03f0ea1203 SHA512 084d0922ddebbe5a9335af3f535ead6da15f8d4aeda50ca0733b9fffce2e57746af0c2144de72cbab8a8f18ba646220840617ea26292e6a72d3bcd9b201a7ad7
+DIST cinnamon-control-center-6.2.0.tar.gz 3813695 BLAKE2B 4ddc97e600b2643ee16477165171f5251f7004d53524a77ec5d363717b84cec61c5bd83334a6dbb261d6ef40bd927fcdf6ef779953ad549881871f2f0e70471e SHA512 815158d057267956470d858cfb62e527c3655adce08e1f9b928f3d8b8b43ffc15d04ab1b11d5603dc75e7347925067e9627cc199f0328ccacd0421112de3b7b4
 EBUILD cinnamon-control-center-6.0.0-r1.ebuild 2726 BLAKE2B 33a29f9ec4a878db87a52b7bd9e04e26d4afafd888a9ebb57855f2f610e9b976def94ddaa51668eb551c38ae82680e6695f7f7705747c5fd9beac2f60724a63d SHA512 075972736cb7292584c47a6a329d864244bb9f60cd46e215e23f308a7296b52c51501f7dbeb5e352cd4c9b3fc0d28d932f46e1e7e295ccca888db61b3160a1a5
-EBUILD cinnamon-control-center-6.0.0.ebuild 2691 BLAKE2B 63a2dbe84c3ae8fc0f817e966a57517bceb29ef829eb425f89aa177baf2aad051ce39f236ec39355bd1714709290b229db73b7414560db8d110ea78187457fd1 SHA512 a0c54d3286b3f0d7c36b43df074ae340921546b236dabf4cdb0814a0656462a1e652a7415d49b11553f4d98f9208462b5a466c44a15668917268818799bb1c78
+EBUILD cinnamon-control-center-6.2.0.ebuild 2388 BLAKE2B 7e8f0a3a755e2864ea5deacdcf1f3b4d9eb9c23bd997cc50578a54839a0c92979c53cdda789ed8142cbf2a00b652a70fc56324638cf37527c9e9ada72c95254b SHA512 c5a64120e6870e86c6104cbdc3b6865b966aeebe396c823b40208be24a37cdd295260d54738d1865e61a8e3590e18fc908f5dc0e23d9696f3e98479ccdfdd96f
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.8.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.8.2.ebuild
deleted file mode 100644
index f7998f0e2b56..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.8.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit meson gnome2-utils python-any-r1 xdg virtualx
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
-SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
-REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-core:2
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/libgnomekbd-3.0.0:0=
-	>=gnome-extra/cinnamon-desktop-5.8:0=
-	>=gnome-extra/cinnamon-menus-5.8
-	media-libs/fontconfig
-	>=sys-auth/polkit-0.103
-	>=sys-power/upower-0.99.8:=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=dev-libs/libgudev-232
-	>=x11-libs/libnotify-0.7.3
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5.1:=
-	x11-libs/pango
-
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7:=
-		>=x11-libs/libXi-1.2 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-libs/libnma-1.8.34
-		>=net-misc/networkmanager-1.2.0[modemmanager?]
-
-		modemmanager? ( >=net-misc/modemmanager-0.7:= )
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.18.0:=
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( app-admin/openrc-settingsd )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang meson_install_schemas.py
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord color)
-		$(meson_use modemmanager)
-		$(meson_use networkmanager)
-		$(meson_use gnome-online-accounts onlineaccounts)
-		$(meson_use input_devices_wacom wacom)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0.ebuild
index c6374005882f..7ee5c7dde989 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit meson gnome2-utils python-any-r1 xdg virtualx
 
@@ -13,17 +13,17 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
 SLOT="0"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test wayland"
-REQUIRED_USE="modemmanager? ( networkmanager )"
 KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test wayland"
+REQUIRED_USE="modemmanager? ( networkmanager )"
 RESTRICT="test"
 
 COMMON_DEPEND="
 	app-accessibility/at-spi2-core:2
 	>=dev-libs/glib-2.44.0:2
 	>=gnome-base/libgnomekbd-3.0.0:0=
-	>=gnome-extra/cinnamon-desktop-6.0:0=
-	>=gnome-extra/cinnamon-menus-6.0
+	>=gnome-extra/cinnamon-desktop-6.2:0=
+	>=gnome-extra/cinnamon-menus-6.2
 	media-libs/fontconfig
 	>=sys-auth/polkit-0.103
 	>=sys-power/upower-0.99.8:=
@@ -52,9 +52,6 @@ COMMON_DEPEND="
 			>=net-misc/modemmanager-0.7:=
 		)
 	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.18.0:=
-	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -85,12 +82,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Fix optional wayland
-	# https://github.com/linuxmint/cinnamon-control-center/pull/323
-	"${FILESDIR}/${PN}-6.0.0-fix-optional-wayland.patch"
-)
-
 src_prepare() {
 	default
 	python_fix_shebang meson_install_schemas.py
@@ -101,7 +92,6 @@ src_configure() {
 		$(meson_use colord color)
 		$(meson_use modemmanager)
 		$(meson_use networkmanager)
-		$(meson_use gnome-online-accounts onlineaccounts)
 		$(meson_use input_devices_wacom wacom)
 	)
 	meson_src_configure