gentoo resync : 25.11.2020

6 files changed, 2 insertions, 220 deletions

diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 25490191ad08..94b5d41f31f6 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,11 +1,5 @@
-AUX guitarix-0.40.0-noexecstack.patch 972 BLAKE2B 7ecadff2c2882392b9eab28721135dcf8f70eb83397b1fed77c483b38be0d1ff74bcc2dab774e4a5449bb29049748b808683d5a2fe3406feb2c0f40c5a106eed SHA512 805172b4dbe22f9d45e25e8da5fb838bc635773d67b7db038105e6b1f61b3a3c05c5a473038127b6487e9bf339b272f77d73b30d266cd3ab65339a587fe747d5
-AUX guitarix-0.40.0-nostrip.patch 687 BLAKE2B 001f397a93b03578e6f214b517cf7af9e09a210adb0b5a5bf343ab74a9f3bc197b2d54c244bd55b6cd91ac0617299cd0937f2fed265b348253123c9873018212 SHA512 e0ee0431a19fe014b0008ff1ef94604f97aeba3bccef6571cf2fca425882081ec1eb255573a069effd9cca40427024f4ecb54836bb60e53b8c4198ae141ef240
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
-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
-EBUILD guitarix-0.39.0.ebuild 1726 BLAKE2B 2efb30118ea92aef65ed8e921378324ab38eb2632812803716ced8cde854b8ed710f9c668cc9d946eecbc7d6996577c2f819d8594b6f640a5a81e41a76fd814e SHA512 065c47eb37638e4c0c60cd0eba8e613c8502ce972f534aeee6fe9ffb3235a0ef9b3bb65a69aaffbbfe2f82580d3580dcc5b42d771bb682a94b219da9f4447d59
-EBUILD guitarix-0.40.0.ebuild 1801 BLAKE2B 8b171e16c2211e54bc6b536c94fa73846b244868bcbc1e757a2bf2d02fb5d273111dfa501640b3e334ff65e071ede7ed289757d93fc0e1d0c4089c44f9f610a1 SHA512 0c14080f5f7fa841cf0ad20ef1c64b399654bcbbf12bed9c33ecbe1daf9bf29fedb70fdc981cb5cb7a45e9e291db34d00361633209cf6cf67528e75f56ffc43b
-EBUILD guitarix-0.41.0.ebuild 1823 BLAKE2B 5c91bf8b09a117cc5b8c06c685ae589204e166fc1fa41eb5e7588bfa6eee9f44aa9cb7f595b66146aa66ff0f0252c2e89903885a8da566478cefdb4181fd724e SHA512 f19c54cdb9abf09349ee1f6679c590cc12877b505111a8b43fdd31acd45ab9c9771bb07931950dbb6ce1c38a1eea74ece1e536f9987936344b6f309755221f91
+EBUILD guitarix-0.41.0.ebuild 1822 BLAKE2B a970ec4c6f688c4949f3ea3d4dd49764f7d27607135b27b78f6ffe79c42ee71a28c840dac9737187907a5b17dd5b9db4541555113a9f126d29d76b550473f6da SHA512 85992e50d2a78ced1d41116c1023f3960c2d938f1ce2336090f15aec6143b3f480dd6ae445cc11fe1575148633b0f05b08029736257d1108cdeedd1446484c53
 EBUILD guitarix-9999.ebuild 1794 BLAKE2B f0e2ea5236e0a460125fbaf455c75436f689098fbf424de42c5edf3f2410c6a7e027dfcfbf089bb6dbdb90ac9709887350c9542e8863fde0fa0a3930f708c179 SHA512 e19797d623d28ee9a5ba40d100a59b476c1906919e0c088c0a5eea95b95557febaa66235800c5c2ee78653037d935e452338892546dffe510f797666c9ab3cf3
 MISC metadata.xml 661 BLAKE2B b68ff384f8ed21006ee3f7722a481b3b0060729786386ca7f6804dc38481f998a66e714800801417f5b0b429ca42cfb562f9bd289e899365a5d9a4ff53a6e489 SHA512 087467e4dc44968f8ae3ed95daf1da4ef6c39e0af8c58e1bb280ae08c46a568b672a7bd7022ad1a81e86fc6c7a15a13e4cfd61d2eb95ccd019b132a4386d2c28
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
deleted file mode 100644
index f64a21f26b51..000000000000
--- a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 2bc77f443b16..000000000000
--- a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 688596340430..000000000000
--- a/media-sound/guitarix/guitarix-0.39.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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:2.4
-	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
-	lv2? ( media-libs/lv2 )
-	standalone? (
-		dev-libs/boost:=
-		media-libs/liblrdf
-		media-libs/lilv
-		virtual/jack
-		bluetooth? ( net-wireless/bluez )
-		zeroconf? ( net-dns/avahi )
-	)
-"
-# clearlooks gtk engine and roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gtk-engines
-	standalone? (
-		media-fonts/roboto
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-
-DOCS=( changelog README )
-
-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-0.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild
deleted file mode 100644
index 7a7c6a6d4525..000000000000
--- a/media-sound/guitarix/guitarix-0.40.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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-0.41.0.ebuild b/media-sound/guitarix/guitarix-0.41.0.ebuild
index 95583d16f7a2..6e027895e479 100644
--- a/media-sound/guitarix/guitarix-0.41.0.ebuild
+++ b/media-sound/guitarix/guitarix-0.41.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"