gentoo resync : 19.03.2019

4 files changed, 370 insertions, 34 deletions

diff --git a/kde-misc/playbar2/Manifest b/kde-misc/playbar2/Manifest
index 405d8277e955..bbae46c07f28 100644
--- a/kde-misc/playbar2/Manifest
+++ b/kde-misc/playbar2/Manifest
@@ -1,3 +1,4 @@
+AUX playbar2-2.5-raise_qtquick_to_2_7.patch 12001 BLAKE2B f3188cb6270ecf46da35b641df3f01041178bfb000598bc52247c8b2fa00136f8f800838fe4ec76218b0353b14761f5d8aebf49a3ff979c5e6c3bc570156e7b3 SHA512 85dbcb60f6d705f8eef0a0d1bf48b3d55911f60fc38a0bf61ae2127011a067c853c756b79fc2e89ee798abbec307998bba023a6fac0b0aa27d5eb37a7f9cf5e9
 DIST playbar2-2.5.tar.gz 397576 BLAKE2B 3b14289bb7aa1e89d0de14732c7490cd552d4ca1e6f5311cbf274dd31f64b738e1586c3d7eec864c5c6ca94dacefd264a2b12e0843cb28557a1b8524c3aa4ea8 SHA512 964a29a07d7fab8f02d71224684e572e4fbadbd57fdc74ee6b59477b415306c39b60ec7be392711cfac8ab0325a72e7cee485e9c3af2949f439dbeb3a247605b
-EBUILD playbar2-2.5.ebuild 934 BLAKE2B 77869362ba78d3b328078318f691cc5c7446b3d842d39b0aea45c302880f809f2cd1abb2d8a0d768052f43a348d79dbd317626427786bc20e13eb919438aa11a SHA512 deca68615af9d7ede583ff8ebd841d5671f3cd7bd6e1020796a67845f5187a204795602f007ae52035872a2461a340ce1103d3e36592cc7d9dfcc3e3fcb47ff4
+EBUILD playbar2-2.5-r1.ebuild 904 BLAKE2B b9b5e1b9cedcb227b5b475fa2ae1ea55f23fb6b1da2b86551745765d20906c4cea2c3c4b972335148738ad798d008dc6a2b63a3c99820239d48fc11195d5b911 SHA512 fee4f4468324f46d6db65e155775b2ed6d19785a62f8c879d801a062e1234ae25d861498f5267c347441dfab54f253b2e20b95388e414b10a1da193a0850feb5
 MISC metadata.xml 457 BLAKE2B 7da06d96db2c6414f29454c8eb17a4a272f461cc42edb1764c33960fe841d53a8ef029e9867914765514db67977b529c26d2fd0196d6642fe6d26b08807e66b4 SHA512 82c0ae3f064b101a2da7513c70cd0aecf52310b3be4754b4de70c06afdf31c2575c1a81934f58a297e55858e12986f769e65515786e5ddd5438dd3611a028fbb
