gentoo resync : 22.12.2021

3 files changed, 99 insertions, 7 deletions

diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 1c7d93d3ba1e..59c257ddab56 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,6 +1,8 @@
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
 AUX guitarix-0.42.1-fix-build-with-glib-2.68.patch 535 BLAKE2B 0281b89eca6dc32051226c09ddb6255e5c8bfd4a278aced69f995954d2dcc5c7d7ad9299d6827afa37cdb857f8b236976663fa63165b94fb5029a473ae07bb09 SHA512 05d66714c72e1c2a647d3d769f4d81f6a48d653f9bd3094a5306343b3838fe34d137d6c34b0955a3889a6feb7f1b2a9ac237ca2ec42190dffff0822b3ac706b2
 DIST guitarix2-0.42.1.tar.xz 71825372 BLAKE2B 06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43 SHA512 66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0
+DIST guitarix2-0.43.1.tar.xz 71742288 BLAKE2B bfa72a20f5fe1bdd08162e283f7074f6bcd6b4d6ccb1771f0351e60802ebf030f8f6627d2480ccd2e5972215847edd62bff38c338723fd0bf2504b9b2cee5101 SHA512 30e56d863308cea18bb4af6f71d3e8d852662b4252c998507a1c3de9a2d97fe1c4ecb525bd35ef8e176b5cb5138806553cba157c1aa6cb14e48fe0bbea8a7def
 EBUILD guitarix-0.42.1.ebuild 1879 BLAKE2B 36d5b345407d6d6de9f5b0e8682c4c2c7a818a82099d966fa7b105fbad4d83d2de4d178aa53e5226547c607a84ecc05ccfbf54e037d1ff9465064dc6c3bd41a3 SHA512 6d7c320981ad12ec0f8a6b380c564a27c6097c69bba1f101af511faebd2777d2ff7d519bc34df63be82ee7e33d28e69e64d1ef3198b78a309d43786f24531980
-EBUILD guitarix-9999.ebuild 1792 BLAKE2B 0bd201b1b4ead9e31efa6e6055326d99e71176d7dd7a10ac03ab93f9d0cbcae929c434eaf126c9f93ed6823256956301a5381f0afd082bcbb8d6fcddc0b9ff28 SHA512 6b86ab87643212ee1a37753755b409ba73c9fc1501e6d478760988cbad75615265dca629be68e9bfc718b821b43ea9eceb13ebf743647d15e3993296df0380ce
+EBUILD guitarix-0.43.1.ebuild 1799 BLAKE2B 1b720e72d59dfc3b7173ebaa140e9d30d698142563a61a866617f9af40198adb8d0151e79231f39b33e2b8ff5162d2ece778aca7be1b0d9780b8025ff2881b46 SHA512 cab4955bbaae6a9e49311e7a2757d34128dd7d6164242856c7958137dff3994f2dc810437afdce18656052ec9edcd3c1f7acdd68e1bd12c84c0bd5bad275a049
+EBUILD guitarix-9999.ebuild 1762 BLAKE2B 6bc5e9ef78e46f02196e6866d081801774af2cde30b65b7035e81e85168f099c449608922d7694b0f74b9768c6eddae195b51c5485f7401f8cf35e4066144d99 SHA512 f5b0d0c1ad5d4d7fc52744ac187f26153cb7f5681395be416bf83dc1a46ae4cb42ad8b0fe6a6ed84df3248b26ac4a32c8abe614c9dfcaf5555775e7f46803cf1
 MISC metadata.xml 692 BLAKE2B d71528f5f53831df41070160d9abee21667fc98c2000f28f87abd1669497cd7dbdf5f16ce8401d54e1886eda75ba7f991387586b9c758a35c5b5a9dde6a29a2a SHA512 0444744e99fd322718d0cd5b42406b549e72db08ca053a8ff06fe405646946291038719e6b6873dd1695b6661e2864c03f225476108b2424a5c9019e9983a0c4
diff --git a/media-sound/guitarix/guitarix-0.43.1.ebuild b/media-sound/guitarix/guitarix-0.43.1.ebuild
new file mode 100644
index 000000000000..d7de3341b7f3
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.43.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="https://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+DEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-libs/glib:2
+	media-libs/libsndfile
+	media-libs/zita-convolver:=
+	media-libs/zita-resampler
+	net-misc/curl
+	sci-libs/fftw:3.0=
+	x11-libs/gtk+:3
+	lv2? ( media-libs/lv2 )
+	standalone? (
+		dev-libs/boost:=
+		media-libs/liblrdf
+		media-libs/lilv
+		virtual/jack
+		bluetooth? ( net-wireless/bluez )
+		nsm? ( media-libs/liblo )
+		zeroconf? ( net-dns/avahi )
+	)
+"
+# roboto fonts are required for correct ui rendering
+RDEPEND="
+	${DEPEND}
+	standalone? (
+		media-fonts/roboto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	standalone? (
+		dev-lang/sassc
+		nls? (
+			dev-util/intltool
+			sys-devel/gettext
+		)
+	)
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+)
+
+src_configure() {
+	local myconf=(
+		--cxxflags-debug=""
+		--cxxflags-release="-DNDEBUG"
+		--ldflags="${LDFLAGS}"
+		--enable-lfs
+		--lib-dev
+		--no-desktop-update
+		--no-faust
+		--no-ldconfig
+		--shared-lib
+		$(use_enable nls)
+		$(usex bluetooth "" "--no-bluez")
+		$(usex debug "--debug" "")
+		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
+		$(usex nsm "" "--no-nsm")
+		$(usex standalone "" "--no-standalone")
+		$(usex zeroconf "" "--no-avahi")
+	)
+	waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index 766f8d088f1c..ac32a3ca36c9 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils xdg git-r3
@@ -26,11 +26,11 @@ DEPEND="
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
-	>=media-libs/libsndfile-1.0.17
-	>=media-libs/zita-convolver-3:=
+	media-libs/libsndfile
+	media-libs/zita-convolver:=
 	media-libs/zita-resampler
-	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.3.8:3.0=
+	net-misc/curl
+	sci-libs/fftw:3.0=
 	x11-libs/gtk+:3
 	lv2? ( media-libs/lv2 )
 	standalone? (