gentoo (valentine's day) resync : 14.02.2021

3 files changed, 3 insertions, 91 deletions

diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 5c1f367b9903..101cd61d361e 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,7 +1,5 @@
 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 1820 BLAKE2B 2bfd2fda4e262d7d7f0fdd25e3e3a01a7bf4f2587145b42667bd5212c6c3b362adb61b29d5cbcb58b359818490fd3b5716406db8544dde899350f09a8c8f9aa7 SHA512 6aa556fd5c060f1dc516e2ac15d1b59c0dc049117c3d2ef680c40cb4cc25fa52a2688d14d4cc57ce86d9d7c940a7ce4f0d0c8c8d69e9992e998ae14376002c2a
-EBUILD guitarix-0.42.1.ebuild 1829 BLAKE2B 29b4b6db244e5eaee9d7ba9e771831b722d3c30002c6942f3ac573646606d88e18d8fc026c144a84b92bbae157018cd7ac36d3d74979d400a26ff9ba8de068e1 SHA512 89329fc48c8acfdcdbf9a32aa9f2ff4f0b4b74bd0c90b3b6e0fbbe7eb8e367a4e4a4650dfcac203b0c45e2cdb804bc06f461b16e71ee5cbfc9388c6bca69825f
+EBUILD guitarix-0.42.1.ebuild 1828 BLAKE2B 6d247803d4c1a6efa833ac58309e7ff3c0fcb9b164d19e62a38edac0aed13fa9c5228f350ac4a4e9e5036c63607b58e970cee8691807f6e87db65c471f274700 SHA512 8461dc20dbf0c332ee6786f4425c80abc8a9c2e219140c80104f88b05b7107a092939dfb8f0b6335ab753b98e05dac8550e334ac55d5be80f393a75628f361fa
 EBUILD guitarix-9999.ebuild 1792 BLAKE2B 0bd201b1b4ead9e31efa6e6055326d99e71176d7dd7a10ac03ab93f9d0cbcae929c434eaf126c9f93ed6823256956301a5381f0afd082bcbb8d6fcddc0b9ff28 SHA512 6b86ab87643212ee1a37753755b409ba73c9fc1501e6d478760988cbad75615265dca629be68e9bfc718b821b43ea9eceb13ebf743647d15e3993296df0380ce
 MISC metadata.xml 661 BLAKE2B b68ff384f8ed21006ee3f7722a481b3b0060729786386ca7f6804dc38481f998a66e714800801417f5b0b429ca42cfb562f9bd289e899365a5d9a4ff53a6e489 SHA512 087467e4dc44968f8ae3ed95daf1da4ef6c39e0af8c58e1bb280ae08c46a568b672a7bd7022ad1a81e86fc6c7a15a13e4cfd61d2eb95ccd019b132a4386d2c28
diff --git a/media-sound/guitarix/guitarix-0.41.0.ebuild b/media-sound/guitarix/guitarix-0.41.0.ebuild
deleted file mode 100644
index aad4f7690df7..000000000000
--- a/media-sound/guitarix/guitarix-0.41.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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/guitarix-0.42.1.ebuild b/media-sound/guitarix/guitarix-0.42.1.ebuild
index a4de888c3ad3..3a9ca22629b1 100644
--- a/media-sound/guitarix/guitarix-0.42.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.42.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 )"