gentoo resync : 20.10.2017

7 files changed, 24 insertions, 156 deletions

diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 4cbd32fcc917..a5059b551f91 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,6 +1,7 @@
+AUX kio-gdrive-1.2.1-doctools.patch 317 SHA256 c9faa7bc903f26e7bd66ae49ab74921b6ecea1fc0030e6fdf35515a1fd128aeb SHA512 467e52dc07cf1726f1bd1231210cee145edd79de560814e9cc9514c1f4c13e369f062de0f8ba4eb961aec0878a96ce37e1555c5c968e70cf8bcbb014b13d1431 WHIRLPOOL c22006a46c28637d0e59b270adf311e6f9b1938a13d3ea49b32c9aa2366ec405a812d35f0da69fe29a7728c41a99917fa1383b0530efd8868e277ae4e383abe8
 DIST kio-gdrive-1.2.0.1.tar.xz 34356 SHA256 7abe7352ae87e16580c6274502c7475d00d852bad96052aec5a3ce09f70a8009 SHA512 8f3cff889ff91c7775733f067ba45097d89e2f98a5ba1202d2fd55645973ffcf03f18002ce73fb5221706d51551af3d44ee2c41229f5c272ccf6913fcdb78c47 WHIRLPOOL b8d5c135123b2d94e0233ed3acf5131c97b3937b5897aadbadb9259b457449d48ed282be09f5d4029f328e1664a98f30b038837daf56dbba2a51f31eda31fcff
 DIST kio-gdrive-1.2.1.tar.xz 33820 SHA256 d0c778538dc20412a944ccbd48fd99dc5f531e4df914bf8cbdf813371e857ca3 SHA512 021612192adc4173d936ee5f16d959db6c2d74aadae0d6dcb25aa1b8f1cd06f650e870d62eb72c9efbd9b581b06a949fcd78f494ec63eaac9ad67b16a0f0ab79 WHIRLPOOL 921771881c3a36f163b9d4f8333fc9ddcfb6c7944769d3f3b36b154f7a1a7684efb25694c04a74d7d1a22e9f2d121c12fc5b6627a51f120c9f0db5da4cbc06d0
 EBUILD kio-gdrive-1.2.0.1.ebuild 976 SHA256 34caedff558eabb949c322ff41152516cb48195d0321964c59c74ccffe077ed9 SHA512 f3e0cfa516f0531eab6bc4ad9ad95dc4605998f950b3db0342eb5ed6f60d0f289a33aaa2146ddf58bbb786812670bab196793b9c45a058bac12e33753fb96b60 WHIRLPOOL ff97df4114f793cc4df7b96d2b3f40bcd62dff265b8b00fa608ab664473c12ed34b87164ab447a8f9a867efbf1c563035cf9489979b0544682c1c9aaab417c75
