gentoo resync : 25.08.2020

5 files changed, 93 insertions, 98 deletions

diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 6266fd6218f1..e4baa614fc97 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
-AUX cadence-add-skip-stripping.patch 2184 BLAKE2B 61db0094b2ae8059c1cf162d553db9624cf84e0d92483bd42678b6be8dd0e25aaf7eb5cde6983e65c54cbe61d2f0f1a507d74a73572662c64e489e8c30b7cc56 SHA512 dda75f3b7f23c9303206fde30ca9c90eaf3999edd8b1d02f5cd3e0680d72dc59b0966ce9100d4274490595f7aa6df3ed6ef6f91ed672840341f9d5083805b239
-DIST cadence-0.9.0.tar.gz 2202265 BLAKE2B 03d38f611df05597d2b4016f263d36f2386be421383a38b51dee519514e6d1ed79bf92ea2a789ea868a25d4c805e9e94cd0971f479b772799bf6bf3170349b4a SHA512 381c9c57c1d96452a91969e134420d63ef06f5ec144050779d0a06a1098e8ed1693c70165b6640e04acc448d382e717e71ead1b29ba5043f0668675850cad7d1
-EBUILD cadence-0.9.0-r4.ebuild 2172 BLAKE2B 9844a157a8db4819bf551493b44f2ec59e26f724543571821919e40fe25ceb556e35d80513bd93f03de50e1292ce4f68066ccd80590edc03eaaf0de2aefce83a SHA512 bfcfe9642a2ce8988f6526bbbcc846c7ff504853e2c7d6245db87f6337ef8d8e98999c9462183ec8d5418aa186a774ba19c2e872418619b92eb725bed7b28b8d
-EBUILD cadence-9999.ebuild 2059 BLAKE2B 59983428d4250e0fb040b5585b89c5521637f23402fe0b4eadb698de4fc9f90dc62da70ccdba73e3da8c0ad45e7038916c0d48baec9bda758652d4fdc7a05f72 SHA512 f7de8366a38f7e2c832202821a3bae0b43d7172be33de87cfb870e214e9f5fb89af5386002f56501c545477573b4734ef0cbb4b2927af7c1423c127ece7de9f0
+AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
+DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
+EBUILD cadence-0.9.1.ebuild 2410 BLAKE2B 2d1e0b36ea3d2ba7b040e940a9a9e7ac5849d9b2362fd3dc87647073ae919f41784a889d00165d94f5bbc69a855d09d6d3741aeb0f50f0ebb80ca4d1669ecab2 SHA512 7ed6d65a4437d3620e39f0c6377c0ff1ec6eb2181a812697522a8a5e662ef9d55276dcce6c2aa2447bb6e670ce8ec4373c2846e645616ccb9c555e7393788f4c
+EBUILD cadence-9999.ebuild 2356 BLAKE2B 3e3422570afd70a1e8aa59ddf546aa2e1395a78009372e53c585f6979d82d051ca67fd4f35989b2a3140cb6ca317eb59476e2f8d5f6418d71419a4368ca10887 SHA512 b83ae35507c4f57faf60fb88364e33cc7fc96e7bf4951964c2a6afb80111178fa0633939d99acebcb2f336cf25520af52d788cb06eac3e616c38a20b913a1e53
 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-0.9.0-r4.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild
