gentoo resync : 24.12.2018

3 files changed, 2 insertions, 78 deletions

diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index d255a08a1ce2..32c74b2ad9e4 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST dolphin-plugins-18.04.3.tar.xz 191408 BLAKE2B e27bd189d02f922e55fb216bfb80032bf611ec109a3c3f9e3b2cd2466f831e59d548c2d2861a784972e7dcc676e1e7baf28f9a44e8ce7cf1569846da4d6cb86a SHA512 641562f44750bad8ca431be470cf691ea72647ac2b6c5bef7ff83d1d538bc13b7f8d082589c0d2c8c208c14a6007e412f4be8a8e733ebde7132dca6d5724798e
 DIST dolphin-plugins-18.08.3.tar.xz 193624 BLAKE2B 8ba60e93b6423a463ee823560c06941c57541bd7561400020ae137c3cfa8b46b634f494a5429b1c83107599ed81727d7755538c5145a0cde03ee971d7b16b3d5 SHA512 38b28d93deb0e30f1e599ee150c5763c74f89b9706a3730cd0ed0b931ecc12a4284c907dced49689d069b82c84de151d1025e788c533943ec9280c1690c33930
-EBUILD dolphin-plugins-18.04.3.ebuild 1841 BLAKE2B fae91928416caa376bea9ea1fc58d261665e3777f2d4768b1d2741b1059adc61e58dbd32756301035c444fa21f2f197acc1e0e707cebfe19a2fef8bf07b0db52 SHA512 30ca4eb51eaf61d2bdec582227ff29a1d3ea00264b4f99f22ee593b1a052b3187e75a56792177161d88f55dc677d7e19ef913d08b74086b321080b050b220d9c
-EBUILD dolphin-plugins-18.08.3.ebuild 1784 BLAKE2B bf31cdf4afde0e12e2b9db2a6588d33aa262f4a717bdd1dc28ff3b71ac511a4b1ccb512439ab31f54307df5ecc6cb711d18fbb1933937b43008f756f0f6bd06c SHA512 9fdb95ab8b2d5dfa977af2ab12498ee7c13cafb246da28c78966d6720d901bcf0c8f129b0ac155e6e4ee5de4c384bf60ef649352d47e43caeeebe9a7bddecfb3
+EBUILD dolphin-plugins-18.08.3.ebuild 1782 BLAKE2B d888607679c789733fdca90273bcf9b4a020b51a440526329eca4a2164c887268dd842f87f776bc844b8a460395cec5c5e9c1503a99a54f5330d0fe48f2e0c3a SHA512 5bd6a0f4cedf075d7ea493bbcfa6fcaa76f7116b685354be282b08012b2c28a63bce68e8502a299f5cdba2eabb95012ab7c47224847e90c7b7a8e65ba26d8e80
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.3.ebuild
deleted file mode 100644
index 8cad2a6fe919..000000000000
--- a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 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-18.08.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.08.3.ebuild
index d25eed108d74..386e5cbba7fa 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-18.08.3.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-18.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: