6 files changed, 23 insertions, 79 deletions
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index 5fcd791006a1..f154b765a4f9 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,6 +1,4 @@
-AUX jalv-1.6.4-qt-5.7.0.patch 462 BLAKE2B 54918c977485c0c420a3f23dbcbf4638def779429b6bd7065c79b0ddffc0263b1a65402b3ec0a7d8678f0ccba694a758d211d9d5fc589b6723cd728bcb4d29ff SHA512 048352f5355aa957a6d88026374555a9dc4b33a4aef972fa39de5ca772b1ca77298f81ae938482d43a41da513594255ae37c57bd2a3b70fe6b22b03f46d80ea7
-DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b
+AUX jalv-1.6.6-suil-always.patch 410 BLAKE2B 7aee87986df386383990e2fc1c012592c95793a3ed7d80faa98c1946130d591eca283db62954bd6c8419cb0b57ef600ece58886dc5c33be7eb0d0addc8b09d81 SHA512 534cc589ddf8f40f32c9c5febc71a6707bc546a6277f5fa556f65f2fff20f053851063449723708460279d22efb45b505f8bbc5e5316781164ed33993847bfb8
 DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
-EBUILD jalv-1.6.4.ebuild 1371 BLAKE2B dd6720a3b703b2d72361293cd52b0dbd5e24314b33b60939d3cb3f71de71b78f652d864a897d981e23d862e9da65a8704c1768682d49ee3ab1483a820a345b6d SHA512 2ca995beadf265d5f73e7d20292a947b8ffec650af0dda9e15a63125fb3fe9d0a0ecd7a650bd810407f7603fbbd9e9c6c3c941ac3c85764c39ba16ca6d6740b6
-EBUILD jalv-1.6.6.ebuild 1246 BLAKE2B 7e2a74f9637477540ad4722fa70364565df7ef170fceada2af6bbd2076a6048fde714260282e81fd123c979b234c3733c824697478af5bdd87cb424d8a27cfcd SHA512 bcfe4936f3c3a22e69e2841d40b9d78db88667738592e67c1517fbe9a19ccf0a094060c7ac4bf67b95eea96a38c3e3b4ed8ce1ea4d6e9ecbf8ce678878368e00
-MISC metadata.xml 1152 BLAKE2B c5969351b829ace0f2e54d452526a3f77939f99f721acd846c34ce84ca2264ca2c6996725969c034721df7de41abbf9dfbfcbdde9ade5b375f845479ec66d3ac SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c
+EBUILD jalv-1.6.6.ebuild 1220 BLAKE2B fd07f3e2a675afc446532077147f4324025eae70720396c132e209def4d5c1f183105b4affda28a06cd62ff9a70ff0b0aec37445b1a7569ca8c8ce5c8212786d SHA512 0ac8b2e49cdbb4814462f02c989bd3fc6e87f4b6970ecec113a3c2e40d5308d82e5e812ce0322acb4746006443111aad91734f8b3b3b955b8bafb7df1e255c86
+MISC metadata.xml 1051 BLAKE2B b6f05c6cb84eed6653069e98a49467816e383e39d388bfda8f1384222b55a22e656c807a607d96f395c0f11ec2869ebeda693d4585771a136eb6e03ca2d958a0 SHA512 3f16ac2415d2e4b411532bcbd9cba26830d3a28b84bffe4ea0d1764de762a185d3a5b2bbe30ddc6f9d2567d4527c7ed306a9002c6fa6971d4cf29da134492a47
diff --git a/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch b/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
deleted file mode 100644
index 1f9b6147a219..000000000000
--- a/media-sound/jalv/files/jalv-1.6.4-qt-5.7.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wscript b/wscript
-index af363ca..5060b4d 100644
---- a/wscript
-+++ b/wscript
-@@ -235,7 +235,7 @@ def build(bld):
-                   lib          = ['pthread'],
-                   uselib       = libs + ' QT5',
-                   install_path = '${BINDIR}',
--                  cxxflags     = ['-fPIC'])
-+                  cxxflags     = ['-fPIC', '-std=c++11'])
- 
-     # Man pages
-     bld.install_files('${MANDIR}/man1', bld.path.ant_glob('doc/*.1'))
diff --git a/media-sound/jalv/files/jalv-1.6.6-suil-always.patch b/media-sound/jalv/files/jalv-1.6.6-suil-always.patch
new file mode 100644
index 000000000000..938f34ee0556
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.6-suil-always.patch
@@ -0,0 +1,14 @@
+diff --git a/wscript b/wscript
+index 06f74f2..a269b14 100644
+--- a/wscript
++++ b/wscript
+@@ -170,8 +170,7 @@ def configure(conf):
+                 conf.env.HAVE_QT4 or
+                 conf.env.HAVE_QT5)
+ 
+-    if have_gui:
+-        conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
++    conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
+ 
+     if conf.env.HAVE_JACK:
+         conf.check_function(
diff --git a/media-sound/jalv/jalv-1.6.4.ebuild b/media-sound/jalv/jalv-1.6.4.ebuild
deleted file mode 100644
index 9c1796284073..000000000000
--- a/media-sound/jalv/jalv-1.6.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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.24.0
-	>=dev-libs/sord-0.14.0
-	>=media-libs/lilv-0.24.0
-	>=media-libs/lv2-1.16.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}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.7.0.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.6.ebuild b/media-sound/jalv/jalv-1.6.6.ebuild
index 17bf69398aec..42870c71a5f1 100644
--- a/media-sound/jalv/jalv-1.6.6.ebuild
+++ b/media-sound/jalv/jalv-1.6.6.ebuild
@@ -13,8 +13,8 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gtk gtk2 gtkmm portaudio qt5"
+KEYWORDS="amd64"
+IUSE="gtk gtkmm portaudio qt5"
 
 RDEPEND="
 	dev-libs/serd
@@ -24,7 +24,6 @@ RDEPEND="
 	media-libs/sratom
 	media-libs/suil
 	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
 	gtkmm? ( dev-cpp/gtkmm:2.4 )
 	portaudio? ( media-libs/portaudio )
 	!portaudio? ( virtual/jack )
@@ -41,6 +40,10 @@ BDEPEND="
 "
 DOCS=( AUTHORS NEWS README.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-suil-always.patch"
+)
+
 src_configure() {
 	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
 	waf-utils_src_configure \
@@ -48,7 +51,6 @@ src_configure() {
 		--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/metadata.xml b/media-sound/jalv/metadata.xml
index de663c86a7ee..8b8731392d54 100644
--- a/media-sound/jalv/metadata.xml
+++ b/media-sound/jalv/metadata.xml
@@ -15,7 +15,6 @@
 </longdescription>
 
 <use>
-	<flag name="gtk2">Adds support for GTK+2 in addition to GTK+3 controlled by the gtk useflag.</flag>
 	<flag name="gtkmm"> Adds support for <pkg>dev-cpp/gtkmm</pkg>: C++ interface for GTK+2</flag>
 </use>