gentoo resync : 29.12.2022

5 files changed, 6 insertions, 148 deletions

diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 2859c8012588..2adfe9523292 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,7 +1,4 @@
-AUX pulseeffects-4.8.5-meson_no_automagic.patch 1529 BLAKE2B d3ac44aed8a08ab62b932032b3c25e7e0019fbdc2c70e33114d4cca787e3f441ffe2bdc0c3c8c65a5f5a79b396c965b3f2c2fc4f1a9c392c1dc347c53f6460fa SHA512 508856da931ffeeab631ac684ba918e113144b345d95670bf0ac7c3cb1a4033745f2dfbfbf2cbb02a26a61c21146d74b0cbf22951386b3fc574f314d6318ae69
-AUX pulseeffects-4.8.6-meson_no_automagic.patch 1529 BLAKE2B 63ff162b0d0dbf7d091d6d1ce4b57bd4e0f43c72d795457ede6709d26ceea661fb7208ea762b8061458a456c1ebdeff24c2e4e1c5b1796b0fa7f11d268e85e7e SHA512 d086cbe38a6aa0149bea52e4b6fde74edfc0d769fe56225754ce13ee0316f3c149333527ca0512dc0f3f703ff84f3f5da19b4504cd2d6100c79d14fa54967bbd
-DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-DIST pulseeffects-4.8.6.tar.gz 2028485 BLAKE2B bf50c72773670ec9b8fd1f21b927b23f6656a2de6c86fc0b68a8fb199a2c949146d1c550f6ce291ca713edb5d0f2a034cf5cae6f3d266c4ef0f541c5f247e422 SHA512 37ad97e7234e9dae0f3be910b35b2dfed94f593c39e59b9977e31c95108e7edede4104cc5fe32292e617f119898c4bad4e9fd5afdfb9aaaa134f5cb78fc5fa0f
-EBUILD pulseeffects-4.8.5-r1.ebuild 2236 BLAKE2B 1dc26ed814192ccc3af475a41b5bce38b5659b895983071cd6a4a3be9f3ba5d864c7f9b7e9721e6f42b8776a4697af024ddc3d394fd0995fff284a457f0ab2be SHA512 484d0995b1f56ea5df785612a2ddbce2e6d6473995228838ff1fa54126dd14453cfcff3621e8dde3cba59cd9d5cf8bbb3a3596c4b2e7b4859e6af7a2e72bc219
-EBUILD pulseeffects-4.8.6.ebuild 2272 BLAKE2B e82fa92a378e770a656314dbdff9e1dd14342ce134ea6f5239d0dcdd79824bfd245497a4844cc2b3060428c0195f335e7bb8f294ac193305eedff92411bb944a SHA512 93351d197ab25d12ea43cc47848377269b1bf1a43bf8e6f23aba78c0d5406bd4627abdf708849d5ce8e699874178e9141a1c4486169d28d2652922b0ac1d293a
+AUX pulseeffects-4.8.7-meson_no_automagic.patch 1529 BLAKE2B 1a40bf0382e378129b784a1d65138e89934757b2e3580616e163a9f2be1675b6a181b3909b3d7dd25b5e1bc5243d316534e2eaae4d7f82e4764645be33ac6c15 SHA512 249fb9a3c4254c21a49c46b1eab4d0c9dd6081a1367d192be7f9446b97235aa2c5ef909465fe130c0d01024f6152a7208c5a2205781d8f84bf5b6bf1e10204cf
+DIST pulseeffects-4.8.7.tar.gz 2028489 BLAKE2B 705783104c7ce3f4ff1246cf05c1a31c09ef0507a720365b9a8914e6e076a209dcc56e240ae2de1981f3ab377f10947d08260fe8ae8b3cae5724db1235a0c01c SHA512 0fa679723ba76ab0a0cf3136dfa66fec09b16643f3f4f7bd1bb2826794d907c5c29a2fc7633e30d3542ddf755c842fdaa167528942fe459e3e697ac3524c0cb9
+EBUILD pulseeffects-4.8.7.ebuild 2270 BLAKE2B 1b230037c4c7a24a57ba08eeb6b665902263b077e18da372037b139e56275e737b2885eb4663a0b39710467780b243f13613e9b60c54b1d25a68e3ac04384769 SHA512 a0493b880ebfbf061104258dfaf89a6383a5f2cce08a4b9436e3b0ee4ee73570e6336bb08bdaae528e1f887ff9ed76396c3b0a80a78be6dacb6b94d337bd1bf7
 MISC metadata.xml 1353 BLAKE2B 8a3ab829edb36bf0f711057096176b15fad113820ec9910d5791c20cf9bc2802396264c43550a8a46b1f8318357b4d4e6a99c264d7b0b89aadc201b8f5098dee SHA512 bab593219b241f0903415945c110bdbe08197618d648785bbe0a7ed5c8a53618e16d60f82e5456ccd4236762384ae571bfc484bbb2f6aac8c99bd9d339f30e65
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch
deleted file mode 100644
index 0288fab2987d..000000000000
--- a/media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -4,7 +4,7 @@
- 	'cpp',
- 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
- 	version: '4.8.6',
--	meson_version: '>= 0.40.0'
-+	meson_version: '>= 0.47.0'
- )
- 
- add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -0,0 +1,12 @@
-+option(
-+        'bs2b',
-+        type: 'feature',
-+        value: 'auto',
-+        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
-+)
-+option(
-+        'rnnoise',
-+        type: 'feature',
-+        value: 'auto',
-+        description: 'Enable rnnoise-based Noise Reduction plug-in'
-+)
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -108,7 +108,7 @@
- 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
- 	dependency('gstreamer-fft-1.0'),
- 	dependency('lilv-0', version: '>=0.22', required: false),
--	dependency('libbs2b', required: false),
-+	dependency('libbs2b', required: get_option('bs2b')),
- 	dependency('boost', version: '>=1.72', modules:['system','filesystem']),
- 	dependency('sndfile'),
- 	dependency('threads')
---- a/src/rnnoise/meson.build
-+++ b/src/rnnoise/meson.build
-@@ -1,4 +1,5 @@
--dep_rnnoise = dependency('rnnoise', required: false)
-+opt_rnnoise = get_option('rnnoise')
-+dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
- 
- if dep_rnnoise.found()
- 
-@@ -28,7 +29,7 @@
-   	cpp_args: plugins_cxx_args
- )
- 
--else
-+elif opt_rnnoise.auto()
- 
- message('could not find the RNNoise library')
- 
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
index 2ad89e629771..7d29270ce54e 100644
--- a/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch
+++ b/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
@@ -3,7 +3,7 @@
 @@ -4,7 +4,7 @@
  	'cpp',
  	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
