gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 96 deletions

diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 0b6e62e5e162..99737dbdae56 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,6 +1,3 @@
-AUX kruler-19.08.3-qt-5.14.patch 1395 BLAKE2B e46ce5ca3e4540a8776e5df5ef478abfd6a12d22551d3180c7ee6efe29fb3036020ffb6d512d26651c92aa8b7f3667480903ad81d053c005fd4acf665b29f1d0 SHA512 bd88002f2f5d40861cb8b63bed31a1f541fd11c214c116b1b8a4ef2fa93fe997f8be672c5af5718ffcbd0222d449b898ddf64c3523accd186006cffc9a65d9f5
-DIST kruler-19.08.3.tar.xz 249500 BLAKE2B 49e857bee9076f6f4abde7c719b9c4e7a55d50d70d9beef76ad6e31826aed44c0f66accd5b4ea80afc9543459e27f793973d82930dd0f400ca507b69f9ed51a3 SHA512 25e146e941f6eaf04e4f93cffad0fae777345800f1b80127e39f3701660d4c0f2839d152a82c15b8e5ebe9351a41974e139223984fd6cd99f49b7de36789d139
-DIST kruler-19.12.2.tar.xz 250384 BLAKE2B 3b1d6de006086a38f97095183d90189eb0fc827fe4d4c919dadd33b73710f669e93c44381ce839d1b5275aa3410307502c4e1501c17648a207885f89f81e3f0d SHA512 df7f7cb8ef7917b28132ef7a873cd55db20c20925782087dbd48ad25516674c3478b3a908dfef43e47212cd2487abdc4a2b450a2ee74b98e5e685dbb0722a08a
-EBUILD kruler-19.08.3.ebuild 990 BLAKE2B 65deec241474bfcf08d6bc5c519b93bec90b8b8d0aa4c336289ab6b6d826dd8c11ab7a9399a8e7a5b14926719c7eff27119caf2c81b7531d815f19d9bdd3b724 SHA512 12b6efbe4fda75bb433fd48847756ad4edcf552e613dfa01670dacc7d02789dfdc943bcf6f3abf5f1104527eb2b14df24a77738547e29f046307249353cb207e
-EBUILD kruler-19.12.2.ebuild 961 BLAKE2B 9a632fe2c8d4913d0c04d278d49da7cde8264584e04b9a798a70e8dc9ba43a4df5fb0c0315fd55dc3cc3c1122f3944a6749aeeb0352d64b7f6ad0982ee89e0da SHA512 c02d0a93d6ca14fb787ff120ef9ac27d5db9091de35b965332e8458453f57f60d19d58f62333412641d47119af5f6e97454ee441460333da5332a49996a60bd4
+DIST kruler-19.12.3.tar.xz 250924 BLAKE2B 8c935086e01763ee4051bf9ab99fbb07296445b22ed490ae39e2fd3c1a2b633ff21bc30b2c47cb963dfcffae7e972e6482d1c4f24544f2afadc92923d44eb7b2 SHA512 34f9cd2c9076594f8984428eac971ceed91798011f6aeb7ec2ba8c8fbec1829a29da8e603a5a66a0e41e423bc81d181c549c43d2529aa23cb421f0267b5d80c0
+EBUILD kruler-19.12.3.ebuild 958 BLAKE2B 492b01e35a7f7278e394961906f6236c3f70c32c589f26889262180b4dc435a5c589cb562872abbe4ab473f61bc537c585056bae6491091351ebc0dc60e33809 SHA512 3dc5d6496f9668319afd584c612f9a103230168cbea8b7456b5911c753e333b24a4733a451a2dc6009dbfbf8601c77148bb7553f25bebc615c82878384970fe4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch b/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch
deleted file mode 100644
index ae87b047507f..000000000000
--- a/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 90ebe8e37b8699ef26c10fb2928cf673cad04a06 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Wed, 18 Sep 2019 06:41:34 +0200
-Subject: Make it compiles without deprecated method
-
----
- klineal.cpp | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/klineal.cpp b/klineal.cpp
-index 8b5d3c3..0f9bc48 100644
---- a/klineal.cpp
-+++ b/klineal.cpp
-@@ -705,7 +705,7 @@ void KLineal::mouseReleaseEvent( QMouseEvent *inEvent )
- 
- void KLineal::wheelEvent( QWheelEvent *e )
- {
--  int numDegrees = e->delta() / 8;
-+  int numDegrees = e->angleDelta().y() / 8;
-   int numSteps = numDegrees / 15;
- 
-   // changing offset
-@@ -756,8 +756,7 @@ void KLineal::drawScale( QPainter &painter )
-       }
- 
-       if ( digit % 100 == 0 && digit != 0 ) {
--        QString units;
--        units.sprintf( "%d", digit );
-+        QString units = QStringLiteral("%1").arg(digit);
-         drawScaleText( painter, x, units );
-       }
- 
-@@ -771,9 +770,8 @@ void KLineal::drawScale( QPainter &painter )
-       int x = (int)( i * step );
- 
-       if ( i % 10 == 0 && i != 0 && i != 100 ) {
--        QString units;
-         int value = mLeftToRight ? i : ( 100 - i );
--        units.sprintf( "%d%%", value );
-+        const QString units = QString::asprintf( "%d%%", value );
-         drawScaleText( painter, x, units );
-         len = MEDIUM2_TICK_SIZE;
-       } else {
--- 
-cgit v1.1
diff --git a/kde-apps/kruler/kruler-19.08.3.ebuild b/kde-apps/kruler/kruler-19.08.3.ebuild
deleted file mode 100644
index e5ba0376468b..000000000000
--- a/kde-apps/kruler/kruler-19.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://kde.org/applications/graphics/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kruler/kruler-19.12.2.ebuild b/kde-apps/kruler/kruler-19.12.3.ebuild
index a21fc46016bc..0b14240d7d9a 100644
--- a/kde-apps/kruler/kruler-19.12.2.ebuild
+++ b/kde-apps/kruler/kruler-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/graphics/org.kde.kruler"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="