gentoo resync : 25.08.2020

5 files changed, 47 insertions, 69 deletions

diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 29aba03f3297..88bbedc9cb3f 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,5 +1,5 @@
-AUX lmms-1.2.1-add-missing-qpainterpath.patch 1833 BLAKE2B 74ee1bb96bbcdf801e5059bc3c4b067df165e217b6b4b70948dc26df5bde3afb452b9d41e2cedd75941b5c23ca120a739b8f00ef82ad9d05f814d2498e1e49b8 SHA512 1a64bdc01c33f19284ec4f3163bdfd208b40394c11ec767b3954cf0a8f32ddb0dda8014a0e8aa475e22bf75676e4fc3236317fdd76cfd4dd22b7e7bb3963ebae
-DIST lmms-1.2.1.tar.xz 14543092 BLAKE2B 23cdc201b32295634c5f50f258e5f63fb995cc4bbf7283c8230b35bc0c6ab26e36097860f574747747966e267c36b43d67b6e9e836a026351c48635c66a00aeb SHA512 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6
-EBUILD lmms-1.2.1.ebuild 2359 BLAKE2B 90b4d6757ca369e2d4dabd68d3b9d2b51c3d23c346688f172b6dcf8ab8777721622e35c7ab164ca0363710ad83827f0c2edee35b1873bd6516d788726028f60b SHA512 d448dc77290adb24c45606016529c5bff102302ab37f27e4239ce5ace5aab4f78868e921e019ac8a8df44d8b9a79b66e0f6263f12406a12b20e2dedeb19e034b
-EBUILD lmms-9999.ebuild 2288 BLAKE2B 96405ec7db1d97fa503934b6cbc4288a1331b45521c2b1668c2185dc616f323a274883036770140e05f24f87f04486139d9accaaf0bf6f3666047f5d3e2b377f SHA512 e0fb43cc8653aa1a07e3cc1a7950b36c628a6ffa6d31e48ed7e2db7762186e5ebd6276ca70a23460d8d6483f0db4358551c5ad68e431b3f776d61b802bc005bd
+AUX lmms-1.2.2-no_compress_man.patch 1290 BLAKE2B 8d88782f2b17a1b2399e98559820e00e706d7f328eb140babde11ca239fd516b133e698c366fa34bf72c2047b64aa14108cc82a09d0869fffd5e3bea8c1936a5 SHA512 4a414e513a3257b5eb3f472ca321504e7037c314e3d218b612b9aa9391dd0d1b038b77467f112a069479abec1b1ab3372126e27db34ec22c2a89b902a66878bd
+DIST lmms-1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
+EBUILD lmms-1.2.2.ebuild 2389 BLAKE2B ff3dddfb8a47dc565f7c82514f954a124c72b3a6dccd3e8d0f276bdc33bc0b5164e79631de8c55096653d5b9b56004d3516f1543f4e35179964f0e429b94f2b2 SHA512 532fef9e5ee73d37ec81bbabb81782885c03f45c6c01c94c66e5c6e01f901c3f7cf138219898de50c7a9a3ad35514247c1c9b5a9f9aa9269f49635114c3e6cec
+EBUILD lmms-9999.ebuild 2292 BLAKE2B 84696bb30d8b1b156e7740b2f7a1c30e750538df9139dcd363f579965899c79a4fd220686491e85045bf1b73a8099d5fb506d69adf5e3c0eb3ea79ff986cf7ce SHA512 860d4674357662dbd4f3ff0a31a8b70a6deeee6d91eaf2861f745834c7fdfb6a708d850c713c78bac77d21e8200b7eb84a90dcb0dc54a41b2fea0b9a162bd1a5
 MISC metadata.xml 956 BLAKE2B 9bda57bcbb5b4f6c0831ca465ed48bb27f0c86f8de7908369140b0e7865dc4b44cf0c7b9225bdd8ba786dd4ef22af4a338134e89b23163e0f872519f2e0becfc SHA512 4a3c3bb120894acf50733e003dfdf3132201ad9d9cab21fbde39aca76c38d1e4784d70f2f01c9b889378fc8156271e0e216100dee85d028caef1eaa6dc49a3e0
