[gentoo-commits] repo/gentoo:master commit in: kde-misc/latte-dock/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     f319eb6b16953dd4de002c8c05b317e23d20ecdf
Author:     Petross404 <petross404 <AT> gmail <DOT> com>
AuthorDate: Mon Aug 28 10:05:37 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 18:19:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f319eb6b

kde-misc/latte-dock: 0.7.0 version bump, fix DEPENDs

Fixes broken .desktop file.
Proxy-maint-comment: Simplified sed and git summary.
Closes: https://github.com/gentoo/gentoo/pull/5547

 kde-misc/latte-dock/Manifest                            |  1 +
 .../{latte-dock-9999.ebuild => latte-dock-0.7.0.ebuild} | 17 +++++++++--------
 kde-misc/latte-dock/latte-dock-9999.ebuild              | 11 +++--------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 5ca5a1a3c36..1417645a61d 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1 +1,2 @@
 DIST latte-dock-0.6.2.tar.gz 387854 SHA256 3de5826473f467e2f92fda5296dc1cb4f73aa7cf11c32f5a43d5886b899332b3 SHA512 06bafebddceb57e02c7af806e535b80ef8ce847c9ab4107c77b45815925fccf4e524099218189343da56d9205d89d455f8d8ba5bb2f1ff512fe2cce48946eda0 WHIRLPOOL 829ea1554fe5935e8f8a83bc0efe24ac9e886eef1e072d7f579920636d7ff01deca194e108c8889eeff57c013480f63c7eb6b4ac32a426e11c52e27945a45da6
+DIST latte-dock-0.7.0.tar.gz 1786148 SHA256 01f69619ac6c51ab864526bfc10790308c6d5bf1c80d94f8affba4989d1b7f7d SHA512 ad6afcfd6e1fc7760681ac3819f6fc20613e4d4cfea65f34fdfe702d8bca8ca4993b386e9fcb31ffeaf36889da585bc00d88ee2dd7789884ddf74f96fbf9f145 WHIRLPOOL c78e048464b71fc5b64a34036c577cb6e18953dcd5d917498261e6f5b6d9558bcf9233936ab97fbf0fcb571022cb3ad4002b3863a18e9da2ed7717cde7e100c2

diff --git a/kde-misc/latte-dock/latte-dock-9999.ebuild b/kde-misc/latte-dock/latte-dock-0.7.0.ebuild
similarity index 82%
copy from kde-misc/latte-dock/latte-dock-9999.ebuild
copy to kde-misc/latte-dock/latte-dock-0.7.0.ebuild
index fa43edd7c09..62a40a38ea7 100644
--- a/kde-misc/latte-dock/latte-dock-9999.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.7.0.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=6
 
-KDE_GCC_MINIMAL="4.9"
 QT_MINIMAL="5.7.1"
 inherit cmake-utils gnome2-utils kde5-functions
 
 DESCRIPTION="Elegant dock, based on KDE Frameworks"
 HOMEPAGE="https://store.kde.org/p/1169519/
-https://github.com/psifidotos/Latte-Dock"
+	https://github.com/psifidotos/Latte-Dock"
 
 if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
@@ -29,6 +28,7 @@ RDEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep kglobalaccel)
@@ -47,6 +47,7 @@ RDEPEND="
 	$(add_qt_dep qtgui 'xcb')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
+	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libxcb
 "
@@ -56,18 +57,18 @@ DEPEND="${RDEPEND}
 
 DOCS=( CHANGELOG.md README.md TRANSLATORS )
 
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i -e "s/^Version/X-KDE-PluginInfo-Version/g" \
+		app/org.kde.latte-dock.desktop.cmake || die
+}
+
 pkg_preinst() {
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-
-	if has_version ">=dev-qt/qtcore-5.8.0" ; then
-		ewarn "Qt versions >=5.8 are known to cause runtime problems. If you"
-		ewarn "experience problems while running Latte Dock, please check this"
-		ewarn "out: https://github.com/psifidotos/Latte-Dock/issues/183"
-	fi
 }
 
 pkg_postrm() {

diff --git a/kde-misc/latte-dock/latte-dock-9999.ebuild b/kde-misc/latte-dock/latte-dock-9999.ebuild
index fa43edd7c09..5dcfa44e5bc 100644
--- a/kde-misc/latte-dock/latte-dock-9999.ebuild
+++ b/kde-misc/latte-dock/latte-dock-9999.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=6
 
-KDE_GCC_MINIMAL="4.9"
 QT_MINIMAL="5.7.1"
 inherit cmake-utils gnome2-utils kde5-functions
 
 DESCRIPTION="Elegant dock, based on KDE Frameworks"
 HOMEPAGE="https://store.kde.org/p/1169519/
-https://github.com/psifidotos/Latte-Dock"
+	https://github.com/psifidotos/Latte-Dock"
 
 if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
@@ -29,6 +28,7 @@ RDEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep kglobalaccel)
@@ -47,6 +47,7 @@ RDEPEND="
 	$(add_qt_dep qtgui 'xcb')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
+	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libxcb
 "
@@ -62,12 +63,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-
-	if has_version ">=dev-qt/qtcore-5.8.0" ; then
-		ewarn "Qt versions >=5.8 are known to cause runtime problems. If you"
-		ewarn "experience problems while running Latte Dock, please check this"
-		ewarn "out: https://github.com/psifidotos/Latte-Dock/issues/183"
-	fi
 }
 
 pkg_postrm() {