-EBUILD kio-gdrive-1.2.1.ebuild 978 SHA256 23d7b63a8ec4fd3b67d8cf938103a249113e8615dbd28a7e366c1ac171390a48 SHA512 71f44c2a4d46bced1db936b6879596e949ba74ca240acde5b02ad149641ef0d656b111f3dd48f8a0fb103931201d43485f89e642dfd44ddab8e6f28023194ac0 WHIRLPOOL 57352637d77c10c968480b963e7fd48d789b0374c1346c1ffa36bafed7743f68c40f8102b4cc0dbdf80b547e4103cafd0ab9c3d177f29a7f0f14557f7bc84e6c
+EBUILD kio-gdrive-1.2.1-r1.ebuild 1102 SHA256 100e3cf1e61d1b3640911382db2a892143bc5b0ac58855c66b8b1ca0cb808542 SHA512 d8584e5862408e0ef802000c7f897ba9eceaf0798aab5e67ab19a0f960925188e6c8584fbbf6c69b22e2c3dceaa4dde4e870961371e3723e28065b60828139f1 WHIRLPOOL 6bc4cb0151ebf960d2ece4c9be4d6e4ddb2c775b88d810e6ca85323b7d2c6d17fe4b835b417f9fe48a8bb8955cf5aaa221821ab547690a8fbe525bc7b49c6a87
 MISC ChangeLog 684 SHA256 a50610f0d6d3d81225a74a7600c79d51fa75b78354c30f28b4caa48906ddfb1f SHA512 f68b8e3310f5ddbc6f883692ca4a351b3f0cb430f894da8d2736766588d118855e574a8c0148a73d03fed28ef4f62838fd9be4777f3d3be7e2f697664ed2515d WHIRLPOOL e3eded08ed9c31b5ce3e89b3c8606707c58cde7c03387192e2445bdc5067e2a029103d072918fae41c4fb07a40f3c57b99cd9062416d3fb2803b2058793f201a
 MISC metadata.xml 402 SHA256 244fb7e710486f27ea9b74706eb528dff8aa621720f64afe259a2748d4748e54 SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21 WHIRLPOOL 3f1c15aa2815fcd1c7403f1609677a00999107cbb6bead3fec26d9d7cee744ecbcb4ac552e857cef2ef2f40edaa221bc6a7b37551c2bc9bf161af58140b8c6e7
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch
new file mode 100644
index 000000000000..7ddcf1428b52
--- /dev/null
+++ b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2017-09-30 17:29:04.000000000 +0200
++++ b/CMakeLists.txt	2017-10-19 20:51:03.198871146 +0200
+@@ -80,5 +80,6 @@
+ find_package(KF5I18n CONFIG REQUIRED)
+ ki18n_install(po)
+ 
+-find_package(KF5DocTools CONFIG REQUIRED)
+-kdoctools_install(po)
++if(KF5DocTools_FOUND)
++    kdoctools_install(po)
++endif()
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild
index 18c73a7a5a0e..8f56003417b6 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-KDE_APPS_MINIMAL="17.04.0"
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="optional"
 inherit kde5
 
@@ -18,7 +17,7 @@ fi
 
 IUSE="+kaccounts"
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
@@ -28,14 +27,19 @@ RDEPEND="
 	kaccounts? ( $(add_kdeapps_dep kaccounts-integration) )
 	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	dev-util/intltool
 "
+RDEPEND="${COMMON_DEPEND}
+	kaccounts? ( $(add_kdeapps_dep kaccounts-providers) )
+"
 
 DOCS=( README.md )
 
