gentoo resync : 14.04.2018

7 files changed, 28 insertions, 78 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index e9fed42200ee..409edd6f32f5 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 2d18c3fbab99..7a7591755d1f 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,5 +1,6 @@
+AUX kdeconnect-1.3.0-no-wayland.patch 523 BLAKE2B c29b58a3f1f97f09c67270f6b55f8122ccca834b979717bc1c5ad279675106acaa23da1d4a4a08dcc4194b6837cb5fce23ecfd12d5d8d1ed4adb8b4fdd077eae SHA512 68527f15ec3f0af14e33e857567c2fcc622f5dd5fc0652dc0af95e91dc5b96929df9db4961d9aa528be73b87e021877d7f6ee5894a2a195446a7235ca979b664
 DIST kdeconnect-kde-1.3.0.tar.xz 281972 BLAKE2B 62e8b59bc661be7a17ef4e160411dff2150ea8639f69388f32453d3b0066ebc7333987b7df31241eac7d95b994f91347432226ef7f5d7bb864b87108fb974544 SHA512 837f6129393fc1e6d68c1c0cc7eea244bc1702fa4beb9bfc764d001077a890ff7c9a954de738ccabb3369f1a9a08325300514eecdbced939ad8e8b360a4b2045
 DIST kdeconnect-kde-v1.2.1.tar.xz 278612 BLAKE2B a0803f34232eca16baf2c00ea96ccc33be8c631b40041aa6cfffab933ba984ff95639ae3103bd6499583ac6ba0c8e70f50bd6db30ff3d50f93a5d9e232dec303 SHA512 d336350ce1698d1fc2aa2ee02a4fec9c7ce5eedbf346ec40d502f7b5c1c555a370f09a65d88d70ece09c4a7bcf240921df31f803215afce657c9b4cb113baa58
 EBUILD kdeconnect-1.2.1-r2.ebuild 2076 BLAKE2B 8f40f9ffb412de628ec3e5c5dc44d544cc671ee47d76b4c22161d3379b66cae93ed4512a76f94d79eaee9fb028f22541fd2bfa3cae0299094a96c2209846ea26 SHA512 ed0da87b29207690d11064329db26c70c28d2c168ae7d990574c582290ec3d533c3dc63ea83b10632370075c13bb7410ae3bbbdd0feac14a89fcb8c2e33211e8
-EBUILD kdeconnect-1.3.0.ebuild 2208 BLAKE2B 022723292ea69b41e27b0738d53e03422a714aeffd60bec9f773ac0ae7b27ffba2a869045fc03e7c3076cdc843c508f9dfa86953a78f7a385f07dd9034749e78 SHA512 ae6532cc87d26be8a7da6e658b440a39d55d7007db93fc77743b4015ff7dcb23ff2fed939fc6ca4f29cc7bb7c0a1b6922089519ac7003a0dffa59ac24f5494d1
+EBUILD kdeconnect-1.3.0.ebuild 2262 BLAKE2B c6c133440a6d494527081953ffef551056fc3e6397b81603a976ccddc5c7708824b459a632d3baf427121be9c6db4febb6b30e86d00494d872b5c944a16de202 SHA512 4221146811e1b3fd4437682f8990e7fa6d2171f0a49f5566582bad54e713f894d28dcdea03d379b8ff15f997eb10c4f2a3e23a86fc558b989d46392dbb213dc1
 MISC metadata.xml 529 BLAKE2B faa10c113f9c92d2746d1efe9d9919d12115470bc798166bf0e203e11a73c5681513a8c067ba60e60e7858cad73a75d54dbcb137fac49359830d0942325fedd0 SHA512 d3f183d3859863916240e7f240393e05fa55d33b5b569de67de7addcde620e43e754ae7a3279c387a093abba57eaf7c375ff6440175abfa301a2f348e2ff2d85
diff --git a/kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch b/kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch
new file mode 100644
index 000000000000..a46c284a017d
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
+index ab9913ff..bfd52cd7 100644
+--- a/plugins/mousepad/CMakeLists.txt
++++ b/plugins/mousepad/CMakeLists.txt
+@@ -10,7 +10,7 @@ if (LibFakeKey_FOUND)
+     find_package(X11 REQUIRED)
+     find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
+ endif()
+-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Wayland)
++find_package(KF5Wayland ${KF5_MIN_VERSION} QUIET)
+ 
+ set(HAVE_X11 ${LibFakeKey_FOUND})
+ set(HAVE_WAYLAND ${KF5Wayland_FOUND})
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
index 824a32a6085e..b826ef6e3ba1 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 FRAMEWORKS_MINIMAL="5.42.0"
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 KMNAME="${PN}-kde"
 KDE_SELINUX_MODULE="${PN}"