index 08953c0b0c7f..6185958b360d 100644
--- a/media-sound/cadence/cadence-0.9.0-r4.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -3,13 +3,22 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
-HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
-SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
+HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
+	KEYWORDS="amd64"
+else
+	SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64"
+	S="${WORKDIR}/Cadence-${PV}"
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -17,7 +26,6 @@ IUSE="a2jmidid -pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
 CDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -32,9 +40,9 @@ CDEPEND="
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
-S="${WORKDIR}/Cadence-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-qt5.15.patch
+)
 
 src_prepare() {
 	sed -i -e "s/python3/${EPYTHON}/" \
@@ -53,7 +61,7 @@ src_prepare() {
 }
 
 src_compile() {
-	myemakeargs=(PREFIX="/usr"
+	myemakeargs=(PREFIX="${EPREFIX}/usr"
 		SKIP_STRIPPING=true
 	)
 
@@ -61,17 +69,22 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
+
+	python_fix_shebang "${ED}"
 
 	# Clean up stuff that shouldn't be installed
-	rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
-	rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop
-	rm -rf "${D}"/usr/share/applications/*.desktop
+	rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
+	rm -rf "${ED}"/etc/xdg/autostart/cadence-session-start.desktop
+	rm -rf "${ED}"/usr/share/applications/*.desktop
 
 	if use !pulseaudio; then
-		rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback}
-		rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback}
+		rm -rf "${ED}"/usr/bin/cadence-pulse2{jack,loopback}
+		rm -rf "${ED}"/usr/share/cadence/pulse2{jack, loopback}
 	fi
+	# Depend on ladish which is not in the tree
+	rm -rf "${ED}"/usr/bin/claudia{,-launcher}
+	rm -rf "${ED}"/usr/share/cadence/icons/claudia-hicolor/
 
 	# Replace desktop entries with QA issues with these
 	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 1059f334e102..b0f1b5c66689 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -3,13 +3,22 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-inherit git-r3 python-single-r1 xdg desktop
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
-HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
-EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
-KEYWORDS=""
+HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/Cadence-${PV}"
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -17,7 +26,6 @@ IUSE="a2jmidid -pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
 CDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -30,7 +38,7 @@ CDEPEND="
 	pulseaudio? ( media-sound/pulseaudio[jack] )
 "
 RDEPEND="${CDEPEND}"
-DEPEND="${RDEPEND}"
+DEPEND="${CDEPEND}"
 
 src_prepare() {
 	sed -i -e "s/python3/${EPYTHON}/" \
@@ -49,7 +57,7 @@ src_prepare() {
 }
 
 src_compile() {
-	myemakeargs=(PREFIX="/usr"
+	myemakeargs=(PREFIX="${EPREFIX}/usr"
 		SKIP_STRIPPING=true
 	)
 
@@ -57,17 +65,22 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
+
+	python_fix_shebang "${ED}"
 
 	# Clean up stuff that shouldn't be installed
-	rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
-	rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop
-	rm -rf "${D}"/usr/share/applications/*.desktop
+	rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
+	rm -rf "${ED}"/etc/xdg/autostart/cadence-session-start.desktop
+	rm -rf "${ED}"/usr/share/applications/*.desktop
 
 	if use !pulseaudio; then
-		rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback}
-		rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback}
+		rm -rf "${ED}"/usr/bin/cadence-pulse2{jack,loopback}
+		rm -rf "${ED}"/usr/share/cadence/pulse2{jack, loopback}
 	fi
+	# Depend on ladish which is not in the tree
+	rm -rf "${ED}"/usr/bin/claudia{,-launcher}
+	rm -rf "${ED}"/usr/share/cadence/icons/claudia-hicolor/
 
 	# Replace desktop entries with QA issues with these
 	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
diff --git a/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch b/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch
new file mode 100644
index 000000000000..b9c52167e375
--- /dev/null
+++ b/media-sound/cadence/files/cadence-0.9.1-fix-qt5.15.patch
@@ -0,0 +1,34 @@
+From c167f35fbb76c4246c730b29262a59da73010412 Mon Sep 17 00:00:00 2001
+From: Alex Tsitsimpis <alex.tsitsimpis@gmail.com>
+Date: Thu, 4 Jun 2020 12:49:40 +0300
+Subject: [PATCH] Fix build with Qt 5.15+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building with Qt 5.15 failed with the following error:
+
+../widgets/pixmapdial.cpp:231:26: error: aggregate ‘QPainterPath ballPath’ has incomplete type and cannot be defined
+  231 |             QPainterPath ballPath;
+      |                          ^~~~~~~~
+../widgets/pixmapdial.cpp:278:26: error: aggregate ‘QPainterPath ballPath’ has incomplete type and cannot be defined
+  278 |             QPainterPath ballPath;
+      |                          ^~~~~~~~
+
+Signed-off-by: Alex Tsitsimpis <alex.tsitsimpis@gmail.com>
+---
+ c++/widgets/pixmapdial.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/c++/widgets/pixmapdial.cpp b/c++/widgets/pixmapdial.cpp
+index 37dcffd..0b5e0f5 100644
+--- a/c++/widgets/pixmapdial.cpp
++++ b/c++/widgets/pixmapdial.cpp
+@@ -22,6 +22,7 @@
+ #include <QtCore/QTimer>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPaintEvent>
++#include <QtGui/QPainterPath>
+ 
+ PixmapDial::PixmapDial(QWidget* parent)
+     : QDial(parent),
diff --git a/media-sound/cadence/files/cadence-add-skip-stripping.patch b/media-sound/cadence/files/cadence-add-skip-stripping.patch
deleted file mode 100644
index eacf0c9a431d..000000000000
--- a/media-sound/cadence/files/cadence-add-skip-stripping.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/c++/Makefile.mk b/c++/Makefile.mk
-index ec92861..8e9998f 100644
---- a/c++/Makefile.mk
-+++ b/c++/Makefile.mk
-@@ -7,7 +7,6 @@
- AR  ?= ar
- CC  ?= gcc
- CXX ?= g++
--STRIP ?= strip
- WINDRES ?= windres
- 
- HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core)
-@@ -22,7 +21,6 @@ DEBUG ?= false
- ifeq ($(DEBUG),true)
- BASE_FLAGS  = -O0 -g -Wall -Wextra
- BASE_FLAGS += -DDEBUG
--STRIP       = true # FIXME
- else
- BASE_FLAGS  = -O3 -ffast-math -mtune=generic -msse -mfpmath=sse -Wall -Wextra
- BASE_FLAGS += -DNDEBUG
-@@ -38,6 +36,10 @@ ifneq ($(DEBUG),true)
- BUILD_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT
- endif
- 
-+ifneq ($(SKIP_STRIPPING), true)
-+LINK_FLAGS += -Wl,--strip-all
-+endif
-+
- # --------------------------------------------------------------
- 
- # Currently broken
-diff --git a/c++/jackmeter/Makefile b/c++/jackmeter/Makefile
-index 004076d..bfe3230 100644
---- a/c++/jackmeter/Makefile
-+++ b/c++/jackmeter/Makefile
-@@ -31,10 +31,10 @@ OBJS = \
- all: cadence-jackmeter
- 
- cadence-jackmeter: $(FILES) $(OBJS)
--	$(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ && $(STRIP) $@
-+	$(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@
- 
- cadence-jackmeter.exe: $(FILES) $(OBJS) icon.o
--	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@
-+	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@
- 
- # --------------------------------------------------------------
- 
-diff --git a/c++/xycontroller/Makefile b/c++/xycontroller/Makefile
-index 662a7af..b4aac04 100644
---- a/c++/xycontroller/Makefile
-+++ b/c++/xycontroller/Makefile
-@@ -35,10 +35,10 @@ OBJS  = xycontroller.o \
- all: cadence-xycontroller
- 
- cadence-xycontroller: $(FILES) $(OBJS)
--	$(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ && $(STRIP) $@
-+	$(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@
- 
- cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o
--	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@
-+	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@
- 
- # --------------------------------------------------------------
-