Move libnm-qt from net-libs to kde-base as it is part of Plasma 5 proper.

21 files changed, 48 insertions, 47 deletions

diff --git a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
index 51b245b779a..e5a3e678859 100644
--- a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
+++ b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
@@ -13,6 +13,7 @@
 ~kde-base/kwin-9999 **
 ~kde-base/kwrited-9999 **
 ~kde-base/libksysguard-9999 **
+~kde-base/libnm-qt-9999 **
 ~kde-base/milou-9999 **
 ~kde-base/oxygen-9999 **
 ~kde-base/oxygen-fonts-9999 **
diff --git a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
index cc990b4d852..55e0666332b 100644
--- a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
@@ -15,6 +15,7 @@
 <kde-base/kwrited-5.0.50:5
 <kde-base/libkscreen-5.0.50:5
 <kde-base/libksysguard-5.0.50:5
+<kde-base/libnm-qt-5.0.50:5
 <kde-base/milou-5.0.50:5
 <kde-base/oxygen-5.0.50:5
 <kde-base/oxygen-fonts-5.0.50:5
diff --git a/Documentation/package.accept_keywords/kde-plasma-live.keywords b/Documentation/package.accept_keywords/kde-plasma-live.keywords
index 96130d3ff5f..de026e762e2 100644
--- a/Documentation/package.accept_keywords/kde-plasma-live.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-live.keywords
@@ -16,6 +16,7 @@
 ~kde-base/kwin-9999 **
 ~kde-base/kwrited-9999 **
 ~kde-base/libksysguard-9999 **
+~kde-base/libnm-qt-9999 **
 ~kde-base/milou-9999 **
 ~kde-base/oxygen-9999 **
 ~kde-base/oxygen-fonts-9999 **
diff --git a/Documentation/package.mask/kde-plasma-5.0 b/Documentation/package.mask/kde-plasma-5.0
index e47ba300629..31cd5d7a046 100644
--- a/Documentation/package.mask/kde-plasma-5.0
+++ b/Documentation/package.mask/kde-plasma-5.0
@@ -15,6 +15,7 @@
 >=kde-base/kwrited-5.0:5
 >=kde-base/libkscreen-5.0:5
 >=kde-base/libksysguard-5.0:5
+>=kde-base/libnm-qt-5.0:5
 >=kde-base/milou-5.0:5
 >=kde-base/oxygen-5.0:5
 >=kde-base/oxygen-fonts-5.0:5
diff --git a/Documentation/package.mask/kde-plasma-live b/Documentation/package.mask/kde-plasma-live
index 45532de5d46..d8aa56c5b28 100644
--- a/Documentation/package.mask/kde-plasma-live
+++ b/Documentation/package.mask/kde-plasma-live
@@ -16,6 +16,7 @@
 ~kde-base/kwin-9999
 ~kde-base/kwrited-9999
 ~kde-base/libksysguard-9999
+~kde-base/libnm-qt-9999
 ~kde-base/milou-9999
 ~kde-base/oxygen-9999
 ~kde-base/oxygen-fonts-9999
diff --git a/Documentation/package.unmask/kde-plasma-5.0 b/Documentation/package.unmask/kde-plasma-5.0
index 74f3e4e2543..97e57d44b80 100644
--- a/Documentation/package.unmask/kde-plasma-5.0
+++ b/Documentation/package.unmask/kde-plasma-5.0
@@ -15,6 +15,7 @@
 <kde-base/kwrited-5.0.50:5
 <kde-base/libkscreen-5.0.50:5
 <kde-base/libksysguard-5.0.50:5
+<kde-base/libnm-qt-5.0.50:5
 <kde-base/milou-5.0.50:5
 <kde-base/oxygen-5.0.50:5
 <kde-base/oxygen-fonts-5.0.50:5
diff --git a/Documentation/package.unmask/kde-plasma-live b/Documentation/package.unmask/kde-plasma-live
index 45532de5d46..d8aa56c5b28 100644
--- a/Documentation/package.unmask/kde-plasma-live
+++ b/Documentation/package.unmask/kde-plasma-live
@@ -16,6 +16,7 @@
 ~kde-base/kwin-9999
 ~kde-base/kwrited-9999
 ~kde-base/libksysguard-9999
+~kde-base/libnm-qt-9999
 ~kde-base/milou-9999
 ~kde-base/oxygen-9999
 ~kde-base/oxygen-fonts-9999
