gentoo resync : 01.12.2017

3 files changed, 2 insertions, 78 deletions

diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index b0b3355a2fc1..5c5a497ad51f 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST dolphin-plugins-17.04.3.tar.xz 186316 SHA256 43e62998eca0c5a55ff6c9a05d3df152b344130e794e23abb61d7f2a940c41c7 SHA512 adb0d995b2ae497ce8daf044067043de1730c6f7bbb617532ca8c2777c037069f3eda4189f2949d5739d270c802ff279bfb418737bfc5498dda1db5b6f85fc8f WHIRLPOOL ece0de5a9bd78e9e84b86d3a6dd8db2687da61ebab85e37eeb2902bda66fae232fe094afab861063d946c83445447f90b0cb8352ca6e222468824db345898eb7
 DIST dolphin-plugins-17.08.3.tar.xz 187084 SHA256 5e3d7f6fdc537ea78535981f728a6e0684931baee06b37fa3b2816ed769659e8 SHA512 49bd9b9059a129e9276d2cc216679abbdec595a98aa3ee950164fafcef30a2206b18e3b7487a6665aa3da6c643d92017309fedcfad0caacdadd7433126690970 WHIRLPOOL abe6e6fc89a48caacaaf9b762744622e197e89a672941315d37b3bd147f6ed0f832e940f6cd9da8f8b57c6ebfb75a5f9e0a70719fbfb5c54fc17d4c44846f575
-EBUILD dolphin-plugins-17.04.3.ebuild 1841 BLAKE2B 8471e65d62c01837a46cee08ae434db7cfac3cbd67703456f393ea564da8ba1ff328b581b817255918a1d719a827a77fdf8ec5042521dd4d00e3abf4c999176b SHA512 7bec4439e60cd13a01eb08098859a685d11022435f091b06bb9ef93eb60976305b026d8efa36e7f42e749e7b2b7764d1fab4065cc65b30812246f0e1afbbb255
-EBUILD dolphin-plugins-17.08.3.ebuild 1843 BLAKE2B a5820fbb19bceecda70a4ea91d1ba24ab55d28e8a91dfeb5a78cdaa4998dc81bb8588e07f81fc582e73efdbbc457af45e8ce2461fec035604cf8c696dcff2001 SHA512 e23634c253d8004792ee7db90a209fd20e2755b7bbad9acd1af0f40d5ec1bbcaf120eb9a8c8c8b84830473c67e52cfa96cb262f707faefd2960e6e741a56fe1e
+EBUILD dolphin-plugins-17.08.3.ebuild 1841 BLAKE2B 8471e65d62c01837a46cee08ae434db7cfac3cbd67703456f393ea564da8ba1ff328b581b817255918a1d719a827a77fdf8ec5042521dd4d00e3abf4c999176b SHA512 7bec4439e60cd13a01eb08098859a685d11022435f091b06bb9ef93eb60976305b026d8efa36e7f42e749e7b2b7764d1fab4065cc65b30812246f0e1afbbb255
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-17.04.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-17.04.3.ebuild
deleted file mode 100644
index b44c1097d81b..000000000000
--- a/kde-apps/dolphin-plugins/dolphin-plugins-17.04.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false"
-inherit kde5
-
-DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="amd64 x86"
-IUSE="bazaar dropbox git mercurial subversion"
-
-# FIXME: required in root CMakeLists.txt, but:
-# kdelibs4support only required by git?
-# kxmlgui, qtnetwork only required by dropbox?
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	git? (
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep ktextwidgets)
-	)
-	mercurial? (
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kservice)
-		$(add_frameworks_dep ktexteditor)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kompare)
-	bazaar? ( dev-vcs/bzr )
-	dropbox? ( net-misc/dropbox-cli )
-	git? ( dev-vcs/git )
-	subversion? ( dev-vcs/subversion )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_bazaar=$(usex bazaar)
-		-DBUILD_dropbox=$(usex dropbox)
-		-DBUILD_git=$(usex git)
-		-DBUILD_hg=$(usex mercurial)
-		-DBUILD_svn=$(usex subversion)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	{ use bazaar || use dropbox || use git || use subversion || use mercurial; } && kde5_src_install
-}
-
-pkg_postinst() {
-	if ! use bazaar && ! use dropbox && ! use git && ! use subversion && ! use mercurial; then
-		einfo
-		einfo "You have disabled all plugin use flags. If you want to have vcs"
-		einfo "integration in dolphin, enable those of your needs."
-		einfo
-	fi
-}
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-17.08.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-17.08.3.ebuild
index a370260ca5a1..b44c1097d81b 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-17.08.3.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-17.08.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="false"
 inherit kde5
 
 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bazaar dropbox git mercurial subversion"
 
 # FIXME: required in root CMakeLists.txt, but: