gentoo resync : 04.01.2022

6 files changed, 5 insertions, 233 deletions

diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index d07f6a25f786..966ded1e7a42 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,8 +1,3 @@
-AUX easyeffects-5.0.4-meson_no_automagic.patch 1520 BLAKE2B e7eb71a9aacdb80cf45b7314acc80a42c48549047e754f8154fdfd901d0b25ec16e25ca64715d26335b9f2c6f8bd5bec2803b09e62f7e8c618435aff5f97e748 SHA512 db116e3727c497774b702c6537c6cef152c5898034ebd0260df4365d65b1e8465181aefb7b5ff28eab2eb5794ce331326b1cd0f313124f3a33c61f073af15b4c
-DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
-DIST easyeffects-6.1.4.tar.gz 1959269 BLAKE2B b3a4b7f2e1816353bfda4d232f380483e33316c166d8b6e7e704cb86ac07e99fac14bac68e7748a3731ee76d07317d62cb4cae90c39cdbd77d794ef8151de71b SHA512 104e1efaf2790d052bcc0d7512a86e86fe12041ea9020cb0c3664c723bcfb79a96e071ad3cb5b36cf2d77acc5deecea0adcd36c409410e20aaeac908923e9e9b
 DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6
-EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
-EBUILD easyeffects-6.1.4.ebuild 1997 BLAKE2B ac38c18dd06f16486a7d4595025b64e607fd28f75bae3de7ff12da36f421b2f003c0b79d15e5faf952e01260540229d3cf3ee3c63f3c363ae54f42911861ade9 SHA512 e58bcb7303515868a68e8553a2c8c0028cd8266514ac662d66786af1e4c34e89d02be8e7637e17d1e0b8bd70d23707931b9ef51eebbaf96df6b3eda351e0c66e
-EBUILD easyeffects-6.1.5.ebuild 2015 BLAKE2B 57921182fb3a2b9f1751c24b75614b8fe9ad42be4754463c19ccbf3de39b186564bfd3f13dd2ce9bdc9a4167f9945e44d297d8c930ba4ec4603ef48b20be1c93 SHA512 4f76014d7358280c49c186847ae7a306267afb3b976fe67605bcefda6c0908a793b0dc4fe14a409e7ba870eeaec1b0a461f539ab7504ec44ed3446ba431a38d4
-MISC metadata.xml 1285 BLAKE2B 2f08a86e1d8dc764ab015461101f7983cbad6c4856239ba2dcf332e23f3cbdeecb9e93bd464315b86125b708e8dba80008f1536dc4cc8fe240137e3cfdf461e5 SHA512 6bd4a58517ba2124ec04cb7dcbc36fc8f029729041abe623e1e4de8671439bba2471bb6d03febd780b820a2bd9b37384dc3c289c87f6eaa39d2005b544f16cf6
+EBUILD easyeffects-6.1.5.ebuild 2023 BLAKE2B 2f097197e93d3e4c62c05a3998c81129291f65c143a36c864eaceb3c941061eb54fd1cc93bda6ecf456dc22b546151e84cac23caeba4b467a8c08eb7e463d115 SHA512 542d72440be49b6229d2ce451fb3484775e1be14169d1570e8b68781c0808dc51f6ec521ff40df8153f084a90b5b279ae79c1856be88017b75355c46dd5107f5
+MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
deleted file mode 100644
index a83848d083ab..000000000000
--- a/media-sound/easyeffects/easyeffects-5.0.4-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, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pipewire-gstreamer-legacy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-	EGIT_BRANCH="pipewire-gstreamer-legacy"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf 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-video/pipewire-0.3.24[gstreamer]
-	>=x11-libs/gtk+-3.20:3
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
-	rnnoise? ( media-libs/rnnoise )"
-RDEPEND="!media-sound/pulseeffects
-	${DEPEND}
-	gnome-extra/yelp
-	>=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] )
-	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}-5.0.4-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/easyeffects/easyeffects-6.1.4.ebuild b/media-sound/easyeffects/easyeffects-6.1.4.ebuild
deleted file mode 100644
index e99c0e46a097..000000000000
--- a/media-sound/easyeffects/easyeffects-6.1.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils flag-o-matic meson
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="calf +doc mda-lv2 zamaudio"
-
-# Tests fail since 6.1.0 due to upstream changes to the metainfo file.
-# TODO: check this every release.
-RESTRICT="test"
-
-DEPEND=">=dev-cpp/glibmm-2.68:2.68
-	>=dev-cpp/gtkmm-4.2.0:4.0
-	dev-cpp/nlohmann_json
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-3.0.6:3
-	media-libs/libbs2b
-	>=media-libs/libebur128-1.2.0
-	media-libs/libsndfile
-	>=media-libs/lilv-0.22
-	>=media-libs/lv2-1.18.2
-	media-libs/rnnoise
-	media-libs/rubberband[ladspa]
-	media-libs/speexdsp
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.31
-	sci-libs/fftw:3.0
-	>=gui-libs/gtk-4.2.1:4"
-RDEPEND="${DEPEND}
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	doc? ( gnome-extra/yelp )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	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"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++20 ; then
-			die "You need at least GCC 8 or Clang 10 for C++20-specific compiler flags"
-		fi
-	fi
-}
-
-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/easyeffects/easyeffects-6.1.5.ebuild b/media-sound/easyeffects/easyeffects-6.1.5.ebuild
index e2384d6fb9ab..ef8f7dcc1bb2 100644
--- a/media-sound/easyeffects/easyeffects-6.1.5.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.5.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -61,7 +61,7 @@ BDEPEND="dev-libs/appstream-glib
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]] ; then
 		if ! test-flag-CXX -std=c++20 ; then
-			die "You need at least GCC 8 or Clang 10 for C++20-specific compiler flags"
+			die "${PN} requires degree of C++20 support only available since GCC 10 or Clang 10"
 		fi
 	fi
 }
diff --git a/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
deleted file mode 100644
index 4e547d404f80..000000000000
--- a/media-sound/easyeffects/files/easyeffects-5.0.4-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: '5.0.4',
--	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:['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/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
index baeb462dbb21..0291ee33b45a 100644
--- a/media-sound/easyeffects/metadata.xml
+++ b/media-sound/easyeffects/metadata.xml
@@ -10,15 +10,9 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
-		<flag name="bs2b">Enable use of <pkg>media-libs/libbs2b</pkg> for the crossfeed FX</flag>
 		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
 		<flag name="doc">Install packages needed to display built-in user documentation</flag>
 		<flag name="mda-lv2">Enable use of <pkg>media-plugins/mda-lv2</pkg> for the loudness FX</flag>
-		<flag name="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
-			noise-reduction FX</flag>
-		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
-		<flag name="webrtc">Enable use of <pkg>media-plugins/gst-plugins-webrtc</pkg> for various
-			voice-enhancement FX</flag>
 		<flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag>
 	</use>
 	<upstream>