@@ -55,12 +55,14 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-no-wayland.patch" )
+
 src_prepare() {
+	kde5_src_prepare
+
 	sed \
 		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
 		-i daemon/kdeconnectd.desktop.cmake || die
-
-	kde5_src_prepare
 }
 
 src_configure() {
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index d938b1b100cd..e9c713601d3b 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,5 +1,3 @@
-DIST latte-dock-0.7.3.tar.xz 896272 BLAKE2B 1ee8e4a6406c6fa9cfc3db41f5362fd749a2d743974e878a5baa00a837f731235e4e6b2a0ee39e814c091412fbbcaa6213331a74b8884f63998d7e26543a5eb2 SHA512 a955a304d83dc90723ff4c501816a799866a300bed17adc0f44354d30039c270bfbb3d2d70e316c88dd86527aff9fb5b07dab00e16c222e601f88c2937935589
 DIST latte-dock-0.7.4.tar.xz 539512 BLAKE2B ea94d9c0cffb625a8f91eea75e4e89b90594814b8bea3fb0b5eef3ffc971869afcea1cd7b04ec764898c0b1fdea5b243518b40ca0e9b5ff705b6b333bdc0e180 SHA512 d4c1fa35b0cf463db1a37234f2721ff3dd45dfd720a56f12663b535efa9a005555fe6d2cbefb288d148049633758a9451b64ce823779339cab9f94682225a36e
-EBUILD latte-dock-0.7.3.ebuild 1533 BLAKE2B 9467d386051e61a0bae3eaa79d35d7c1b80daffed55fa9d0d8d3995852dd99a43b400f829cd876e04fec87373fabf4ebb4bfb4535a8a1d0c864e5b3c50389014 SHA512 f3d39486e27ad9d067cd475b3a8c940fe6b2649f971d64c7d633d5675720eec05e0ab2eadcf8cf02998d46b9b85524d99331a3530ffa939417001f23719acbe4
-EBUILD latte-dock-0.7.4.ebuild 1316 BLAKE2B 629d08e2ee3db38e36753161213c70636b59533d222de0c2f58c72c85b93f394f653e9977d8665894971b66a115d3c9f2d4f414bf05ca40ad5b59bd3c82d0ea2 SHA512 eb704dcecd0a2637595454c0e63a8d272052d8b9da520df0e09176fd56a8e0a1d13f7a121cd8a74ebb529c64c814024ff5739cb657a1350ca4a4b13906114794
+EBUILD latte-dock-0.7.4.ebuild 1283 BLAKE2B 3230c305e7cffd3ff9048fa38e6a1a5903948d7988046ec5dca8572f37565b6836c70ef1090f9fea5ed30c5306c68907428a5e02ced93d0c2211c4ae7d4d5952 SHA512 39f2c9210c00b78209f4ba06f9a112772054ff7750a564f080d6f441037b4b2a3df9e871d48a872f65446161d57492bdb900ea43d7c1a4b0c649694c993a79f1
 MISC metadata.xml 453 BLAKE2B a49e759f4ce30c2730a4bf082b8f953e0e93f95f2de3b567798d4bea8229558ed72cd774c5d9b1356bd066dc92400d17f05d830746d87386c8c2921fcc484c80 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35
diff --git a/kde-misc/latte-dock/latte-dock-0.7.3.ebuild b/kde-misc/latte-dock/latte-dock-0.7.3.ebuild
deleted file mode 100644
index 99117ea14477..000000000000
--- a/kde-misc/latte-dock/latte-dock-0.7.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-if [[ ${PV} = 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
-else
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma X)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui 'xcb')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-DOCS=( CHANGELOG.md README.md TRANSLATORS )
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/kde-misc/latte-dock/latte-dock-0.7.4.ebuild b/kde-misc/latte-dock/latte-dock-0.7.4.ebuild
index 3ff104b30ed5..ebb6629a3a16 100644
--- a/kde-misc/latte-dock/latte-dock-0.7.4.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.7.4.ebuild
@@ -5,17 +5,20 @@ EAPI=6
 
 inherit kde5
 
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 DESCRIPTION="Elegant dock, based on KDE Frameworks"
 HOMEPAGE="https://store.kde.org/p/1169519/
 	https://github.com/psifidotos/Latte-Dock"
-[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
@@ -43,8 +46,6 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libxcb
 "
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
+RDEPEND="${DEPEND}"
 
 DOCS=( CHANGELOG.md README.md TRANSLATORS )