gentoo auto-resync : 23:08:2024 - 14:56:14

9 files changed, 32 insertions, 20 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 7a9f6fa404b0..b41541ebd377 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 27271f21cf77..7e7528119ab6 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -3,5 +3,5 @@ AUX cinnamon-control-center-6.0.0-fix-optional-wayland.patch 1702 BLAKE2B 442a79
 DIST cinnamon-control-center-6.0.0.tar.gz 3821056 BLAKE2B b856e4c258a76aa5e558cca53ac333df81ae135d731a5de65470282e741a95f2c179fbd9f28e8bb26824de5ee1f9b9fcb0143fee1760800149a345085c45f11b SHA512 e49b72590418da63c6db9c4224e6a32f9014bf4a4810e3a89babaa21d211ade135912e7be1a356c57328d85774517e0f696c724e62b2d3581c5f73c8a88cf486
 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.2.0.ebuild 2388 BLAKE2B 7e8f0a3a755e2864ea5deacdcf1f3b4d9eb9c23bd997cc50578a54839a0c92979c53cdda789ed8142cbf2a00b652a70fc56324638cf37527c9e9ada72c95254b SHA512 c5a64120e6870e86c6104cbdc3b6865b966aeebe396c823b40208be24a37cdd295260d54738d1865e61a8e3590e18fc908f5dc0e23d9696f3e98479ccdfdd96f
+EBUILD cinnamon-control-center-6.2.0-r1.ebuild 2495 BLAKE2B 7cb46b15c9b86b0bf5a91786ef2f090284213c6f1f6364e3eedcbaa2c8b503ee39ed2c3de106286ac59516390f40d1069deaf4b208ac7114e89b995ea7f7215b SHA512 3ae3c840958fb97025738fe3c41f43c95b37f06a0a86fc905e9620c676bf8eaa87a75f393e665761552b2978074d9e1304099cdf22ddb9189e0b63946c988ce0
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0-r1.ebuild
index 7ee5c7dde989..79840ddf943f 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit meson gnome2-utils python-any-r1 xdg virtualx
+inherit meson flag-o-matic 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"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	>=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[wayland=]
+	>=x11-libs/gtk+-3.24.41-r1:3[wayland?,X]
 	>=dev-libs/libgudev-232
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/cairo
@@ -88,6 +88,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# defang automagic dependencies
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	local emesonargs=(
 		$(meson_use colord color)
 		$(meson_use modemmanager)
@@ -107,6 +110,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	xdg_pkg_postinst
+	xdg_pkg_postrm
 	gnome2_schemas_update
 }
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 9413dd777073..08114d96c99f 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -2,5 +2,5 @@ AUX cinnamon-settings-daemon-6.0.0-c99.patch 1002 BLAKE2B b816574312cbb0d9e9cf05
 DIST cinnamon-settings-daemon-6.0.0.tar.gz 578061 BLAKE2B f05e14e9d3c15bc94df5435b0f317e1924993fbf4908491ea5a825b623c6a6f127ce20f5c31f54bfbd547a70ad645c3dbe71d9c55f790a3e0730d55bc58d6316 SHA512 44348765bf8c0cb941d177a6765aef10796d72f5c215dbffa4b514523956e257128d6bbbb0dcd9c3f0b2bcde24745e082ad82a7cee149125903e13b349c07200
 DIST cinnamon-settings-daemon-6.2.0.tar.gz 578907 BLAKE2B 24b9591f5e6bbacd92f564bfb4f1960c14bca78194dd00746ff4b31f2a6b99d09a701ca939aa39b932141c7c13d998b1a061185bd7b751815dbd8b43d1fceec2 SHA512 c2102ace141448694a4d22331f1b039ccdca41988165f0e1af4446c527be89f8ae2f87e0555a0cf4fa5bbb31e5c866f0c9c7a52174a1664183695695b5eed7be
 EBUILD cinnamon-settings-daemon-6.0.0-r1.ebuild 2229 BLAKE2B ec05143d040ef79e6b810176ddf0cde3d9bac06b32f5b15e294245f0811011b393b84b2eac7025d327cb61e23bc8f7d7b34f7d781f2ef9e302ca69deafdea274 SHA512 e9ae2f233ec549628ca31ac9d6a30c20793908825cbf027e3e79ff325c4b2bf68cca94033a619d68cc3493dae00a81d81293bc4eb3f9f8da4c2364f76e0ac498