diff --git a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch
deleted file mode 100644
index afade79b0fd8..000000000000
--- a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 29a5abc30b5d5efa30b7f6b73fe06d76ec851cca Mon Sep 17 00:00:00 2001
-From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com>
-Date: Mon, 18 May 2020 18:58:48 +0200
-Subject: [PATCH] Fix Qt 5.15 build issues (#5498)
-
-Add missing QPainterPath includes
----
- plugins/Eq/EqSpectrumView.h          | 1 +
- src/gui/AutomationPatternView.cpp    | 1 +
- src/gui/LmmsStyle.cpp                | 1 +
- src/gui/editors/AutomationEditor.cpp | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h
-index cd3f177586..84feeff13e 100644
---- a/plugins/Eq/EqSpectrumView.h
-+++ b/plugins/Eq/EqSpectrumView.h
-@@ -24,6 +24,7 @@
- #define EQSPECTRUMVIEW_H
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QWidget>
- 
- #include "fft_helpers.h"
-diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp
-index 448c233cb4..9889a6b460 100644
---- a/src/gui/AutomationPatternView.cpp
-+++ b/src/gui/AutomationPatternView.cpp
-@@ -25,6 +25,7 @@
- 
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMenu>
- 
- #include "AutomationEditor.h"
-diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp
-index e57e29e479..4fe5cb503c 100644
---- a/src/gui/LmmsStyle.cpp
-+++ b/src/gui/LmmsStyle.cpp
-@@ -28,6 +28,7 @@
- #include <QApplication>
- #include <QFrame>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleFactory>
- #include <QStyleOption>
- 
-diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
-index 5e8ea8a0af..74f15d358c 100644
---- a/src/gui/editors/AutomationEditor.cpp
-+++ b/src/gui/editors/AutomationEditor.cpp
-@@ -35,6 +35,7 @@
- #include <QLayout>
- #include <QMdiArea>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScrollBar>
- #include <QStyleOption>
- #include <QToolTip>
diff --git a/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch b/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch
new file mode 100644
index 000000000000..c087cf8387a7
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.2-no_compress_man.patch
@@ -0,0 +1,37 @@
+--- lmms/CMakeLists.txt
++++ lmms/CMakeLists.txt
+@@ -575,15 +575,6 @@
+ # post-install tasks
+ ADD_SUBDIRECTORY(cmake/postinstall)
+ 
+-ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
+-				COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
+-				DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
+-				COMMENT "Generating lmms.1.gz"
+-				VERBATIM)
+-
+-
+-ADD_CUSTOM_TARGET(manpage ALL
+-				DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
+ 
+ # install headers
+ 
+--- lmms/src/CMakeLists.txt
++++ lmms/src/CMakeLists.txt
+@@ -113,7 +113,7 @@
+ 	)
+ ENDIF()
+ 
+-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz")
++SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1")
+ 
+ IF(LMMS_BUILD_WIN32)
+ 	SET(EXTRA_LIBRARIES "-lwinmm")
+@@ -258,6 +258,6 @@
+ 	ENDIF(NOT LMMS_BUILD_APPLE)
+ 
+ 	INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
+-	INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
++	INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ 
+ ENDIF(LMMS_BUILD_WIN32)
diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.2.ebuild
index 2f8eba8d8cdd..edae2ae36731 100644
--- a/media-sound/lmms/lmms-1.2.1.ebuild
+++ b/media-sound/lmms/lmms-1.2.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz -> ${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
@@ -59,17 +59,19 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 RDEPEND="${COMMON_DEPEND}
-	media-libs/ladspa-cmt
 	media-plugins/calf
 	media-plugins/caps-plugins
+	media-plugins/cmt-plugins
 	media-plugins/swh-plugins
 	media-plugins/tap-plugins
 "
 
 DOCS=( README.md doc/AUTHORS )
 
+S="${WORKDIR}/${PN}"
+
 PATCHES=(
-	"${FILESDIR}/${P}-add-missing-qpainterpath.patch"
+	"${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284
 )
 
 src_configure() {
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 376874f97b14..a92a923b07b8 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -59,9 +59,9 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 RDEPEND="${COMMON_DEPEND}
-	media-libs/ladspa-cmt
 	media-plugins/calf
 	media-plugins/caps-plugins
+	media-plugins/cmt-plugins
 	media-plugins/swh-plugins
 	media-plugins/tap-plugins
 "