diff --git a/kde-misc/playbar2/files/playbar2-2.5-raise_qtquick_to_2_7.patch b/kde-misc/playbar2/files/playbar2-2.5-raise_qtquick_to_2_7.patch
new file mode 100644
index 000000000000..3c9d3f3ce56c
--- /dev/null
+++ b/kde-misc/playbar2/files/playbar2-2.5-raise_qtquick_to_2_7.patch
@@ -0,0 +1,333 @@
+From 666d468c106df1f6200d9dae4103e281e20c654d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Till=20Sch=C3=A4fer?= <till2.schaefer@tu-dortmund.de>
+Date: Wed, 6 Mar 2019 15:50:05 +0100
+Subject: [PATCH] raise QtQuick 2.4 imports to 2.7
+
+---
+ plasmoid/contents/ui/AutoscrollText.qml  | 2 +-
+ plasmoid/contents/ui/CompactApplet.qml   | 2 +-
+ plasmoid/contents/ui/CoverArt.qml        | 2 +-
+ plasmoid/contents/ui/DefaultLayout.qml   | 2 +-
+ plasmoid/contents/ui/FullApplet.qml      | 2 +-
+ plasmoid/contents/ui/IconWidget.qml      | 2 +-
+ plasmoid/contents/ui/MediaPlayerArea.qml | 2 +-
+ plasmoid/contents/ui/Mpris2.qml          | 2 +-
+ plasmoid/contents/ui/PlaybackBar.qml     | 2 +-
+ plasmoid/contents/ui/PlaybackItem.qml    | 2 +-
+ plasmoid/contents/ui/PlaybackWidget.qml  | 2 +-
+ plasmoid/contents/ui/PopupButton.qml     | 2 +-
+ plasmoid/contents/ui/SeekBar.qml         | 2 +-
+ plasmoid/contents/ui/SliderSeek.qml      | 2 +-
+ plasmoid/contents/ui/SliderVolume.qml    | 2 +-
+ plasmoid/contents/ui/SystrayLayout.qml   | 2 +-
+ plasmoid/contents/ui/TimeLabel.qml       | 2 +-
+ plasmoid/contents/ui/TitleBar.qml        | 2 +-
+ plasmoid/contents/ui/TrackInfo.qml       | 2 +-
+ plasmoid/contents/ui/VerticalLayout.qml  | 2 +-
+ plasmoid/contents/ui/VolumeIcon.qml      | 2 +-
+ plasmoid/contents/ui/VolumeLabel.qml     | 2 +-
+ plasmoid/contents/ui/main.qml            | 2 +-
+ 23 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/plasmoid/contents/ui/AutoscrollText.qml b/plasmoid/contents/ui/AutoscrollText.qml
+index 20ec8bf..72ff297 100644
+--- a/plasmoid/contents/ui/AutoscrollText.qml
++++ b/plasmoid/contents/ui/AutoscrollText.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ 
+ Item {
+     id: scroll
+diff --git a/plasmoid/contents/ui/CompactApplet.qml b/plasmoid/contents/ui/CompactApplet.qml
+index a53939f..d01ad23 100644
+--- a/plasmoid/contents/ui/CompactApplet.qml
++++ b/plasmoid/contents/ui/CompactApplet.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ 
+ Flow {
+diff --git a/plasmoid/contents/ui/CoverArt.qml b/plasmoid/contents/ui/CoverArt.qml
+index 2d6d0d6..65006ad 100644
+--- a/plasmoid/contents/ui/CoverArt.qml
++++ b/plasmoid/contents/ui/CoverArt.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import QtGraphicalEffects 1.0
+diff --git a/plasmoid/contents/ui/DefaultLayout.qml b/plasmoid/contents/ui/DefaultLayout.qml
+index 6bcbc0d..ac7a4ac 100644
+--- a/plasmoid/contents/ui/DefaultLayout.qml
++++ b/plasmoid/contents/ui/DefaultLayout.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import QtGraphicalEffects 1.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+diff --git a/plasmoid/contents/ui/FullApplet.qml b/plasmoid/contents/ui/FullApplet.qml
+index 9b78c2e..55d2792 100644
+--- a/plasmoid/contents/ui/FullApplet.qml
++++ b/plasmoid/contents/ui/FullApplet.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+diff --git a/plasmoid/contents/ui/IconWidget.qml b/plasmoid/contents/ui/IconWidget.qml
+index 4355814..d59df17 100644
+--- a/plasmoid/contents/ui/IconWidget.qml
++++ b/plasmoid/contents/ui/IconWidget.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ 
+diff --git a/plasmoid/contents/ui/MediaPlayerArea.qml b/plasmoid/contents/ui/MediaPlayerArea.qml
+index e017634..1740ae1 100644
+--- a/plasmoid/contents/ui/MediaPlayerArea.qml
++++ b/plasmoid/contents/ui/MediaPlayerArea.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ 
+ MouseArea {
+     id: volumeWheelArea
+diff --git a/plasmoid/contents/ui/Mpris2.qml b/plasmoid/contents/ui/Mpris2.qml
+index b563191..9eba2f4 100644
+--- a/plasmoid/contents/ui/Mpris2.qml
++++ b/plasmoid/contents/ui/Mpris2.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import "../code/utils.js" as Utils
+ 
+diff --git a/plasmoid/contents/ui/PlaybackBar.qml b/plasmoid/contents/ui/PlaybackBar.qml
+index 5beb8c8..7bf27cb 100644
+--- a/plasmoid/contents/ui/PlaybackBar.qml
++++ b/plasmoid/contents/ui/PlaybackBar.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+ 
+diff --git a/plasmoid/contents/ui/PlaybackItem.qml b/plasmoid/contents/ui/PlaybackItem.qml
+index 751dd19..1470d94 100644
+--- a/plasmoid/contents/ui/PlaybackItem.qml
++++ b/plasmoid/contents/ui/PlaybackItem.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ 
+ Item {
+     id: playbackitem
+diff --git a/plasmoid/contents/ui/PlaybackWidget.qml b/plasmoid/contents/ui/PlaybackWidget.qml
+index 434e105..fc69af5 100644
+--- a/plasmoid/contents/ui/PlaybackWidget.qml
++++ b/plasmoid/contents/ui/PlaybackWidget.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+diff --git a/plasmoid/contents/ui/PopupButton.qml b/plasmoid/contents/ui/PopupButton.qml
+index 1b77cc1..8daf82a 100644
+--- a/plasmoid/contents/ui/PopupButton.qml
++++ b/plasmoid/contents/ui/PopupButton.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ 
+ IconWidget {
+diff --git a/plasmoid/contents/ui/SeekBar.qml b/plasmoid/contents/ui/SeekBar.qml
+index a12d3e7..50c1253 100644
+--- a/plasmoid/contents/ui/SeekBar.qml
++++ b/plasmoid/contents/ui/SeekBar.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.plasma.plasmoid 2.0
+diff --git a/plasmoid/contents/ui/SliderSeek.qml b/plasmoid/contents/ui/SliderSeek.qml
+index c39fd5b..7bc974a 100644
+--- a/plasmoid/contents/ui/SliderSeek.qml
++++ b/plasmoid/contents/ui/SliderSeek.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+ 
+diff --git a/plasmoid/contents/ui/SliderVolume.qml b/plasmoid/contents/ui/SliderVolume.qml
+index d5081db..d6ba1e4 100644
+--- a/plasmoid/contents/ui/SliderVolume.qml
++++ b/plasmoid/contents/ui/SliderVolume.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+ 
+diff --git a/plasmoid/contents/ui/SystrayLayout.qml b/plasmoid/contents/ui/SystrayLayout.qml
+index 984b39b..cf0607f 100644
+--- a/plasmoid/contents/ui/SystrayLayout.qml
++++ b/plasmoid/contents/ui/SystrayLayout.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import QtGraphicalEffects 1.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+diff --git a/plasmoid/contents/ui/TimeLabel.qml b/plasmoid/contents/ui/TimeLabel.qml
+index 02104f3..8e55404 100644
+--- a/plasmoid/contents/ui/TimeLabel.qml
++++ b/plasmoid/contents/ui/TimeLabel.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import "../code/utils.js" as Utils
+ 
+diff --git a/plasmoid/contents/ui/TitleBar.qml b/plasmoid/contents/ui/TitleBar.qml
+index 86e2b53..f747fba 100644
+--- a/plasmoid/contents/ui/TitleBar.qml
++++ b/plasmoid/contents/ui/TitleBar.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+diff --git a/plasmoid/contents/ui/TrackInfo.qml b/plasmoid/contents/ui/TrackInfo.qml
+index 2744564..10294c2 100644
+--- a/plasmoid/contents/ui/TrackInfo.qml
++++ b/plasmoid/contents/ui/TrackInfo.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import "../code/utils.js" as Utils
+diff --git a/plasmoid/contents/ui/VerticalLayout.qml b/plasmoid/contents/ui/VerticalLayout.qml
+index 7fd0416..c38b32b 100644
+--- a/plasmoid/contents/ui/VerticalLayout.qml
++++ b/plasmoid/contents/ui/VerticalLayout.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import QtGraphicalEffects 1.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+diff --git a/plasmoid/contents/ui/VolumeIcon.qml b/plasmoid/contents/ui/VolumeIcon.qml
+index a87fabc..0cba10d 100644
+--- a/plasmoid/contents/ui/VolumeIcon.qml
++++ b/plasmoid/contents/ui/VolumeIcon.qml
+@@ -17,7 +17,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ 
+ IconWidget {
+diff --git a/plasmoid/contents/ui/VolumeLabel.qml b/plasmoid/contents/ui/VolumeLabel.qml
+index 54efd00..498f55b 100644
+--- a/plasmoid/contents/ui/VolumeLabel.qml
++++ b/plasmoid/contents/ui/VolumeLabel.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import "../code/utils.js" as Utils
+ 
+diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
+index 7ae1e0b..3a007fc 100644
+--- a/plasmoid/contents/ui/main.qml
++++ b/plasmoid/contents/ui/main.qml
+@@ -16,7 +16,7 @@
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+-import QtQuick 2.4
++import QtQuick 2.7
+ import QtQuick.Layouts 1.2
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.plasmoid 2.0
+-- 
+2.19.2
+
diff --git a/kde-misc/playbar2/playbar2-2.5-r1.ebuild b/kde-misc/playbar2/playbar2-2.5-r1.ebuild
new file mode 100644
index 000000000000..889812d1ec0e
--- /dev/null
+++ b/kde-misc/playbar2/playbar2-2.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="MPRIS2 client, written in QML for Plasma 5"
+HOMEPAGE="https://github.com/audoban/PlayBar2"
+SRC_URI="https://github.com/audoban/PlayBar2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="kde-frameworks/extra-cmake-modules:5
+	kde-frameworks/kdoctools:5"
+DEPEND="kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kglobalaccel:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kwindowsystem:5
+	kde-frameworks/kxmlgui:5
+	kde-frameworks/plasma:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-raise_qtquick_to_2_7.patch" )
diff --git a/kde-misc/playbar2/playbar2-2.5.ebuild b/kde-misc/playbar2/playbar2-2.5.ebuild
deleted file mode 100644
index 5b2b272acd93..000000000000
--- a/kde-misc/playbar2/playbar2-2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kde5-functions
-
-DESCRIPTION="MPRIS2 client, written in QML for Plasma 5"
-HOMEPAGE="https://github.com/audoban/PlayBar2"
-SRC_URI="https://github.com/audoban/PlayBar2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtwidgets)"
-RDEPEND="${DEPEND}"