-EBUILD cinnamon-settings-daemon-6.2.0.ebuild 2181 BLAKE2B 386cd671fb5c60a0857a39c51d0b86d1d673fd47e79cd7ca086a222f3b92178068aae76fdbbbed4bc499afa98b05b8a2151bda1a76fe94d0786a659776e703f3 SHA512 f8d346083adc87645e9d5f76ec3f4f794d858792c456008759b420eb0271b047c3f8261ef19aa662377c83ea0b25fc0e2dde0626b625fc7f8a5f0b601e1d4dab
+EBUILD cinnamon-settings-daemon-6.2.0-r1.ebuild 2452 BLAKE2B c1e0b447c0158997c612e7221dbe0ebbee39c90bb81abe0f74aadb9841be99aca62fd921faaa90cfc4ce31971830ea7197bfc92c78d3a84e8a8c535cd0462cf2 SHA512 18583e59b3f2d06014b4f3aa3683234aa2eef27e4afa5407c588c2b1f75ca9c5793e239425519b014cfea763e03d2c75955ca90399e6de444bf232d08bd3767c
 MISC metadata.xml 504 BLAKE2B 99901d6f11af1367053f408c6fc1dffafa3903dc04b9a38faed0b3261e578c33fad49948ce09ecfb6d277472a3f9c3d088a32231b02236677071413dc3d4917e SHA512 f5afa4c1e73b6765aee16c5762b3145223bf4c56cae60b7e65ef503aec0f684276de2a7a22b0b866996cd96376cfc69e36e395ad3da9e7ce593732cb075fd64c
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
index bf665356ce46..701215fbc2c5 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit meson gnome2-utils python-any-r1 xdg
+inherit meson flag-o-matic gnome2-utils python-any-r1 xdg
 
 DESCRIPTION="Cinnamon's settings daemon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
@@ -28,7 +28,6 @@ RDEPEND="
 	>=sys-auth/polkit-0.97
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14.0:3[wayland=]
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
 	x11-libs/libXext
