gentoo resync : 15.12.2019

5 files changed, 36 insertions, 57 deletions

diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index b54aac5ddb71..f0938776be59 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,6 +1,5 @@
-AUX minuet-19.04.3-missing-header.patch 543 BLAKE2B 201445ba134af3aeb136356030118c8c14649d46627c6ff4167826ab87915ee7eda7ff4afccb359e94a756a853db88f029c165288eb3784ac043c76676e01a6f SHA512 bef276f1efa7f353f153620657747487af433d11902c2fb1398e65caecb98e06b1f2b2ab42fdcc413edcd8d255cbad5f9f248d2ecc5f09b4678557dc5f7c2cc6
-DIST minuet-19.04.3.tar.xz 27602392 BLAKE2B 38bc5aab61d7f007b55f6cf171ecfb6bb650978079b958c23a0040e85dff3fda3198a22b7dd81c2dece7478b4c2c5056e934e98b69351ecc2a06757db44f4b64 SHA512 96d6fe8634260de1e9b908c239628aed49eed57e3f0587d94a4c6e18318fc98c0db8219a6d58d68ef1bc06ce13032e0ff438511b868e8acb841713a8be966f8b
 DIST minuet-19.08.3.tar.xz 27593424 BLAKE2B f0aad2bbb9f4e0f0fbe8e9c493876eb482379610fd173f754aea8cdec06ba3baf5944aa9237dc71e12c0e7e4536e770b4f7fa14740be551e91e41b1a7ee9b733 SHA512 0e21f9f7ef97130f217842ecc430ee3742ab9fb1d86d4b24d11d4b8c42ce77516f0c1c258ebfe731296f7b08a699734daafb25c6a2bb1ae42a32b2e2b414be96
-EBUILD minuet-19.04.3.ebuild 611 BLAKE2B 9851635931cd0ad0b844f056b71feaadb5f2325dba8ad0561f5b458d25a216fa2b9791214f78be3c60c199b56aa1445cb54cf5c0aca0eaf94f94ab4c9af89bcb SHA512 194b73fcb3080d00220bae16e8e595bf842827ee094a210a2972b034118896fccdd01473f1802d80293778f51aa9212c9b4c8d9183165fb2e40b555a5ec9bd5a
-EBUILD minuet-19.08.3.ebuild 675 BLAKE2B e467e6dd56ef4f7ca769f9d0d6b0ee2a1c5884d74e3995fdde2ddf9c4eaf5d27bd50d3dde400bb73ec0bf3e47a29f02cc803d60da78816ff209384342de1c432 SHA512 2990028fcabd369f11efb55aa8eb60c106008ba4673a65aacf2c05a77b55d468d20b689fb09235a4e8fd09c92036fc6316aba5495bfe855bf09e2329a91a9bdd
+DIST minuet-19.12.0.tar.xz 27597704 BLAKE2B 2bf680fcb0dd637cdd93bad6334683147969425f5d67e4f7f69ad115d2cae775e4d9a41457642f2640d299a81cb0e3794e5f67056c6d495b3290bd9ec944d0a9 SHA512 94583c09236c4c20643e130118d80ff1143827ac31ea22644a6d76cbb64e8f009f4e2c43c4ff05bc1ab2306e52e3599063cba6d7c0ab3c923aa44e62efab0478
+EBUILD minuet-19.08.3.ebuild 672 BLAKE2B e20170d977b5255d420f5cd5bf35b8f7a94c061a39d401ff15669b3e3f3f201945592e5431b25289af1ee052204c7fa94f738a5fc5a7b71d2377899a41f6db09 SHA512 42df34239cb680769dcc2867a70e11376722db41ad997a168bc18863c91cbd72f095fee7d853e3d33a613449180c2aaf0e9e643d96341fe5341b9514236c5b22
+EBUILD minuet-19.12.0.ebuild 676 BLAKE2B 29a43e3a4e837612ad9223a66b6667ebdf99c78e35e0479e28ffa50b6711c9339b6c6b68db4a5262b4a641f914504d9da3ce6a6e6384b83782581a814e9a3014 SHA512 c8bf29876a7103673f5d7fee1191c9c55804802e2f1ff405e353062a369b9cafa30906e803457da3bb0163298b36cf72caeb2554eae4506abe9d1db073b3b200
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/files/minuet-19.04.3-missing-header.patch b/kde-apps/minuet/files/minuet-19.04.3-missing-header.patch
deleted file mode 100644
index 9524f4f3564f..000000000000
--- a/kde-apps/minuet/files/minuet-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0ed28414428a6e19017ae7c5605ca09aaf0debea Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 17 Jul 2019 22:56:58 +0200
-Subject: Fix build on CI
-
----
- src/app/plugincontroller.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/app/plugincontroller.h b/src/app/plugincontroller.h
-index 19c6c89..3acd1d4 100644
---- a/src/app/plugincontroller.h
-+++ b/src/app/plugincontroller.h
-@@ -27,6 +27,7 @@
- 
- #ifndef Q_OS_ANDROID
- #include <KPluginMetaData>
-+#include <QVector>
- #endif
- 
- namespace Minuet
--- 
-cgit v1.1
diff --git a/kde-apps/minuet/minuet-19.04.3.ebuild b/kde-apps/minuet/minuet-19.04.3.ebuild
deleted file mode 100644
index 5b8c1fa2e8d5..000000000000
--- a/kde-apps/minuet/minuet-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Music Education software by KDE"
-HOMEPAGE="https://minuet.kde.org/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtquickcontrols2)
-	media-sound/fluidsynth:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/minuet/minuet-19.08.3.ebuild b/kde-apps/minuet/minuet-19.08.3.ebuild
index f222d681f861..017aeb677337 100644
--- a/kde-apps/minuet/minuet-19.08.3.ebuild
+++ b/kde-apps/minuet/minuet-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Music Education software by KDE"
 HOMEPAGE="https://minuet.kde.org/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/minuet/minuet-19.12.0.ebuild b/kde-apps/minuet/minuet-19.12.0.ebuild
new file mode 100644
index 000000000000..bc11e064dcd0
--- /dev/null
+++ b/kde-apps/minuet/minuet-19.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Music Education software by KDE"
+HOMEPAGE="https://minuet.kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	media-sound/fluidsynth:=
+"
+RDEPEND="${DEPEND}"