gentoo new year resync : 01.01.2021

3 files changed, 107 insertions, 11 deletions

diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 94b5d41f31f6..ae40ea00eae3 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,5 +1,7 @@
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
 DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
+DIST guitarix2-0.42.1.tar.xz 71825372 BLAKE2B 06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43 SHA512 66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0
 EBUILD guitarix-0.41.0.ebuild 1822 BLAKE2B a970ec4c6f688c4949f3ea3d4dd49764f7d27607135b27b78f6ffe79c42ee71a28c840dac9737187907a5b17dd5b9db4541555113a9f126d29d76b550473f6da SHA512 85992e50d2a78ced1d41116c1023f3960c2d938f1ce2336090f15aec6143b3f480dd6ae445cc11fe1575148633b0f05b08029736257d1108cdeedd1446484c53
-EBUILD guitarix-9999.ebuild 1794 BLAKE2B f0e2ea5236e0a460125fbaf455c75436f689098fbf424de42c5edf3f2410c6a7e027dfcfbf089bb6dbdb90ac9709887350c9542e8863fde0fa0a3930f708c179 SHA512 e19797d623d28ee9a5ba40d100a59b476c1906919e0c088c0a5eea95b95557febaa66235800c5c2ee78653037d935e452338892546dffe510f797666c9ab3cf3
+EBUILD guitarix-0.42.1.ebuild 1831 BLAKE2B ecf9a8f4c9c3e99b3f5030f6a7047b08973898bff8cfa12a4e4e3f9beb68c4e2407716f74d064e141fa580351a64fdbea6363f5fc0b8763971fea218f56dbe7f SHA512 9e46f59f6da98bdfce4f35fc63747073f21d15459d35ec677be3cd8df9780aef0666025ad2731ace7b99be7f1066b216ee22e36a7b4a9a6a897ec5debaf3ee12
+EBUILD guitarix-9999.ebuild 1794 BLAKE2B 21a4d0f0ad5261f2b1a7ec912cb67eb7e6fc88e69992ba5dbc3547fbd27f92c61386d9390145c20b4c136cd2385781441a6c9dcd1132ee1b237f45624aac8485 SHA512 d8732c88dc4afce4742a234f9fe6018d91de10da18df4cf066a670bdf22d6ff9bb68b8ac844faf7d215423ce87cdf98cd11c56aad4cf51121c9f3d30d9b5cfdf
 MISC metadata.xml 661 BLAKE2B b68ff384f8ed21006ee3f7722a481b3b0060729786386ca7f6804dc38481f998a66e714800801417f5b0b429ca42cfb562f9bd289e899365a5d9a4ff53a6e489 SHA512 087467e4dc44968f8ae3ed95daf1da4ef6c39e0af8c58e1bb280ae08c46a568b672a7bd7022ad1a81e86fc6c7a15a13e4cfd61d2eb95ccd019b132a4386d2c28
diff --git a/media-sound/guitarix/guitarix-0.42.1.ebuild b/media-sound/guitarix/guitarix-0.42.1.ebuild
new file mode 100644
index 000000000000..2c8d5e6f5a0f
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.42.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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-1.0.17
+	>=media-libs/zita-convolver-3:=
+	media-libs/zita-resampler
+	>=net-misc/curl-7.26.0
+	>=sci-libs/fftw-3.3.8: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 1f66e9647b1f..5bd6d0e7b8af 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils xdg git-r3
@@ -21,7 +21,8 @@ KEYWORDS=""
 IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"
 
-COMMON_DEPEND="dev-cpp/eigen:3
+DEPEND="
+	dev-cpp/eigen:3
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
@@ -29,7 +30,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	>=media-libs/zita-convolver-3:=
 	media-libs/zita-resampler
 	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.1.2:3.0=
+	>=sci-libs/fftw-3.3.8:3.0=
 	x11-libs/gtk+:3
 	lv2? ( media-libs/lv2 )
 	standalone? (
@@ -43,18 +44,21 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	)
 "
 # roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	standalone? (
 		media-fonts/roboto
 	)
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
-	dev-lang/sassc
 	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
+	standalone? (
+		dev-lang/sassc
+		nls? (
+			dev-util/intltool
+			sys-devel/gettext
+		)
 	)
 "