- 	version: '4.8.5',
+ 	version: '4.8.7',
 -	meson_version: '>= 0.40.0'
 +	meson_version: '>= 0.47.0'
  )
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
deleted file mode 100644
index 9ca5a1a00987..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-	EGIT_BRANCH="pulseaudio-legacy"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf +doc rnnoise rubberband webrtc zamaudio"
-
-DEPEND=">=dev-libs/boost-1.72:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=media-libs/gstreamer-1.12.5:1.0
-	media-libs/gst-plugins-base
-	>=media-libs/gst-plugins-bad-1.12.5:1.0
-	media-libs/libebur128
-	media-libs/libsndfile
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/zita-convolver-3.0.0
-	media-sound/pulseaudio
-	>=x11-libs/gtk+-3.20:3
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
-	rnnoise? ( media-libs/rnnoise )"
-RDEPEND="!media-sound/easyeffects
-	${DEPEND}
-	>=media-libs/gst-plugins-good-1.12.5:1.0
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	doc? ( gnome-extra/yelp )
-	rubberband? ( media-libs/rubberband[ladspa] )
-	webrtc? ( media-plugins/gst-plugins-webrtc )
-	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	media-libs/libsamplerate
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.5-meson_no_automagic.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature bs2b)
-		$(meson_feature rnnoise)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
index bf1d9aac8112..6ecf39ee6215 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="pulseaudio-legacy"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
@@ -60,7 +60,7 @@ BDEPEND="dev-libs/appstream-glib
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.6-meson_no_automagic.patch
+	"${FILESDIR}"/${PN}-4.8.7-meson_no_automagic.patch
 )
 
 S="${WORKDIR}"/easyeffects-${PV}