From 56f46c765e43423dc29e94e9fa238362ce1a4535 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 11 Jan 2024 22:51:40 +0100
Subject: net-misc/smb4k: Add qt5 USEdep on net-libs/kdsoap

Restrict to <net-libs/kdsoap-ws-discovery-client-3.0.0
Add upstream remote-id

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 net-misc/smb4k/metadata.xml          |  1 +
 net-misc/smb4k/smb4k-3.2.5-r1.ebuild | 77 ++++++++++++++++++++++++++++++++++++
 net-misc/smb4k/smb4k-3.2.5.ebuild    | 77 ------------------------------------
 3 files changed, 78 insertions(+), 77 deletions(-)
 create mode 100644 net-misc/smb4k/smb4k-3.2.5-r1.ebuild
 delete mode 100644 net-misc/smb4k/smb4k-3.2.5.ebuild

(limited to 'net-misc/smb4k')

diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml
index fd3d2f045638..3874c260304c 100644
--- a/net-misc/smb4k/metadata.xml
+++ b/net-misc/smb4k/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:smb4k_project:smb4k</remote-id>
+		<remote-id type="kde-invent">network/smb4k</remote-id>
 		<remote-id type="sourceforge">smb4k</remote-id>
 	</upstream>
 	<use>
diff --git a/net-misc/smb4k/smb4k-3.2.5-r1.ebuild b/net-misc/smb4k/smb4k-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..56d37ec89dc5
--- /dev/null
+++ b/net-misc/smb4k/smb4k-3.2.5-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://apps.kde.org/smb4k/
+https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm64 ~riscv x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="+discovery plasma"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${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/kdnssd-${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]
+	discovery? (
+		net-libs/kdsoap:=[qt5(+)]
+		<net-libs/kdsoap-ws-discovery-client-0.3.0
+	)
+"
+RDEPEND="${DEPEND}
+	plasma? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-plasma/libplasma-${KFMIN}:5
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
+		-DSMB4K_INSTALL_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.2.5.ebuild b/net-misc/smb4k/smb4k-3.2.5.ebuild
deleted file mode 100644
index 47b6bace54b0..000000000000
--- a/net-misc/smb4k/smb4k-3.2.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="+discovery plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${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/kdnssd-${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]
-	discovery? (
-		net-libs/kdsoap:=
-		net-libs/kdsoap-ws-discovery-client
-	)
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-plasma/libplasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
-		-DSMB4K_INSTALL_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"
-}
-- 
cgit v1.2.3-65-gdbad