+PATCHES=( "${FILESDIR}/${P}-doctools.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kaccounts KAccounts)
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 58a699103555..25965a0fe463 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,6 +1,3 @@
-DIST latte-dock-0.6.2.tar.gz 387854 SHA256 3de5826473f467e2f92fda5296dc1cb4f73aa7cf11c32f5a43d5886b899332b3 SHA512 06bafebddceb57e02c7af806e535b80ef8ce847c9ab4107c77b45815925fccf4e524099218189343da56d9205d89d455f8d8ba5bb2f1ff512fe2cce48946eda0 WHIRLPOOL 829ea1554fe5935e8f8a83bc0efe24ac9e886eef1e072d7f579920636d7ff01deca194e108c8889eeff57c013480f63c7eb6b4ac32a426e11c52e27945a45da6
 DIST latte-dock-0.7.1.tar.gz 1788443 SHA256 b57a5495370fea6ae61f8045590d958c477efbe454690ea52d992d8ec76b80ea SHA512 8bf0acbb913bab7bfa0f9d75ab121dce6c6f86cc5f8f79ea0279f226a9cde4a1f67589c82a78336deeb140008687a3fce252ea5f85d69d3636b75e18180cae00 WHIRLPOOL e8a78f14a0ef431b6afdf48b9b548cf0e983dbe1f4d8b4b69cc6b8788cacc8340a09d4b059f24997b48c972130c85794bf96e1ca49e82e5abafb15003a69a6e5
-EBUILD latte-dock-0.6.2.ebuild 1853 SHA256 a2ab7d6e41df2e2db0a0592b6eb5fff8b3a3ac9d95876717bc677044e567ca4c SHA512 60e7ce85a7d7a9a73016a113d376492c20ccb3bfd31aafc7d26779a72cf7981e40b3cf045a7ff556fba42fd22c82a6f68445cef5ec26e65241823ea2d2fb953e WHIRLPOOL 86d0201af60e09ce0433ed7cedb643b8d701404b5bd5abd25312293a63f9777947e7c3c47cd0283a9ade5d4e22bffb9ba9778bf671ecea57a7404cebd0429836
 EBUILD latte-dock-0.7.1.ebuild 1644 SHA256 e027192ac8673ab92a91a7c06548ba9fc1b5efac8a3a72cde0ca1f75a9ca8c32 SHA512 0b4a3da3cd5a9f9cae6db58ab7887f84e56af452a71ecd392589b39127d88b5031d2f330b3aa893320868f9b251af870a3fe4194ed16558d3705e98faf047c42 WHIRLPOOL 306b3e4eb28d19374c5ab8c11da80bf3b84531af2cb85970b6e7a144e22055b674181ebfbf2970e7c79f1b27de9c3ba7a15082fac12a0ddba3342ca14e28d5c5
-EBUILD latte-dock-9999.ebuild 1644 SHA256 e027192ac8673ab92a91a7c06548ba9fc1b5efac8a3a72cde0ca1f75a9ca8c32 SHA512 0b4a3da3cd5a9f9cae6db58ab7887f84e56af452a71ecd392589b39127d88b5031d2f330b3aa893320868f9b251af870a3fe4194ed16558d3705e98faf047c42 WHIRLPOOL 306b3e4eb28d19374c5ab8c11da80bf3b84531af2cb85970b6e7a144e22055b674181ebfbf2970e7c79f1b27de9c3ba7a15082fac12a0ddba3342ca14e28d5c5
-MISC metadata.xml 460 SHA256 963f45f48a1c05776faf33d9fc27b708f367080b17b2bac2da1a8d126732d0b5 SHA512 381cd3adf4bb50eb998359d061844d129ade891bd197eebd19caf5a5beea0af1f7bc00fcab1cde54d000a1e15ebbc0f87404496bd24555f3a0441313c95a13a7 WHIRLPOOL 8458a33cdb43e4e500d44c4d935beeed93c8ef677c8672a01538f8bfb810f2321559551dd7b957785d1e15165a52ec2a4053f4543fa02bf92f84125a5b238f17
+MISC metadata.xml 453 SHA256 ef2e42212458e3818a1d324fad263b635f34a4590eed0e34b71fd425e77d5243 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35 WHIRLPOOL afdac09622c15654aaca13b9ed1f8e1fe4d78f4c6317b5072c2abb24caa9ddecb76b072c6366d6880121ee2b7a755711ff58c844bf10d88a7bf8e03089b99408
diff --git a/kde-misc/latte-dock/latte-dock-0.6.2.ebuild b/kde-misc/latte-dock/latte-dock-0.6.2.ebuild
deleted file mode 100644
index f05326f2ed1c..000000000000
--- a/kde-misc/latte-dock/latte-dock-0.6.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_GCC_MINIMAL="4.9"
-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://github.com/psifidotos/Latte-Dock.git"
-else
-	SRC_URI="https://github.com/psifidotos/Latte-Dock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Latte-Dock-${PV}"
-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 kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(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/libX11
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-BUILD_DIR="${S}/build"
-
-DOCS=( CHANGELOG.md README.md TRANSLATORS )
-
-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() {
-	gnome2_icon_cache_update
-}
diff --git a/kde-misc/latte-dock/latte-dock-9999.ebuild b/kde-misc/latte-dock/latte-dock-9999.ebuild
deleted file mode 100644
index 5dcfa44e5bcf..000000000000
--- a/kde-misc/latte-dock/latte-dock-9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-if [[ ${PV} = 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/psifidotos/Latte-Dock.git"
-else
-	SRC_URI="https://github.com/psifidotos/Latte-Dock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Latte-Dock-${PV}"
-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 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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/kde-misc/latte-dock/metadata.xml b/kde-misc/latte-dock/metadata.xml
index f25a8e14e49e..74f77d024f21 100644
--- a/kde-misc/latte-dock/metadata.xml
+++ b/kde-misc/latte-dock/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Petross404 (Petros S)</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">psifidotos/Latte-Dock</remote-id>