gentoo resync : 25.01.2020

6 files changed, 3 insertions, 200 deletions

diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index cc786e0da790..e4216c4235b0 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,9 +1,4 @@
-AUX jalv-1.6.0-qt-5.7.0.patch 906 BLAKE2B 86d7f74c8a80dd4308c5ec4c67d866ae1c6917bfe429d32a92bdc03ec0ab5342e4f3bc957f773dadb943e7dc9d69f7209e0e4ec7a998edef067448dd5dce5a7c SHA512 b5ddc63afc7340a0d2d14bd924c7adc1393d469031c3d1c37210e21090b1159c2fd3879e627f8c8e611452d9ade40a9fe18de9e63880bdbd2f05caf96209b163
-AUX jalv-1.6.0-stdin.patch 2008 BLAKE2B 0fca98631638a2713cf9caa127ca4dce715d81441071fbe695654d9902639c9836398de5adc878f242c45fd52af73238621065cceb4ec0cf685c25debe1b02e5 SHA512 aab7ccb29a63ebaafe1c05852a9533930181e2c34c6015aff9b4d608bfa95a6d4218849736e960adcaef635f4ecb0c3188bcaf2c1f3feb02a5eaff8866a1cacd
-AUX jalv-1.6.0-suil-qt5.patch 1159 BLAKE2B 8e319a59d00946f42586ea9b048b78725ed295d5ae55f6c87bf1739e5aad7319aa9eb7624aee7638b07d45dd757b7859745030d0419ac446367cf8a16bc024bc SHA512 22fd7452af3fcfd2c71a24cce218ce2fbcfccc2eaa224d54594a014ca184a72e80fb5489a868c298ff4ac3884805f2fd2bc827dd63eaa22df081804f0b355fc2
 AUX jalv-1.6.4-qt-5.7.0.patch 462 BLAKE2B 54918c977485c0c420a3f23dbcbf4638def779429b6bd7065c79b0ddffc0263b1a65402b3ec0a7d8678f0ccba694a758d211d9d5fc589b6723cd728bcb4d29ff SHA512 048352f5355aa957a6d88026374555a9dc4b33a4aef972fa39de5ca772b1ca77298f81ae938482d43a41da513594255ae37c57bd2a3b70fe6b22b03f46d80ea7
-DIST jalv-1.6.0.tar.bz2 157726 BLAKE2B d1d35ccc3c0234d0005b83fca89ba0570f747f65568da6b5ea4ef0a0974bbd729540555e3cdcd77f3f5b7a8de9f987c7743e258d7544c8d70c7c51aaae84f9a5 SHA512 70453404788846774ef88b43653379f97140301e09e8de61779683df9ee85120485bebf03c959624639dc4d8dd71ce83db2a89b14b66be17696a88d1820ac1b3
 DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b
-EBUILD jalv-1.6.0-r2.ebuild 1425 BLAKE2B 242e7f6c38d3df41107833fd68dc1d57f967985e4a600ca24730eaab49bef3ce87f2d44b43a1d3f563bb9f61464f732341780f8af87ca69bba3ab29d479916fe SHA512 7f07f817ad34ea0f7161e87046ca0229c712f3a2c3b8f1e63b4bd7fafb017a384d0e1a113076207ba50559d229472fe8ff92f781270d258ddac007707e94bc65
-EBUILD jalv-1.6.4.ebuild 1363 BLAKE2B 3aebc3187b3d8a3e9ccc4b1da8d4caca9a33b1f730aff6b6a73d796bd5479ff376750560ec6f4ef97ad96c176f48848a0a75293fa9a08a7cb8befc781e3bc003 SHA512 269a72dc46e2385c81fd5a41fb7918cd3a90a2ea01cf73d3b8fcdd005fffce5135beb2dd7d610f6743348bdd73f90bcf5097b4c2f939ac45add22fafb6e999c6
+EBUILD jalv-1.6.4.ebuild 1362 BLAKE2B df91b4019bd9d7bb182dc726a058a1538efaeb798d40490e3d2ddd6fe62b36d13b29c297f1c2b5e90efd52ed6d5c91e0dd47626afedaa8ae6c583e73dc378bee SHA512 fffa6299920c0cc0a98664a4be701826a15a4a32263c9cddae546c148a2051ecddb907b3569294764a00f1fd5be591e1c84031ecb5faf2f22f1fe6bbdc38cb30
 MISC metadata.xml 1152 BLAKE2B c5969351b829ace0f2e54d452526a3f77939f99f721acd846c34ce84ca2264ca2c6996725969c034721df7de41abbf9dfbfcbdde9ade5b375f845479ec66d3ac SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c
