gentoo resync : 29.06.2020

5 files changed, 2 insertions, 178 deletions

diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index dc45065e16b1..4ccf68a994cb 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,8 +1,3 @@
-AUX smb4k-3.0.4-qt-5.15.patch 689 BLAKE2B 1c7d40e8dcbdc9b41380640b648860852bb8381b2f45d61a7d221f4ad7966c1e12f7cefb9c0a9bffc7a691ab97222f44f6fae587828c2bda7e395399c4fdef5d SHA512 f2f60e30991b24f68a9a84160ba935db4d20719e515cbb47eaf0576a3303bf1b549c1dd740cbb3a283eb03781820adef09199a1b9cf23f60c0b880483209ebd6
-DIST smb4k-3.0.4.tar.xz 3824508 BLAKE2B 98d9e66a577e40e734421cf46d72ebf010fa1d2161d411dbd5382af8fd84f2578a086f0425e576508aed0ed549940cf4b7f688c527f42218dd781006d2460204 SHA512 bd3b53f6f8e9ee3dd6fc8c0ab31b877fc89a887837b7bd91eef410b6dff81960ada872bada074638c8b7d204c638564a70568e87cc874e146508241e071665a3
-DIST smb4k-3.0.5.tar.xz 3841924 BLAKE2B 98bc44ed33b60fb983db34d39ed7bd51f9fab8c4594e81c9f3d6275c4b6f49822902d12da59cb777754febd839c37d42d6623cb42ae03385a5187e063790a872 SHA512 913e69ba30b4d7294e4436648fcebd54173cc0c32a712824218aee7c276dc0d8eea0a2e4a14648cd55c99424b80512e01c5a1929ce38a9f83d3dfb9c24601af1
 DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
-EBUILD smb4k-3.0.4.ebuild 1932 BLAKE2B 38084c5e9420ade82d3ea8b245fee26c068e678724f38c5576d75cd4bc8652b6b7189d3466242fb8f90b800f8bf735dab4f4e3fa3120339dc5a00fda1e63eb31 SHA512 ec2d341b877717a47529096db938096f84a9b5d08802034a36c9bf9b403eff9eea8a28bff90d963d715f4ee63c6e28b4a2eda605fdcf9590281fc5b02726aa84
-EBUILD smb4k-3.0.5.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
-EBUILD smb4k-3.0.6.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
+EBUILD smb4k-3.0.6.ebuild 1886 BLAKE2B e3db0902dea23a31824f963850c243693aea932d8804a0f92126b072e790595e5d41e9a1b226c88fce83e0975e97c9b5183df8a69db9bb91caaed96672f280bb SHA512 76fd0d9aa5695751ef1fa43ad6add6613e515dc85e9537507fb2d0c313b66df0ce3544e2776b573fe20cc77ecca4e5685e1ca8c3cd5295dbaf81d6a8686d09ea
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch b/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
deleted file mode 100644
index 8948e30dfa12..000000000000
--- a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 009ebe0224f7e236837741a1b35f0c572024e8b3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 21 Apr 2020 10:27:28 +0200
-Subject: [PATCH] Fix build with Qt-5.15 (missing header)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- smb4k/smb4ktooltip.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/smb4k/smb4ktooltip.cpp b/smb4k/smb4ktooltip.cpp
-index de07a1d..b1064f7 100644
---- a/smb4k/smb4ktooltip.cpp
-+++ b/smb4k/smb4ktooltip.cpp
-@@ -43,6 +43,7 @@
- #include <QToolTip>
- #include <QApplication>
- #include <QDesktopWidget>
-+#include <QPainterPath>
- #include <QStylePainter>
- #include <QStyle>
- #include <QStyleOptionFrame>
--- 
-2.26.1
-
diff --git a/net-misc/smb4k/smb4k-3.0.4.ebuild b/net-misc/smb4k/smb4k-3.0.4.ebuild
deleted file mode 100644
index dfe247ddeca5..000000000000
--- a/net-misc/smb4k/smb4k-3.0.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.0.5.ebuild b/net-misc/smb4k/smb4k-3.0.5.ebuild
deleted file mode 100644
index a7ff9e7f655d..000000000000
--- a/net-misc/smb4k/smb4k-3.0.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.0.6.ebuild b/net-misc/smb4k/smb4k-3.0.6.ebuild
index a7ff9e7f655d..169b71b8637d 100644
--- a/net-misc/smb4k/smb4k-3.0.6.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.6.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"