diff --git a/net-libs/libnm-qt/Manifest b/kde-base/libnm-qt/Manifest
index 060267423e0..060267423e0 100644
--- a/net-libs/libnm-qt/Manifest
+++ b/kde-base/libnm-qt/Manifest
diff --git a/net-libs/libnm-qt/libnm-qt-5.0.93.ebuild b/kde-base/libnm-qt/libnm-qt-5.0.93.ebuild
index 66db949e0ee..539821033f5 100644
--- a/net-libs/libnm-qt/libnm-qt-5.0.93.ebuild
+++ b/kde-base/libnm-qt/libnm-qt-5.0.93.ebuild
@@ -7,19 +7,9 @@ EAPI=5
 KDE_TEST="true"
 inherit kde5
 
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://kde/stable/plasma/5.0.2/${P}.tar.xz"
-else
-	KEYWORDS=" ~amd64"
-fi
-
 DESCRIPTION="NetworkManager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
-
 LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes official KDE Framework
-SLOT="0"
+KEYWORDS=" ~amd64"
 IUSE="teamd"
 
 RDEPEND="
@@ -29,6 +19,7 @@ RDEPEND="
 		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
 		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
 	)
+	!net-libs/libnm-qt
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-libs/libnm-qt/libnm-qt-5.0.95.ebuild b/kde-base/libnm-qt/libnm-qt-5.0.95.ebuild
index 626956d5219..539821033f5 100644
--- a/net-libs/libnm-qt/libnm-qt-5.0.95.ebuild
+++ b/kde-base/libnm-qt/libnm-qt-5.0.95.ebuild
@@ -7,19 +7,9 @@ EAPI=5
 KDE_TEST="true"
 inherit kde5
 
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/${P}.tar.xz"
-else
-	KEYWORDS=""
-fi
-
 DESCRIPTION="NetworkManager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
-
 LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes official KDE Framework
-SLOT="0"
+KEYWORDS=" ~amd64"
 IUSE="teamd"
 
 RDEPEND="
@@ -29,6 +19,7 @@ RDEPEND="
 		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
 		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
 	)
+	!net-libs/libnm-qt
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-libs/libnm-qt/libnm-qt-5.1.0.ebuild b/kde-base/libnm-qt/libnm-qt-5.1.0.ebuild
index 066b058e42e..539821033f5 100644
--- a/net-libs/libnm-qt/libnm-qt-5.1.0.ebuild
+++ b/kde-base/libnm-qt/libnm-qt-5.1.0.ebuild
@@ -7,19 +7,9 @@ EAPI=5
 KDE_TEST="true"
 inherit kde5
 
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
-else
-	KEYWORDS=""
-fi
-
 DESCRIPTION="NetworkManager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
-
 LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes official KDE Framework
-SLOT="0"
+KEYWORDS=" ~amd64"
 IUSE="teamd"
 
 RDEPEND="
@@ -29,6 +19,7 @@ RDEPEND="
 		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
 		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
 	)
+	!net-libs/libnm-qt
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/kde-base/libnm-qt/libnm-qt-5.1.9999.ebuild b/kde-base/libnm-qt/libnm-qt-5.1.9999.ebuild
new file mode 100644
index 00000000000..dfe31e7bfd0
--- /dev/null
+++ b/kde-base/libnm-qt/libnm-qt-5.1.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS=""
+IUSE="teamd"
+
+RDEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtnetwork:5
+	|| (
+		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
+		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
+	)
+	!net-libs/libnm-qt
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/net-libs/libnm-qt/libnm-qt-9999.ebuild b/kde-base/libnm-qt/libnm-qt-9999.ebuild
index 066b058e42e..dfe31e7bfd0 100644
--- a/net-libs/libnm-qt/libnm-qt-9999.ebuild
+++ b/kde-base/libnm-qt/libnm-qt-9999.ebuild
@@ -7,19 +7,9 @@ EAPI=5
 KDE_TEST="true"
 inherit kde5
 
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
-else
-	KEYWORDS=""
-fi
-
 DESCRIPTION="NetworkManager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
-
 LICENSE="LGPL-2"
-# maybe remove SLOT when it becomes official KDE Framework
-SLOT="0"
+KEYWORDS=""
 IUSE="teamd"
 
 RDEPEND="
@@ -29,6 +19,7 @@ RDEPEND="
 		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
 		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
 	)