@@ -44,8 +43,13 @@ RDEPEND="
 		app-admin/system-config-printer
 		net-print/cups-pk-helper )
 	input_devices_wacom? (
+		>=x11-libs/gtk+-3.24.41-r1:3[wayland?,X]
 		>=dev-libs/libwacom-0.7:=
-		>=gnome-base/librsvg-2.36.2 )
+		>=gnome-base/librsvg-2.36.2
+	)
+	!input_devices_wacom? (
+		>=x11-libs/gtk+-3.14.0:3
+	)
 	smartcard? (
 		dev-libs/nspr
 		>=dev-libs/nss-3.11.2
@@ -71,6 +75,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# The only component that uses gdk backends is the wacom plugin
+	if use input_devices_wacom; then
+		# defang automagic dependencies
+		use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+	fi
+
 	# gudev not optional on Linux platforms
 	local emesonargs=(
 		-Duse_gudev=enabled
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 02090b152cbb..a34d8201c109 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -5,7 +5,7 @@ AUX cinnamon-6.2.0-optional-wayland.patch 2333 BLAKE2B 2c52be837f95f24a20c4a4a50
 AUX cinnamon-6.2.0-polkit-agent-on-x11.patch 2440 BLAKE2B ddecfd38e2ac60ab9089e68708efae1e24e5c597c2523222e2b8be4f0f71020dc2dff7008e4c4d895fb58d345263e6176e2f097e96ed7d5c98966dc41d447a4f SHA512 e8b72d5c024a8b3b5d4b171c43f0528e2915a21d21893bb4fb4c5fe2a5e9ce6272c9da781a9282f1445b6643929e666af325c3f4d0e755e53365861b9279c078
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
 DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
-DIST cinnamon-6.2.7.tar.gz 2547822 BLAKE2B 67f15fdd39c7168bcaa03f637fa6a4b9e9076657a92ba92472c69960c0c26fcad7aa0b4e1f6926e57d76364bf4a42f28381b67a03cba75de87a4fc31ef9e7377 SHA512 d8617cf73dd754b91915826527e674a8084ad141831112def661eac6b39b1c39e61e06fdf79bd7f0a7045b2abc29e223f8616796f5e51d1354486f0d0e4faf5a
+DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11
 EBUILD cinnamon-6.0.4.ebuild 5945 BLAKE2B 17ae5056db7e7e1851f9f479907b1bf7afa274ec5bed469c47c05981d4cc7683587b29cd1f0b5b7005687ae0284ead7db55376135e4ebaaa457b75f1f459e07a SHA512 6030813b585ae55b23922d91be537e92c73c2ae7b0e0b2a074b09f07567344825a80b478a167c8b61c6f18eb6b6abfa739d1d6163e44e3af31e97123d757dbf5
-EBUILD cinnamon-6.2.7.ebuild 5960 BLAKE2B bd41903ed576d8b40043ce5628c4152b50efd33d9d0b17614126c65a85151bbe492bf70fc7eeb0a517810227a54b2cfc630cd885dd67dde9fbc2dde448a58905 SHA512 23c9582050d6a9ea3ff5d5629f5c5ae4b55e1f9d27d81eb4b3c9a2fcbc794916197ce692a6c4e9812569883f1b618610e0d772a819adbf4fbd9bbea6a13e71d8
+EBUILD cinnamon-6.2.9.ebuild 5960 BLAKE2B e365586114646941e7dcd70959767da9925384c062811b90c41e00b2d406353eac1e0f6af71b5000514198f09f5178900d6b419c82b2a686384d9e385a023386 SHA512 19ad189118e7d97a084adb0b11d62f1e2377b6f1d21777c0d1379396f0f4be035b7f2b01d8771b56e2eb20a0c7fe803f9c40b1e0e4d8aa6ef88babfd1eda3878
 MISC metadata.xml 804 BLAKE2B eb34dbf26a7366035f626b9edb3229b47bd351a740baefeffaadfd337a37b132fa3ec939de647d7f3b77a06e05d0d21158b86c3201e4d089cc5312e817031cba SHA512 cb2c2ab9ad69af9951e149bd26e6345ad90b22916239d00d44d0dbd57367172b8d1e7c09666529eb0d84b2e14e62484cddc50e0b201d82bf373af7d01cc221b6
diff --git a/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
index faad5075ad15..58feebb49cfe 100644
--- a/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
+	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?,X]
 	>=x11-libs/libnotify-0.7.3:0=[introspection]
 	x11-libs/libX11
 	>=x11-libs/libXfixes-5.0
@@ -201,6 +201,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	xdg_pkg_postinst
+	xdg_pkg_postrm
 	gnome2_schemas_update
 }
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 21f021e52cea..c65a02401aec 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,7 +1,7 @@
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
 AUX nemo-6.0.0-fix-optional-wayland.patch 2103 BLAKE2B ad99989113d7d65d586709f78f68dd28c016fb56c33465aa38c2282ac0ff57669efab45f5547b5b983554401b32fef472362ab9e12a66715c6a0c89a27f173da SHA512 0a32ba81d1c79e9a008a9480d3901a17e55af67a8043041adc9f77989999fdf6ece0c654eb8fb62cbda5ade9104f1d52990ca3f38686fe8483d08d8163d4b210
 DIST nemo-6.0.2.tar.gz 1480887 BLAKE2B d1e3892938cb81bcb676626a9ef54362939d522a6d09befe25dd77a236a7eee3e06461da1855317bff2a5f201bc142903ce085bfbafdbddca0700a177221ccdf SHA512 05e8a6ab785f527ad61c1fe57d372ae8ea8f77d27ec8608d38e99f5f0f9065aecef4b84d1b016b682d14320d7099806d5672a101c0a370429d1c3f2a341fed1c
