gentoo resync : 02.02.2022

5 files changed, 52 insertions, 108 deletions

diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index f989e4576331..cb0fe38c7805 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,7 +1,4 @@
-DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38
-DIST polari-3.38.1.tar.xz 1050280 BLAKE2B 7c1e640a62003bda2217d914f9f19d6eea3994f780785334fd681c792653aa3ef1b4e3e4bc05d7bb15a614cc70e317f8e8a55445fe6e03c249f66b6b3e97af3d SHA512 196fd58324e1ee24eb58efcf9e11b9bec1cfd11781cba5d09b34344b7d3715f9bc215c7a3ec3b021ac5e1d2575a8200d8ab896b201488bf7da2acb10beb04262
+AUX 40.0-fix-build-with-meson-0.61.1.patch 1451 BLAKE2B 0ec6cb1e654e4f9bcecd78980f5d5fe08870fcc4b8b1e35a1b639f9ef718f744365b97628db93d7cba9b4fbeb3df962ffd1e6503f984857220cfb3d2d3004d02 SHA512 96eb969bbf907b0284a16aa7d4b6fbace4a621711765d696f4c173a12822a789c513b8fffa78305d1b277786157e3204d9985b75a3dae58757475dc221e0e975
 DIST polari-40.0.tar.xz 1051416 BLAKE2B ea6aea087ff3ba74e2cf16e848c228c0984eb7e5b7cc16579bbe8ceeb3655babb5dfbf3adbe245b66b590999c5b7e0077630b659d0db00e2da6ce0ac8b0281da SHA512 267eb904286f33e6ac510357de072285889d1c72ca832eb6a8520a20b1c2487708eaa0187d4c91b46b3b8019866f37a9ac036a71dee9cd9c9ad83443df0f146c
-EBUILD polari-3.36.3.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a
-EBUILD polari-3.38.1.ebuild 1066 BLAKE2B d9445e6b750a1d794efaa5e0a3f655fdf46040f9dc8aae0cbf98c8feba3afc54663838c22027e65a2056dfb66d10b65f0b3d922c38bd8abd0399c7a8715c00a1 SHA512 e5d49b48436e9fb4b452f838bc53eaf248ffc71061272d63c866abfad21bc5e7d550f300746d755bf6ee70b3e3d8a33609f13378b5f5d99a098e86627349a84c
-EBUILD polari-40.0.ebuild 1126 BLAKE2B 40dab0e2731c190c41ebfe338f961589f65ca7ccaf4467dafc74968b94f4459abfce804c36ebbd4dc8159e37c0c9578dee014e1fef5daec465cc97bcd7ba21c6 SHA512 bcd855e5f444f2b4e80267be0db8c65678a758af6196030f15ebd4d402aa85a1e551c79b3b49f98df177bed847393864452e004c3224c29cd9a594d186d149a5
+EBUILD polari-40.0.ebuild 1194 BLAKE2B 7ddf02126d2757b26591715a4658e08ce8ebd36df7529faebe58bd9f1ca0be01e64a9932917b07b8c03ca2be5dceb70c7e6e3b99a077f3db7802908394e437a0 SHA512 78c8ca4908a5cb9750dab715479b67c0d2603e7a0bd8c2d5e30329009ffed2808025d8ea94ced850d828e2ec69f884f0ebf8a9b222038538ecb013386d834e2b
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch b/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..2decad2dc23f
--- /dev/null
+++ b/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,45 @@
+https://gitlab.gnome.org/GNOME/polari/-/commit/0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d
+https://bugs.gentoo.org/831922
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:32:00 +0000
+Subject: [PATCH] meson: Drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
+---
+ data/appdata/meson.build | 2 +-
+ data/meson.build         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 88b4a0be..781ba22f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,5 +1,5 @@
+ appdata_name = app_id + '.appdata.xml'
+-appdata = i18n.merge_file(appdata_name,
++appdata = i18n.merge_file(
+   input: appdata_name + '.in',
+   output: appdata_name,
+   po_dir: '../../po',
+diff --git a/data/meson.build b/data/meson.build
+index cedfd57b..655ae700 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('appdata')
+ subdir('icons')
+ 
+ desktop_filename = app_id + '.desktop'
+-desktop_file = i18n.merge_file(desktop_filename,
++desktop_file = i18n.merge_file(
+   input: desktop_filename + '.in',
+   output: desktop_filename,
+   po_dir: '../po',
+-- 
+GitLab
+
diff --git a/net-irc/polari/polari-3.36.3.ebuild b/net-irc/polari/polari-3.36.3.ebuild
deleted file mode 100644
index dad3791fcd02..000000000000
--- a/net-irc/polari/polari-3.36.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="An IRC client for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.21.6:3[introspection]
-	net-libs/telepathy-glib[introspection]
-	>=dev-libs/gobject-introspection-1.50:=
-	>=dev-libs/gjs-1.57.3
-
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=app-text/gspell-1.4.0[introspection]
-	x11-libs/pango[introspection]
-	app-crypt/libsecret[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-im/telepathy-logger[introspection]
-"
-RDEPEND="${DEPEND}
-	>=net-irc/telepathy-idle-0.2
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( dev-lang/spidermonkey:60 )
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-irc/polari/polari-3.38.1.ebuild b/net-irc/polari/polari-3.38.1.ebuild
deleted file mode 100644
index 3fb6c5d6fffc..000000000000
--- a/net-irc/polari/polari-3.38.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="An IRC client for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.21.6:3[introspection]
-	net-libs/telepathy-glib[introspection]
-	>=dev-libs/gobject-introspection-1.50:=
-	>=dev-libs/gjs-1.57.3
-
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=app-text/gspell-1.4.0[introspection]
-	x11-libs/pango[introspection]
-	app-crypt/libsecret[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-im/telepathy-logger[introspection]
-"
-RDEPEND="${DEPEND}
-	>=net-irc/telepathy-idle-0.2
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( dev-lang/spidermonkey:78 )
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-irc/polari/polari-40.0.ebuild b/net-irc/polari/polari-40.0.ebuild
index 05f24422d4b5..fca653dc7065 100644
--- a/net-irc/polari/polari-40.0.ebuild
+++ b/net-irc/polari/polari-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update