gentoo resync : 14.04.2018

3 files changed, 8 insertions, 74 deletions

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 )