4 files changed, 135 insertions, 0 deletions
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index b5029b9da9fd..e7afd4cf70a3 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,2 +1,3 @@
 DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
 DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8
+DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
diff --git a/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch
new file mode 100644
index 000000000000..03850a8acb03
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch
@@ -0,0 +1,47 @@
+From f630c226e4d6f342f78a82f6dd6df4fe3e3f3e01 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Fri, 5 Jun 2020 17:21:10 +0300
+Subject: [PATCH] Do not strip lv2 plugins
+
+---
+ waftools/lv2.py | 4 ++--
+ wscript         | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/waftools/lv2.py b/waftools/lv2.py
+index 7397f6b7..256d52b1 100644
+--- a/waftools/lv2.py
++++ b/waftools/lv2.py
+@@ -40,7 +40,7 @@ def lv2_add_common(tg, target, install_path, defines=None, linkflags=None, cxxfl
+ @Configure.conf
+ def lv2(bld, *k, **kw):
+     lv2_base, dst = get_lv2_base(bld, kw)
+-    tg = bld.shlib(features='strip', *k, **kw)
++    tg = bld.shlib(*k, **kw)
+     cxxflags = []
+     if not bld.env['OPT'] and bld.env['SSE2']:
+         cxxflags = [ "-msse2", "-mfpmath=sse"]
+@@ -57,7 +57,7 @@ def lv2_gui(bld, *k, **kw):
+     if not bld.env['LV2GUI']:
+         return None
+     lv2_base, dst = get_lv2_base(bld, kw)
+-    tg = bld.shlib(features='strip', *k, **kw)
++    tg = bld.shlib(*k, **kw)
+     lv2_add_common(tg, lv2_base+'_gui', dst, ["LV2_GUI"], ['-fvisibility=hidden','-Wl,-z,relro,-z,now','-Wl,--exclude-libs,ALL'])
+     return tg
+ 
+diff --git a/wscript b/wscript
+index 3e2114d3..0d49cd16 100644
+--- a/wscript
++++ b/wscript
+@@ -375,7 +375,6 @@ def configure(conf):
+     conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
+     conf.env['BIN_NAME'] = APPNAME
+     if opt.lv2:
+-        conf.gxload('strip')
+         conf.gxload('lv2')
+     conf.env['LADSPA'] = opt.ladspa
+     conf.env['NEW_LADSPA'] = opt.new_ladspa
+-- 
+2.26.2
+
diff --git a/media-sound/guitarix/guitarix-0.41.0.ebuild b/media-sound/guitarix/guitarix-0.41.0.ebuild
new file mode 100644
index 000000000000..95583d16f7a2
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.41.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 )"
+
+COMMON_DEPEND="dev-cpp/eigen:3
+	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/zita-resampler
+	>=net-misc/curl-7.26.0
+	>=sci-libs/fftw-3.1.2: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="${COMMON_DEPEND}
+	standalone? (
+		media-fonts/roboto
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-lang/sassc
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-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/metadata.xml b/media-sound/guitarix/metadata.xml
index 73245221dba8..a17618d6ef19 100644
--- a/media-sound/guitarix/metadata.xml
+++ b/media-sound/guitarix/metadata.xml
@@ -15,6 +15,7 @@
 	</maintainer>
 	<use>
 		<flag name="lv2">Build lv2 plugins</flag>
+		<flag name="nsm">Build NSM (Non Session Manager) support</flag>
 		<flag name="standalone">Build standalone application</flag>
 	</use>
 </pkgmetadata>