-DIST nemo-6.2.6.tar.gz 1503182 BLAKE2B a8c469a6ebcb297e4cd2f8b3e9a07cb7fe6b7f399747c798a5b23ca930d8375275fc66b6d05ab78b660ec7b250f413ca0a16ba7ccdf46c0e93ad18d19839a969 SHA512 62a0d6a233f57fa3e9a078c3c90f7c735bf58aee4a37cfebdda20569f0b692e33998719152060e963b27dabee5a5a3da1c0d71a2b51dc5bf200331fd16b93135
+DIST nemo-6.2.8.tar.gz 1505198 BLAKE2B fc74ab19e5aef65ba279f212f505cab91aa0dc92b19d31d4ae2f44b3222bd2278fbdf0df0bc36fa3973b91c9c06fab2c211b58c8d840deef5e60d5dbcbfa4dd7 SHA512 cd943603cfb14cc9d50466872607d191a3af7ff61f05549407caa5d9dfe606e080d6eb40d17bbcdf3a9e810bcc493f3be087b1eac6c8272746cd72c9751822af
 EBUILD nemo-6.0.2.ebuild 3298 BLAKE2B 0b05154d8ee7cfc59bee22e3699fea029c1c54ab144b67d86055e345f65f607c26ec9b78746b6e647e80b55acf4b782d38b475c9af772fa87bf32a790ff10d01 SHA512 78cd898687b6be0ef0e86a43285fc6eb3283407ce8aa4cc11d5e6e28ff6e87ea86f0dbd27fe44d5bb12ad61a03775fab771b9fed4787c7109907a62b25c0288f
-EBUILD nemo-6.2.6.ebuild 3306 BLAKE2B 013c401600b375256b5c40f4049fac67e99d08953194d2b2f9a4c8adb775d03226b978d180ce10ab3bce8c11f8dbd2d4f8336de38e5e74826425ee566ffad0c5 SHA512 7214a043199c809a9c1a96184b7719bab4bfec3d6d917b10a1adc9e0523ab81ece28214a8dfe2c663045f7e7f4e6b5627082ca554317f1411e9169b4687c4427
+EBUILD nemo-6.2.8.ebuild 3326 BLAKE2B 455f23cd53f11d8081c068b01086e29821971af30b84b637ff1963009f984ed36f4f67784f8bcf3ea2d073511ed2ae91a183241f88ac5e7338b94812b5ebff9c SHA512 2aaf395b5a02286df5994c84a0e0fa166d9bfb3be72da65fcbfd1c20a675e6b1803e9411991c71ea91a9047012a284984345ed2c5f9cae7e0c6f4176d8d8450f
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
diff --git a/gnome-extra/nemo/nemo-6.2.6.ebuild b/gnome-extra/nemo/nemo-6.2.8.ebuild
index 6193e5aae1d7..d2f1b546ca6d 100644
--- a/gnome-extra/nemo/nemo-6.2.6.ebuild
+++ b/gnome-extra/nemo/nemo-6.2.8.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
+inherit meson flag-o-matic gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
 
 DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	gnome-extra/libgsf:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10.0:3[introspection,wayland=]
+	>=x11-libs/gtk+-3.24.41-r1:3[introspection,wayland?,X]
 	x11-libs/libX11
 	>=x11-libs/pango-1.40.0
 	>=x11-libs/xapp-2.8.4[introspection]
@@ -45,9 +45,6 @@ COMMON_DEPEND="
 	tracker? (
 		app-misc/tracker:3
 	)
-	wayland? (
-		>=gui-libs/gtk-layer-shell-0.8.0
-	)
 	xmp? (
 		>=media-libs/exempi-2.2.0:=
 	)
@@ -115,13 +112,15 @@ src_prepare() {
 }
 
 src_configure() {
+	# defang automagic dependencies
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	local emesonargs=(
 		$(meson_use exif)
 		$(meson_use xmp)
 		$(meson_use selinux)
 		$(meson_use tracker)
 		$(meson_use gtk-doc gtk_doc)
-		$(meson_use wayland gtk_layer_shell)
 	)
 	meson_src_configure
 }