diff --git a/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch b/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch
deleted file mode 100644
index f6ca944b04c8..000000000000
--- a/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c32f3ca76a09c03fe9a022eb46e049e6fd5e2dbb Mon Sep 17 00:00:00 2001
-From: David Robillard <d@drobilla.net>
-Date: Sat, 7 Jan 2017 19:20:55 -0500
-Subject: Fix compilation with newer versions of Qt5
-
-
-diff --git a/wscript b/wscript
-index 24f5a2b..08df946 100644
---- a/wscript
-+++ b/wscript
-@@ -5,7 +5,7 @@ from waflib.extras import autowaf as autowaf
- import waflib.Options as Options
- 
- # Version of this package (even if built as a child)
--JALV_VERSION = '1.6.0'
-+JALV_VERSION = '1.6.1'
- 
- # Variables for 'waf dist'
- APPNAME = 'jalv'
-@@ -231,7 +231,7 @@ def build(bld):
-                   includes     = ['.', 'src'],
-                   lib          = ['pthread'],
-                   install_path = '${BINDIR}',
--                  cxxflags     = ['-fPIC'])
-+                  cxxflags     = ['-fPIC', '-std=c++11'])
-         autowaf.use_lib(bld, obj, libs + ' QT5')
- 
-     # Man pages
--- 
-cgit v0.10.2
-
diff --git a/media-sound/jalv/files/jalv-1.6.0-stdin.patch b/media-sound/jalv/files/jalv-1.6.0-stdin.patch
deleted file mode 100644
index 953af7c5f3e3..000000000000
--- a/media-sound/jalv/files/jalv-1.6.0-stdin.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 3a46e861b5b8dbbacb8dd1cec9fa2c69a10b26e0 Mon Sep 17 00:00:00 2001
-From: David Robillard <d@drobilla.net>
-Date: Sat, 18 Feb 2017 18:00:03 +0100
-Subject: Add jalv -i option to ignore stdin for background use
-
-
-diff --git a/doc/jalv.1 b/doc/jalv.1
-index 6d93a72..000ed5a 100644
---- a/doc/jalv.1
-+++ b/doc/jalv.1
-@@ -17,6 +17,10 @@ Print the command line options.
- Print control output changes to stdout.
- 
- .TP
-+\fB\-i\fR
-+Ignore input on stdin (for background use).
-+
-+.TP
- \fB\-c SYM=VAL\fR
- Set control value (e.g. "vol=1.4").
- 
-diff --git a/src/jalv_console.c b/src/jalv_console.c
-index c0f369c..e0e114b 100644
---- a/src/jalv_console.c
-+++ b/src/jalv_console.c
-@@ -106,6 +106,8 @@ jalv_init(int* argc, char*** argv, JalvOptions* opts)
- 				opts->controls, (++n_controls + 1) * sizeof(char*));
- 			opts->controls[n_controls - 1] = (*argv)[a];
- 			opts->controls[n_controls]     = NULL;
-+		} else if ((*argv)[a][1] == 'i') {
-+			opts->non_interactive = true;
- 		} else if ((*argv)[a][1] == 'd') {
- 			opts->dump = true;
- 		} else if ((*argv)[a][1] == 't') {
-@@ -191,7 +193,7 @@ jalv_open_ui(Jalv* jalv)
- 
- 		show_iface->hide(suil_instance_get_handle(jalv->ui_instance));
- 
--	} else {
-+	} else if (!jalv->opts.non_interactive) {
- 		// Primitive command prompt for setting control values
- 		while (!zix_sem_try_wait(jalv->done)) {
- 			char line[128];
-@@ -202,6 +204,8 @@ jalv_open_ui(Jalv* jalv)
- 				break;
- 			}
- 		}
-+	} else {
-+		zix_sem_wait(jalv->done);
- 	}
- 
- 	// Caller waits on the done sem, so increment it again to exit
-diff --git a/src/jalv_internal.h b/src/jalv_internal.h
-index 3a565ec..06f116a 100644
---- a/src/jalv_internal.h
-+++ b/src/jalv_internal.h
-@@ -172,6 +172,7 @@ typedef struct {
- 	int      no_menu;           ///< Hide menu iff true
- 	int      show_ui;           ///< Show non-embedded UI
- 	int      print_controls;    ///< Print control changes to stdout
-+	int      non_interactive;   ///< Do not listen for commands on stdin
- } JalvOptions;
- 
- typedef struct {
--- 
-cgit v0.10.2
-
diff --git a/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch b/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch
deleted file mode 100644
index a57447ce075b..000000000000
--- a/media-sound/jalv/files/jalv-1.6.0-suil-qt5.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4d22c6a53ff1dcb657ab1913f1b100e42db19bca Mon Sep 17 00:00:00 2001
-From: David Robillard <d@drobilla.net>
-Date: Sat, 18 Mar 2017 12:00:11 +0100
-Subject: Use new suil init API to fix Qt5 plugin UIs
-
-
-diff --git a/src/jalv.c b/src/jalv.c
-index 78901ca..20f24e7 100644
---- a/src/jalv.c
-+++ b/src/jalv.c
-@@ -777,6 +777,7 @@ main(int argc, char** argv)
- 	jalv.bpm           = 120.0f;
- 	jalv.control_in    = (uint32_t)-1;
- 
-+	suil_init(&argc, &argv, SUIL_ARG_NONE);
- 	if (jalv_init(&argc, &argv, &jalv.opts)) {
- 		return EXIT_FAILURE;
- 	}
-diff --git a/wscript b/wscript
-index 19f51bb..e2adc63 100644
---- a/wscript
-+++ b/wscript
-@@ -59,7 +59,7 @@ def configure(conf):
-     autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
-                       atleast_version='0.12.0', mandatory=True)
-     autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
--                      atleast_version='0.6.0', mandatory=True)
-+                      atleast_version='0.8.7', mandatory=True)
-     autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
-                       atleast_version='0.6.0', mandatory=True)
-     if Options.options.portaudio:
--- 
-cgit v0.10.2
-
diff --git a/media-sound/jalv/jalv-1.6.0-r2.ebuild b/media-sound/jalv/jalv-1.6.0-r2.ebuild
deleted file mode 100644
index a2fdff30c7c1..000000000000
--- a/media-sound/jalv/jalv-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 qmake-utils waf-utils
-
-DESCRIPTION="Simple but fully featured LV2 host for Jack"
-HOMEPAGE="http://drobilla.net/software/jalv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="gtk gtk2 gtkmm portaudio qt5"
-
-RDEPEND="
-	>=dev-libs/serd-0.14.0
-	>=dev-libs/sord-0.12.0
-	>=media-libs/lilv-0.24.0
-	>=media-libs/lv2-1.6.0
-	>=media-libs/sratom-0.6.0
-	>=media-libs/suil-0.10.0
-	gtk? ( >=x11-libs/gtk+-3.0.0:3 )
-	gtk2? ( >=x11-libs/gtk+-2.18.0:2 )
-	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
-	portaudio? ( media-libs/portaudio )
-	!portaudio? ( virtual/jack )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.7.0.patch"
-	"${FILESDIR}/${P}-stdin.patch"
-	"${FILESDIR}/${P}-suil-qt5.patch"
-)
-
-src_configure() {
-	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
-	waf-utils_src_configure \
-		"--docdir=/usr/share/doc/${PF}" \
-		--no-qt4 \
-		$(use qt5       || echo --no-qt5)       \
-		$(use gtk       || echo --no-gtk3)      \
-		$(use gtk2      || echo --no-gtk2)      \
-		$(use gtkmm     || echo --no-gtkmm)     \
-		$(use portaudio && echo --portaudio)
-}
diff --git a/media-sound/jalv/jalv-1.6.4.ebuild b/media-sound/jalv/jalv-1.6.4.ebuild
index a11ca9d1bd66..1a2a254f6300 100644
--- a/media-sound/jalv/jalv-1.6.4.ebuild
+++ b/media-sound/jalv/jalv-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gtk gtk2 gtkmm portaudio qt5"
 
 RDEPEND="