gentoo resync : 29.12.2022

4 files changed, 2 insertions, 102 deletions

diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 48ad2baebfc3..0d1b4cbecdc3 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,6 +1,3 @@
-AUX 40.0-fix-build-with-meson-0.61.1.patch 1456 BLAKE2B 3326dd305dbb9ba2fb24de56d0d6d96507ac6d995f3b01ce2cbbe8fabda6a697e8a4f76043c75ea8415a751b547ef7a58a8d1bdfd8799855d5d1d846567b5bf6 SHA512 d409749979f8f2f07830ca36d902b886cd92daa47fa4fc23b837c988ed2fa272bfce63242bbc08b48e6e6df686139a220c3fb960008b0b7dcf929c0b9d3d9393
-DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
 DIST gnome-sound-recorder-42.0.tar.xz 162208 BLAKE2B 6f4f17ad5cb2cd893626defb3b91e62c0dfbfdae4c815df934a2d35a7b0e315f689f3ea222d9adef960935828095c337e00076aba60b4c1b3d243c274063aed3 SHA512 53fe2fe0646c5055cedc1c62cf87176dca52bf3d9452d83bcc849d9946179afbef826f08ff65a97ede7a0d14ade4da0755b2ef3780460d5a80f8f9e6c85fcfbd
-EBUILD gnome-sound-recorder-40.0.ebuild 1116 BLAKE2B 8598f16aa62a75219e15dc6c9249b14d80463c1814d89de996c6a58f2a4553ffd8a3e8544f7e1b21915455701c4c09a319e10e44bfa1039de55ad0ef03285ab9 SHA512 8499a041cf2d6cc1efc2a99d2eafac12f080f7176169579df21521b0eefb94909d074e09d1340f162de3d5673b97aeeae544700569b3cc14b89b7fa3a19784f4
-EBUILD gnome-sound-recorder-42.0.ebuild 1104 BLAKE2B face159f8593dc5fc1eb734f38486abae2eecda3c66a2bac545f832ff2a8ef38307224179baf6ca7d05f0fd8241cc8cafe555c6d9673cbe0b6dce30d2e3ffb36 SHA512 4b368c148c36ca8158c88a7bc78056ccd8fbacdee90db6f4e2c5de881ab5f47083c0e5ae006208117d779e48c6a7e2578d082c560f04058c204ef14688418269
+EBUILD gnome-sound-recorder-42.0.ebuild 1102 BLAKE2B 78f8bb877f3030f0e6efd8394457279c14671cd20b9dba6cbb748480487e477628e8f2a30ead85b43ab97f57099dfa1146708a41342fd46a6166ae9171cd34b5 SHA512 6cb7e3b92cb0e8cd9c4aa96544e6d217305e0ef3aeb239287efa680f1ddacd4f262ec0419c3e7cc0d9e57ca64c4dec3230ee044016324381d0e98990d86614b7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch b/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index 0eea5fe096e9..000000000000
--- a/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/commit/1335b1b1aff61167f8648f7cb3c569764031960d.patch
-https://bugs.gentoo.org/831924
-
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:37:06 +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:5:0: ERROR: Function does not take positional arguments.
-data/meson.build:16:0: ERROR: Function does not take positional arguments.
----
- data/appdata/meson.build | 1 -
- data/meson.build         | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index 1f5744e..d2c2c3a 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
- metainfo_conf.set('gettext-package', gettext_package)
- 
- metainfo_file = i18n.merge_file(
--  'metainfo-file',
-   input: configure_file(
-   	input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
-   	output: '@BASENAME@',
-diff --git a/data/meson.build b/data/meson.build
-index 44117ad..0ff8fa5 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -14,7 +14,6 @@ install_data(
- desktop_conf = configuration_data()
- desktop_conf.set('app-id', application_id)
- desktop_file = i18n.merge_file(
--  'desktop',
-   input: configure_file(
-   	input: 'org.gnome.SoundRecorder.desktop.in.in',
-   	output: '@BASENAME@',
--- 
-GitLab
-
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
deleted file mode 100644
index 06371a510876..000000000000
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Simple sound recorder"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	>=dev-libs/gjs-1.54.0
-	>=dev-libs/glib-2.46:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	media-libs/gst-plugins-bad:1.0
-	>=gui-libs/libhandy-1.1.90:1=
-	>=dev-libs/gobject-introspection-1.31.6
-	x11-libs/gdk-pixbuf:2[introspection]
-"
-RDEPEND="${DEPEND}
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection,ogg]
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-flac:1.0
-	media-plugins/gst-plugins-pulse:1.0
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
index e125245f0098..417b22aa2866 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder https://gitlab.gnome.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/gjs-1.54.0