gentoo resync : 29.12.2022

4 files changed, 6 insertions, 47 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 2b630cca1c35..74f8e72e366b 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,6 +1,5 @@
-AUX meson-0.61.patch 998 BLAKE2B e97d3460c28892df096d50a815826560eba89f050e36166c39e816e6a65d855635ea881edf07fd393ce1cbd0100c3fb2579982a00a71b089fbf765fe266c8879 SHA512 7103e31effe841f4d8af0d002c586f06ea199c024b0757a84617ce42a4aaff6b59350cd8cd90f3d4bfacb53333f2a806dab04c7ad40b3be568687df2afa40814
-DIST network-manager-applet-1.24.0.tar.xz 1903280 BLAKE2B a969ab18e2d2d85d378d9964e635281cfcd4bc46e0542ec94e187cbe7e740c5fad8e10b3d7d3ae3b85352ba5368787650f933b89740d05ee06d78057e1c31712 SHA512 7b91bd54d53b1b485bc5e401f83c683804175900557a7a4bc40a3f759fa9d4ca1c42b193bcd56a39a8cb79ec5b0c6f7cbeccfc08200099c08d933650c92faecb
 DIST network-manager-applet-1.26.0.tar.xz 1971896 BLAKE2B ab87b0e5f8b1c293ac3f2e36c8f834e645fb647e46ce1bf22ac94ed33e6f2f7f8aca5ed43ed46029a281545595978c145773102f06de9b42e579efb8d3e631c3 SHA512 ae3c4f8e55a2cd13093161e1e28873d3cda1c531168ee18115f3f710816f1bdfcf669cd2f796bd38f226d3f6be76407fccbcb19cf9c994b99969b688397b2c71
-EBUILD nm-applet-1.24.0.ebuild 1268 BLAKE2B 54412fc36e950cab4cf3eed2640164a9386260ffbf47143eef1cd0e115de11e304212307b6d8633d9579bc9d4e1f481e3a678ab00f74afe0a590b7d223b9129a SHA512 72be709f6ee2709d855982a00dcc26bb2b26a766ae98f498a9bdccc6f91104a0d1ff1d471ada91fbf65f43546782d16e7ffbaef3b514cbc216e96652fa2b457c
-EBUILD nm-applet-1.26.0.ebuild 1228 BLAKE2B 2e926b722629952460cd4175207fe0191062decb0d0fc00c1dc244e13504133943e83b2d6c47e49eb2c1dae24dda923240400e5ab7311c5e8b2e3cedfc57574e SHA512 eb999bc7e4935046eed8581931954f59595b7ef80b4162fe91ca8b24c43d897a27ad281f8f0afcd82c67b224d1e01a987f7e96070013d09aa9b863e5ab5d0f53
+DIST network-manager-applet-1.28.0.tar.xz 1894104 BLAKE2B f8263b49b215cf3dbe43a5247a3b04ca77288fe6e7098c08af2346d9cdf7c5102ee1d1e611ce03b322e22dc3a34991aeb45d6544b27e38f113da72674d3b9341 SHA512 1e594c6a8ecfd7c92e718238f036f95c0706a70699b9836ba4ca3b6b033db1b36a08ef4778e6615cfd0cfcaec120063a67c642734c45d71aee86b17a5de4b647
+EBUILD nm-applet-1.26.0.ebuild 1216 BLAKE2B e7594ee60992d4b46bd465a365bf7cc6fdf85ef37a64dd7272f8693bb9cbbbf77d498c6a8daf7dd87f4499a5b333d5633d61e38abd771de546650c549c310908 SHA512 7fb311f77c19edc936dff7bdaa06a5acedfaf4b70cf2c682dc1d906aac80768f65697b568c95b2e960aa1f26e37fa4f5423986a0c3a47d21f6638586f7b30f0f
+EBUILD nm-applet-1.28.0.ebuild 1221 BLAKE2B d1e9f9ce149baf9ee30f2274e16ff0fe1ca78967a9f1b7877f2d282f23a1a1379788a499dc6ff554dd41d354d39fe444b657df8c8fa2df76a21f73102f47b1c8 SHA512 788421a867506e20ed6f3a18e5cde3a805a68aff5d81df05d2768deff4352bd34c948a383fbb817f461bd8e6e5c71180eebdc7096e701ad26d4874f063a1cbb6
 MISC metadata.xml 452 BLAKE2B b17e0338356cd0b24f3de4e1e4d8c13ab7b551707f0309c7a233c28b92cf7b27ef66b36f58717228a11cb76dba2892f23455f50f9dcc6fe7905f312b848f1695 SHA512 2e4fd5feb6f4b6fb8a503b26ac5ef1c388ea699a873ff70ec5144b796b2ff75b7e572a5de5efab60a7844a9bc2d639f6296db97260a0c38f9b37d46c33543d40
diff --git a/gnome-extra/nm-applet/files/meson-0.61.patch b/gnome-extra/nm-applet/files/meson-0.61.patch
deleted file mode 100644
index e2366c0f64e1..000000000000
--- a/gnome-extra/nm-applet/files/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/831829
-https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
-
-From b92fa5ba6d65aaa9e2d1494beaf340a33d9ba07f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 22:34:09 +0100
-Subject: [PATCH] meson.build: address meson 0.61 failures
-
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 33adb632..6178c0eb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
- 
- foreach desktop: desktop_files
-   i18n.merge_file(
--    desktop + '-desktop',
-     input: desktop + '.desktop.in',
-     output: desktop + '.desktop',
-     install: true,
-@@ -275,7 +274,6 @@ endforeach
- appdata = 'nm-connection-editor.appdata.xml'
- 
- i18n.merge_file(
--  'desktop',
-   input: appdata + '.in',
-   output: appdata,
-   install: true,
--- 
-GitLab
-
diff --git a/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
index e49a7e278547..c89abc74e789 100644
--- a/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.28.0.ebuild
index 6498d20d7f96..52c9d5df3847 100644
--- a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.28.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 GNOME_ORG_MODULE="network-manager-applet"
 
 inherit gnome.org meson xdg
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
@@ -39,10 +39,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/meson-0.61.patch"
-)
-
 src_configure() {
 	local emesonargs=(
 		-Dappindicator=$(usex appindicator ubuntu no)