gentoo resync : 29.06.2020

6 files changed, 154 insertions, 12 deletions

diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index c2efd5071071..b0ca8d5a288c 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,4 +1,8 @@
+AUX guitarix-0.40.0-noexecstack.patch 972 BLAKE2B 7ecadff2c2882392b9eab28721135dcf8f70eb83397b1fed77c483b38be0d1ff74bcc2dab774e4a5449bb29049748b808683d5a2fe3406feb2c0f40c5a106eed SHA512 805172b4dbe22f9d45e25e8da5fb838bc635773d67b7db038105e6b1f61b3a3c05c5a473038127b6487e9bf339b272f77d73b30d266cd3ab65339a587fe747d5
+AUX guitarix-0.40.0-nostrip.patch 687 BLAKE2B 001f397a93b03578e6f214b517cf7af9e09a210adb0b5a5bf343ab74a9f3bc197b2d54c244bd55b6cd91ac0617299cd0937f2fed265b348253123c9873018212 SHA512 e0ee0431a19fe014b0008ff1ef94604f97aeba3bccef6571cf2fca425882081ec1eb255573a069effd9cca40427024f4ecb54836bb60e53b8c4198ae141ef240
 DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
-EBUILD guitarix-0.39.0.ebuild 1724 BLAKE2B 301bebf30887e39b61a443ab11edd7ab25a37234b51c10dabbc9b9e085d2c7befbc5fda8087c9e3a2a74a6784bce58e20f5ab69493a19762f4143b3511ae9e9f SHA512 aa28471e55303d706a80b34db6a785bc98e7a922196311b89053b6827a0333fd96223bcad7cb60d511ac04060ba5251295d0f4d3b5c6c2516dc344a71b35e78b
-EBUILD guitarix-9999.ebuild 1760 BLAKE2B 0ee278c75d56864fb52a4b7841b04ca72c92382915b87c55dcb341a7065f34dc8b931b29bd394a87829d269032e1fac2fec04e1c5968a9f35275ae401a99b74c SHA512 09a4a0c05a8210a355113045c6ee06fc2d059a2e9d28428933a935a9b0739d3671c3e2d25d72b41db436854db0d51dcc48be733ca8efb15fb16d9266083f2da6
+DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8
+EBUILD guitarix-0.39.0.ebuild 1726 BLAKE2B 2efb30118ea92aef65ed8e921378324ab38eb2632812803716ced8cde854b8ed710f9c668cc9d946eecbc7d6996577c2f819d8594b6f640a5a81e41a76fd814e SHA512 065c47eb37638e4c0c60cd0eba8e613c8502ce972f534aeee6fe9ffb3235a0ef9b3bb65a69aaffbbfe2f82580d3580dcc5b42d771bb682a94b219da9f4447d59
+EBUILD guitarix-0.40.0.ebuild 1801 BLAKE2B 8b171e16c2211e54bc6b536c94fa73846b244868bcbc1e757a2bf2d02fb5d273111dfa501640b3e334ff65e071ede7ed289757d93fc0e1d0c4089c44f9f610a1 SHA512 0c14080f5f7fa841cf0ad20ef1c64b399654bcbbf12bed9c33ecbe1daf9bf29fedb70fdc981cb5cb7a45e9e291db34d00361633209cf6cf67528e75f56ffc43b
+EBUILD guitarix-9999.ebuild 1734 BLAKE2B cf3c2302af3ea6f2870eb32303dabaa567d38c72987d131f0205e139a19cd23b0d6421db99218806217174e12a695604ce4cec158b4cb5848a92c665fa3d0e39 SHA512 7c9f8fd4dae7a0cdf4b75024c0edffcfaac200adc07eeaef3b5bdd7b1441350961728a0d2bbf8721ab13b201eed32b832e61b91ba0eaa6e313b0abff8c162b02
 MISC metadata.xml 595 BLAKE2B 22b392d194412eb045a3892e77a79f809215cdfc7e7afa42da59284f88975bd6d789a5a8e215c1137093266ba19e0be463d7b51b7b6506ff38f8591fd7b5cefb SHA512 5ccc8bcc15cf8fd7a5a4e18cb805765d6cc1b735c08b3194f3b4bc20d94e4d00d1db4fb9869bd58c82bcd39951d7421647811f61f7add2733e6719e6b5d78c3d
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
new file mode 100644
index 000000000000..f64a21f26b51
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
@@ -0,0 +1,26 @@
+From fc3e0b4754425bb262c8bcfd24cd345dd10e8d60 Mon Sep 17 00:00:00 2001
+From: brummer10 <brummer-@web.de>
+Date: Fri, 5 Jun 2020 06:41:30 +0200
+Subject: [PATCH] Fix issue #104 lv2 plugins contains executable stack, patch
+ by Alexander Tsoy
+
+---
+ trunk/src/LV2/xputty/resources/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/LV2/xputty/resources/wscript b/src/LV2/xputty/resources/wscript
+index a2f0402c..3c383393 100644
+--- a/src/LV2/xputty/resources/wscript
++++ b/src/LV2/xputty/resources/wscript
+@@ -41,7 +41,7 @@ def img2obj(task):
+     src = " ".join(["'%s'" % os.path.splitext(v.name)[0] for v in task.inputs[0:]])
+     cmd = ("cd src/LV2/xputty/resources/ \
+     && for f in %s; do\
+-     %s -r -b binary ${f}.png -o  ${f}.o; \
++     %s -r -b binary -z noexecstack ${f}.png -o  ${f}.o; \
+      done " % (src, env.LD[0]) )
+    # Logs.debug("runner: system command -> %s" % cmd)
+     ret = task.exec_command(cmd, shell=True)
+-- 
+2.26.2
+
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
new file mode 100644
index 000000000000..2bc77f443b16
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
@@ -0,0 +1,24 @@
+From 3dd1e0a8ea7db95b76a7b38e27a9b54d6fe75c76 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
+
+---
+ trunk/wscript | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 2699325f..f2d8f86d 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.39.0.ebuild b/media-sound/guitarix/guitarix-0.39.0.ebuild
index 9d500a3a0a3a..688596340430 100644
--- a/media-sound/guitarix/guitarix-0.39.0.ebuild
+++ b/media-sound/guitarix/guitarix-0.39.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='threads(+)'
 
