kde-misc/plasma-nm -> kde-plasma/plasma-nm

5 files changed, 68 insertions, 2 deletions

diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index fe7142949810..7b1111fc695e 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,3 @@
+DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c
 DIST plasma-nm-5.7.5.tar.xz 638176 SHA256 eb74256c962703097bb6f20b10c8ef2f1646e92256772db4ec81ff4df71aedee SHA512 f806ee6b764fe7022ad82f55fb2ba28d4157a655722e02bc1b344d5e6c97ee1137938134a25ab842968174a03d72dffa20e7ab6eea4bcb5d44c5a609fa41817a WHIRLPOOL 36bbe87dfb6a783dba6d240c0f8a6361a1c4211c7f3892338288e479fd82fc22d79a018d400383e2b0085d7797a45adcecb55f5c3f54be959578e20127b96268
 DIST plasma-nm-5.8.2.tar.xz 643944 SHA256 4260fbcd437b899eb17001f58a0a3973131faab2dc0702dab8ef9cf49186b60c SHA512 59186ad1f82de7914365d5c716ba0dd9c5199dba7ad9255584eaf51b4c7e71724acf9a3863141ef87223b616ae16210a78898c662e2ad7c51c16acfa7799e048 WHIRLPOOL d46cd03de7b6867591913007c0e8e8cb143d7213f80d1f361cdb183ff6bfd1035a808b7343c4729ca2d6986a2c4885a28d3f85ce087c58f431dc5c2b6b1729fc
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch b/kde-plasma/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch
new file mode 100644
index 000000000000..1151763886c3
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch
@@ -0,0 +1,14 @@
+Fixes build with networkmanager-1.0.6.
+
+Triggered by http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?h=nm-1-0&id=6f616d4c4b04d5478f60d0311317bc84c5459ea4.
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -49,6 +49,7 @@
+                     ${CMAKE_CURRENT_SOURCE_DIR}/libs
+                     ${CMAKE_CURRENT_SOURCE_DIR}/libs/editor/
+                     ${NETWORKMANAGER_INCLUDE_DIRS}
++                    ${NM-UTIL_INCLUDE_DIRS}
+                     ${NETWORKMANAGERQT_INCLUDE_DIRS}
+                     ${KDE4_INCLUDES})
+ 
diff --git a/kde-plasma/plasma-nm/plasma-nm-0.9.3.6.ebuild b/kde-plasma/plasma-nm/plasma-nm-0.9.3.6.ebuild
new file mode 100644
index 000000000000..6bdcc223fa08
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-0.9.3.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ar bg bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl
+hr hu is it ja km ko lt lv mai mr ms nb nds nl nn pa pl pt pt_BR ro ru sk
+sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
+DECLARATIVE_REQUIRED="always"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	KEYWORDS="amd64 x86"
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+else
+	KEYWORDS=""
+fi
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+HOMEPAGE="https://projects.kde.org/projects/playground/network/plasma-nm"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="4"
+IUSE="debug modemmanager openconnect"
+
+RDEPEND="
+	>=net-libs/libnm-qt-0.9.8.2[modemmanager?]
+	net-misc/mobile-broadband-provider-info
+	>=net-misc/networkmanager-0.9.8.0
+	modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
+	openconnect? (
+		net-misc/networkmanager-openconnect
+		net-misc/openconnect:=
+	)
+	!kde-misc/networkmanagement
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}/${P}-networkmanager-1.0.6.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)
+		$(cmake-utils_use_find_package openconnect OpenConnect)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild
index 68352dcee055..06f95db6440f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep plasma-workspace)
-	!kde-misc/plasma-nm
+	!kde-plasma/plasma-nm:4
 "
 
 src_configure() {
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild
index e7a396db9bea..d88fb05f82df 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep plasma-workspace)
-	!kde-misc/plasma-nm
+	!kde-plasma/plasma-nm:4
 "
 
 src_configure() {