gentoo resync : 21.08.2021

3 files changed, 80 insertions, 66 deletions

diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 282e9b0fcd15..401f6347ebca 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,7 +1,8 @@
 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.0.3.tar.gz 1905373 BLAKE2B f423cefd0e6124ee1128bf5a07fb23df03df4ca25a6ebcbcd122032e5768ee68ff3464cdb51263d731fee3e9f5fee180858d96ab627771099808b1194adb78b1 SHA512 eb88f0befb6cf86b7da03137cb7ed6ac833f204d17860d9bd508dc8b007b2a0fb941b63a015b1179cb4da28abd0b3d8a8c53d026fd5a22057fee27e02618035c
+DIST easyeffects-6.1.0.tar.gz 1921987 BLAKE2B 419f8e88ff9fc1e40779f91efca4eb2b3145b1fcad885fd376a73d8b8dd3f7a0af43a73361e22c02e739503a3ca4d91885921848e3d8ef9186b2907b0e400476 SHA512 2a6ed01377f5bd4f6891980f2b22d499da8369207069b7869e146543ad125f274bbc61ab0f2608e8737b2650df0bedf0b619a3eb200e3444ddfd0ae8960bebfe
 EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
-EBUILD easyeffects-5.0.4.ebuild 1790 BLAKE2B 5be8a0a80e5ee355ab69ae30cf9553de9b0859dcdd9baaff20373c7aa1e89d95730a3a2ab0f552a4ee37209cfed53871a5e423b8d434d0532673e230c1fbbd56 SHA512 18ef1d69d988aa1d5553f97c48be4bed66e8d9859d22a2764593c9cfb3f7b36b1e784b0f7ddf6c206f99f4d2a534b133472ee4461afb5a66b04a20f9ba5ff6f2
 EBUILD easyeffects-6.0.3-r1.ebuild 1855 BLAKE2B 8a8f589feb8ad0bce561cd0cbb3f5ca083f0f37eddaf897b216aeda605eeb3e33c2b20428fe21864391da33720ddda0f8d26ba1faeb18f30ae5a20fb66ffc150 SHA512 8cd9c763ea0978c4a6f07594b41043f1256eff9c7e37f24cb13b180e6cb1baa3830912eb88ab8f6588462ea5e77c49ab0f97a1f33fb8203aecb47c45ed95e721
+EBUILD easyeffects-6.1.0.ebuild 1988 BLAKE2B 90665a9922351a93fde5b939acaa0e4ae9d56120c0bd81b355d0cdb6fce2eb04447331c4dad559edcf5c948ba58e026499b955cf3d624205e9c4f15639e8a650 SHA512 a739d70079ae34b8a2fd2f3ae4aeccd8c5e0c308cc35efa7daf3db5224ed899ed7dc6dde22981042cfb1dd6d85bbb2918e043b6539ca58168093d11b688fe11e
 MISC metadata.xml 1195 BLAKE2B a9f9b0ceaba335b213579bf247c4fd84aaae38028681bcf1f290459a3055fb81cb628a76555624ad3a0344aad7e6db2a555e453f9681d25cf7cb3fe45444b08d SHA512 18b3bb086ed4da4a198f38abd1fac855dd4b0e2a205fd4a1d05f4db67c9be10e9f9145360d8896b9d30e12bb003e62e81298a68d762362460b6ad7466bec2082
diff --git a/media-sound/easyeffects/easyeffects-5.0.4.ebuild b/media-sound/easyeffects/easyeffects-5.0.4.ebuild
deleted file mode 100644
index e050d932ceae..000000000000
--- a/media-sound/easyeffects/easyeffects-5.0.4.ebuild
+++ /dev/null
@@ -1,65 +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"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	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 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="!media-sound/pulseeffects
-	>=dev-libs/boost-1.41:=
-	>=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
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	>=media-video/pipewire-0.3.24[gstreamer]
-	sys-apps/dbus
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext"
-BDEPEND="dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig"
-
-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.0.ebuild b/media-sound/easyeffects/easyeffects-6.1.0.ebuild
new file mode 100644
index 000000000000..a18718b2e2cc
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-6.1.0.ebuild
@@ -0,0 +1,78 @@
+# 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 toolchain-funcs
+
+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 ~ppc64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf mda-lv2 zamaudio"
+
+# 6.1.0 tests fail due to recent changes to the metainfo file.
+# TODO: make sure this is removed come next 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:3
+	media-libs/libbs2b
+	media-libs/libebur128
+	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}
+	gnome-extra/yelp
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	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
+}