gentoo resync : 18.11.2019

4 files changed, 65 insertions, 33 deletions

diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 2f01c2978885..230cc5ab12ba 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,6 @@
+AUX klines-19.08.3-qt-5.14.patch 834 BLAKE2B 8036d4f78b3f918f921bb35aaad6fa71462d60338ab4ac05a5f2ecaecdc75c6fb1cc153853a672dd50f489875a3a79b3846c00781cc7b99d574ec3baad739f46 SHA512 b93cf6995deaa6f4d6fdfb0cf5990a87c1e98e4dc59528b0cd6a6647470b5f68639fbbd06c72ca51d11d611ad517367e1432c9e9dca9f4edb85db2bbe02bcc7e
 DIST klines-19.04.3.tar.xz 1781072 BLAKE2B 0f5fc6c4ed932789ed005424d203a207868999f762c7335b5230d630fe262a0403a8e782213f10cbd92dc9585a66fb65d4656b7fdc5386c64b74bb98c2e4b02f SHA512 08062210b9dd0b47b3a9cbb022579752a72bd509e5f4e9d32242442b01f3e14eea1a0fd22cb77feddb98e82e5615dcb36830e0cf87767622ad25b5613a25aa56
-DIST klines-19.08.2.tar.xz 1780672 BLAKE2B 8d7234bb084aee0cabae4372b455ead1d6c53bac58021cc2f8f005dc30fc0bbd9798c411d1039699f2e60d5b60d4505e1df53e2aa208a5876b4219ea6a788576 SHA512 b1bf8d6960f5a48f687574b10abed362cacfdd4b644f9148e913206a809b4a9215b08bd4492be5df3c5e02d76a0894a5c9290f692f74779c476c5d2862c698cb
+DIST klines-19.08.3.tar.xz 1781396 BLAKE2B d763f9f7e957688ccc5706bd0066e58e9c262c752b29d484897fe81666bd68fc795cea12ec35ab84a7fac9a674d732c87c88145230ff4c8bed545a3ff7cf913a SHA512 485ff5f504eaea9d40251428b48ea629b042a6b4ec58cf571510e1f257369030774dcb8861095eb7114e1adb09fb19d08d7e9fb14c91cacbf9d28c27da450f8c
 EBUILD klines-19.04.3.ebuild 781 BLAKE2B 1f51515e6a94f0be151eec9f54b986305effb35e25125bd9acd62ca12328a89e13bc5fa6ebaead2af79bbcc2b4b93304257355e71e1136d5c9768620e24d3d5a SHA512 e63aed688135da2082b27c5b475680f67eb39865ec87f7ccf02c3bc9aa7f56bef1ae3f6273bd941050d1ee9a41dda33dc2a5957211bd4ef526342a8b104978ac
-EBUILD klines-19.08.2.ebuild 784 BLAKE2B 44abad6d02c556a251d30d6d8802e8974c13f046ba6810c90daf3a6a0e67bacf3550fd08758c383ff10a84d92f26942a82504015f622289bdcda91b7df6403ab SHA512 2fedac8825b082a3ebaeaa909acf1aafce8536a283fc278206b44fbe7fc2727be00dc26ca432728902ed765548da6bce9e560dcd5ea619145d41aebc92bda764
+EBUILD klines-19.08.3.ebuild 986 BLAKE2B 7ca951e7e695dc433418372668e04bf79318c33243e6774d3964090a219249ac762f56a8ee92ccc441d8df38f38dc7153ba6bf929086abb08a0c6fc270a5f4a1 SHA512 b7ccfc86e07396cafc9e060faed3b6dc9739391d4d25432351b76a941657221c1e82cd013ebc10f881c62c211a54ea966703d07fef0a45c3e2bcd2147aa78b66
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/files/klines-19.08.3-qt-5.14.patch b/kde-apps/klines/files/klines-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..d7507ede611b
--- /dev/null
+++ b/kde-apps/klines/files/klines-19.08.3-qt-5.14.patch
@@ -0,0 +1,24 @@
+From 88d61f11f762cb922a7bef7b7cb1bfbb5bb148c5 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:34:13 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ mwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mwidget.cpp b/mwidget.cpp
+index e813ebe..3e31f6b 100644
+--- a/mwidget.cpp
++++ b/mwidget.cpp
+@@ -39,7 +39,7 @@ MainWidget::MainWidget( QWidget* parent )
+     klview->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+     klview->setFrameStyle(QFrame::NoFrame);
+ 
+-    klview->setOptimizationFlags( QGraphicsView::DontClipPainter |
++    klview->setOptimizationFlags( 
+                                   QGraphicsView::DontSavePainterState |
+                                   QGraphicsView::DontAdjustForAntialiasing );
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/klines/klines-19.08.2.ebuild b/kde-apps/klines/klines-19.08.2.ebuild
deleted file mode 100644
index 68a0d4720120..000000000000
--- a/kde-apps/klines/klines-19.08.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="https://kde.org/applications/games/klines/
-https://games.kde.org/game.php?game=klines"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/klines/klines-19.08.3.ebuild b/kde-apps/klines/klines-19.08.3.ebuild
new file mode 100644
index 000000000000..3aa2c7be5b66
--- /dev/null
+++ b/kde-apps/klines/klines-19.08.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="A little KDE game about balls and how to get rid of them"
+HOMEPAGE="https://kde.org/applications/games/klines/
+https://games.kde.org/game.php?game=klines"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS )
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )