gentoo resync : 15.12.2019

4 files changed, 64 insertions, 52 deletions

diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 1ca7e96dcca3..d9101ef7080b 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-19.04.3.tar.xz 191524 BLAKE2B 8869c9e5c4de20b64ad426db82ce2249821f2bf6ceec958f55b385b16c3c85af7b4e908a37f422e79454ee1ba4f604e1ed9a4ef7ba7ff431dffb32d7443c55e3 SHA512 5a89daee3a4366905bd5c884460b62b9faf75989f8bb9b108f019c4359c5ea6406efcaf896a3504870819467130cd76e31a92cf9d697a5306293b5efd701e4c3
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-EBUILD dolphin-plugins-dropbox-19.04.3.ebuild 1005 BLAKE2B 26e20c73fbcd3971afedac764d49ec81e564ddf4b5b7678cbd23276c644d8b992734f3224c1483cde21ed01c91147e24be30243d5e7c42176fa38f29c6460bc8 SHA512 de3fef9b6eeecdf2dd92cd599dc156a2d863e4beb3f5d2f6fb49a23c18eb48be944c9ab43370c2c990a5838a3a2562b8ae3f1f1b57534a7b397e649f7d3125b0
-EBUILD dolphin-plugins-dropbox-19.08.3.ebuild 1155 BLAKE2B b2949642081852198a0497b6cfcbab02efcc32037e067a1f3eeb4371a4ce17865db3df25b285f0b6810b6f01b5a91bed18ab19450b27f2855144f18e906fa488 SHA512 9f7a298136435161df4587a962d30268d10b22073a1560b9dfc9ddcdf3cb3f93e91482429e4a7e7a8dd26eb61fd8feb907ab2f67891e54184fc75c6ea39540b7
+DIST dolphin-plugins-19.12.0.tar.xz 195968 BLAKE2B 10a294ea3950b14b5593f656d067cf8fbfbf680df7dc96e542f6afcd6c29c50d853fc2ab648a0ca151d342a42c3abc5dcc20dd328e2db1dd2aaf97550ae2226a SHA512 2f02cfd4f5b6596e350a77547f76cb484966393947c2c60940e6570c90121085588b2485ae1e46317b86e6d24189356f123f5243f221217942ede587a2d6400f
+EBUILD dolphin-plugins-dropbox-19.08.3.ebuild 1153 BLAKE2B a00f04503ab8664b7ccf9d503a49ed2d25b5997661ea8db0815232122ec692322adbbc468d83ad74ff879263e3bedcb141f9c21dac7f90d340f376846a25b3ac SHA512 e1b5afb04a802e9f3e9af4840e5b700941b6c1bacecc62df710ba879913b25644a97f0623dc1bd79b7919fbecf13e24c3c85f66104bb8bf163ba969305704feb
+EBUILD dolphin-plugins-dropbox-19.12.0-r1.ebuild 1337 BLAKE2B 5d2b0ad57d0a8d696f0b26fa7a987b47469ae8f0cdecdb114861d941cfd2efc50d98284a626e7211a3505cce31da9ce56c508ebe2b31aa539259462598729fd5 SHA512 9842e1c04ea0f6a5fbbe982fc30cd977d7244d4fcf599a88e3e0544708fd7d694898a6c47b456c25da0383394cc62211a2b57662bbed194443cee8df1ec5c127
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.04.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.04.3.ebuild
deleted file mode 100644
index 64ed8d390529..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.04.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="dropbox"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Dropbox service integration"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	net-misc/dropbox-cli
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
index 91c272ea7d84..d5e4234d75ae 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Dolphin plugin for Dropbox service integration"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild
new file mode 100644
index 000000000000..419a6c9fb354
--- /dev/null
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="dolphin-plugins"
+MY_PLUGIN_NAME="dropbox"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Dolphin plugin for Dropbox service integration"
+HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/dolphin-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	net-misc/dropbox-cli
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_svn=OFF
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}