+	!net-libs/libnm-qt
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-libs/libnm-qt/metadata.xml b/kde-base/libnm-qt/metadata.xml
index 7aa99ba6cd6..7aa99ba6cd6 100644
--- a/net-libs/libnm-qt/metadata.xml
+++ b/kde-base/libnm-qt/metadata.xml
diff --git a/kde-base/plasma-nm/plasma-nm-5.1.0.ebuild b/kde-base/plasma-nm/plasma-nm-5.1.0.ebuild
index 1ac17b6d037..c03d672791b 100644
--- a/kde-base/plasma-nm/plasma-nm-5.1.0.ebuild
+++ b/kde-base/plasma-nm/plasma-nm-5.1.0.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=" ~amd64"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
+	$(add_kdebase_dep libnm-qt 'teamd=')
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -36,7 +37,6 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
-	>=net-libs/libnm-qt-5.0[teamd=]
 	net-misc/mobile-broadband-provider-info
 	>=net-misc/networkmanager-0.9.10.0[teamd=]
 	modemmanager? (
diff --git a/kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild b/kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild
index 7e7bd51e496..fa02dd543e7 100644
--- a/kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild
+++ b/kde-base/plasma-nm/plasma-nm-5.1.9999.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
+	$(add_kdebase_dep libnm-qt 'teamd=')
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -36,7 +37,6 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
-	>=net-libs/libnm-qt-5.0[teamd=]
 	net-misc/mobile-broadband-provider-info
 	>=net-misc/networkmanager-0.9.10.0[teamd=]
 	modemmanager? (
diff --git a/kde-base/plasma-nm/plasma-nm-9999.ebuild b/kde-base/plasma-nm/plasma-nm-9999.ebuild
index 7e7bd51e496..fa02dd543e7 100644
--- a/kde-base/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-base/plasma-nm/plasma-nm-9999.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
+	$(add_kdebase_dep libnm-qt 'teamd=')
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -36,7 +37,6 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
-	>=net-libs/libnm-qt-5.0[teamd=]
 	net-misc/mobile-broadband-provider-info
 	>=net-misc/networkmanager-0.9.10.0[teamd=]
 	modemmanager? (
diff --git a/sets/kde-plasma b/sets/kde-plasma
index 918192506ad..867b303b51c 100644
--- a/sets/kde-plasma
+++ b/sets/kde-plasma
@@ -13,6 +13,7 @@ kde-base/kwin:5
 kde-base/kwrited:5
 kde-base/libkscreen:5
 kde-base/libksysguard:5
+kde-base/libnm-qt:5
 kde-base/milou:5
 kde-base/oxygen:5
 kde-base/oxygen-fonts:5
diff --git a/sets/kde-plasma-5.0 b/sets/kde-plasma-5.0
index 09f86dde1d3..4f3c147958d 100644
--- a/sets/kde-plasma-5.0
+++ b/sets/kde-plasma-5.0
@@ -12,6 +12,7 @@
 <kde-base/kwrited-5.0.50:5
 <kde-base/libkscreen-5.0.50:5
 <kde-base/libksysguard-5.0.50:5
+<kde-base/libnm-qt-5.0.50:5
 <kde-base/milou-5.0.50:5
 <kde-base/oxygen-5.0.50:5
 <kde-base/oxygen-fonts-5.0.50:5
diff --git a/sets/kde-plasma-5.1 b/sets/kde-plasma-5.1
index 37f4b43de13..2d612e62dc0 100644
--- a/sets/kde-plasma-5.1
+++ b/sets/kde-plasma-5.1
@@ -14,6 +14,7 @@
 <kde-base/kwrited-5.1.50:5
 <kde-base/libkscreen-5.1.50:5
 <kde-base/libksysguard-5.1.50:5
+<kde-base/libnm-qt-5.1.50:5
 <kde-base/milou-5.1.50:5
 <kde-base/oxygen-5.1.50:5
 <kde-base/oxygen-fonts-5.1.50:5
diff --git a/sets/kde-plasma-live b/sets/kde-plasma-live
index abb481c1ca6..90f8f8451ef 100644
--- a/sets/kde-plasma-live
+++ b/sets/kde-plasma-live
@@ -13,6 +13,7 @@
 ~kde-base/kwin-9999
 ~kde-base/kwrited-9999
 ~kde-base/libksysguard-9999
+~kde-base/libnm-qt-9999
 ~kde-base/milou-9999
 ~kde-base/oxygen-9999
 ~kde-base/oxygen-fonts-9999