@@ -10,7 +11,7 @@ inherit python-any-r1 waf-utils xdg
 MY_P="${PN}2-${PV}"
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="http://guitarix.org/"
+HOMEPAGE="https://guitarix.org/"
 SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/guitarix/guitarix-0.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild
new file mode 100644
index 000000000000..7a7c6a6d4525
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.40.0.ebuild
@@ -0,0 +1,85 @@
+# 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 +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 )
+		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}-noexecstack.patch
+	"${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 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 a9962b2bb430..95daa28f6cff 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='threads(+)'
 
@@ -10,8 +11,9 @@ inherit python-any-r1 waf-utils xdg git-r3
 MY_P="${PN}2-${PV}"
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="http://guitarix.org/"
+HOMEPAGE="https://guitarix.org/"
 EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git"
+S="${WORKDIR}/${P}/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,15 +23,14 @@ REQUIRED_USE="|| ( lv2 standalone )"
 
 COMMON_DEPEND="dev-cpp/eigen:3
 	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-lang/sassc
+	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+:2
+	x11-libs/gtk+:3
 	lv2? ( media-libs/lv2 )
 	standalone? (
 		dev-libs/boost:=
@@ -40,21 +41,22 @@ COMMON_DEPEND="dev-cpp/eigen:3
 		zeroconf? ( net-dns/avahi )
 	)
 "
-# clearlooks gtk engine and roboto fonts are required for correct ui rendering
+# roboto fonts are required for correct ui rendering
 RDEPEND="${COMMON_DEPEND}
-	x11-themes/gtk-engines
 	standalone? (
 		media-fonts/roboto
 	)
 "
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
+	dev-lang/sassc
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
 "
 
-S="${WORKDIR}/${P}/trunk"
-
 DOCS=( changelog README )
 
 src_configure() {