kde-misc/networkmanagement: pkgmove to kde-misc/knetworkmanager

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

11 files changed, 33 insertions, 50 deletions

diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest
deleted file mode 100644
index cb732758..00000000
--- a/kde-misc/knetworkmanager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST knetworkmanager-0.7_pre1168552.tar.bz2 825732 SHA256 a7c2879445cfbec9e72009345104af30e03c4718cfb65e13a7fd7ab1b060151d
diff --git a/kde-misc/knetworkmanager/metadata.xml b/kde-misc/knetworkmanager/metadata.xml
deleted file mode 100644
index 86b13574..00000000
--- a/kde-misc/knetworkmanager/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<maintainer>
-		<email>rbu@gentoo.org</email>
-		<name>Robert Buchholz</name>
-	</maintainer>
-	<longdescription lang="en">
-		KNetworkManager is the KDE front end for NetworkManager. It
-		provides a sophisticated and intuitive user interface which
-		enables users easily to switch their network environment.
-		The range of functions encompasses the features implemented by
-		NetworkManager daemon. It supports Wired Ethernet, Wireless
-		Ethernet Devices (Unencrypted, WEP, WPA), Virtual Private
-		Networks (OpenVPN, VPNC, PPTP) and Dial-Up (PPP).
-	</longdescription>
-	<use>
-		<flag name='cisco'>Adds support for the Cisco VPN client
-			<pkg>net-misc/vpnc</pkg></flag>
-		<flag name='dialup'>Enables Dialup (PPP) support</flag>
-		<flag name='openvpn'>Adds support for the OpenVPN
-			<pkg>net-misc/openvpn</pkg> client</flag>
-		<flag name='pptp'>Adds support for the PPTP (PPP) VPN client</flag>
-	</use>
-</pkgmetadata>
diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/networkmanagement/ChangeLog
index 58373bc6..58373bc6 100644
--- a/kde-misc/knetworkmanager/ChangeLog
+++ b/kde-misc/networkmanagement/ChangeLog
diff --git a/kde-misc/networkmanagement/Manifest b/kde-misc/networkmanagement/Manifest
index ecfd027d..ac2e1bdf 100644
--- a/kde-misc/networkmanagement/Manifest
+++ b/kde-misc/networkmanagement/Manifest
@@ -1 +1,2 @@
-DIST networkmanagement-0.9.0.12.tar.xz 1202520 SHA256 27b4a383972dcbb25eb254dcfe6b71ccb05ca0418590eb57ddc20c0b7bcac8eb SHA512 3715e56ea2e95b41ec28b72063b94124d9c34d5b0de05e6bc1961f0400b21e9b0793e2541eccfba15cb30185db897bd1a56dde15b6b967dbc8ad8be3892c1f19 WHIRLPOOL cfdad170d3bd3a5afca365fd4a8e80bed2e75bc3278b925cf6e5be51960a8bd8f78387131f582c2485042b63656d9e8291925c14dcd525fd42673fe3b49d2db5
+DIST knetworkmanager-0.7_pre1168552.tar.bz2 825732 BLAKE2B 53970a251aa48ba3b0a792c0ba90dd566f27b6e95819cc98871e0654dcfa9353aecfb84d751842da0bbb7265fcbe5d6df0d945efefac790d8fde83d3ec9450a7 SHA512 fbc4afb253463f92edfc09f71a3d08a5765a9cdb30b797554eee46be7bb25fdde42583d91c9baa57d4dec464a66797aed53df23a82939cde8634f0d03bb882f9
+DIST networkmanagement-0.9.0.12.tar.xz 1202520 BLAKE2B 618357b2fe4bf8cc0d0f0de04275096d0d639e4e5f3616b4b5c7c9103892609297d7a9dfa59455f41b59f28c3bbf65bf5b6591550591b3a20374a53400d2dd1a SHA512 3715e56ea2e95b41ec28b72063b94124d9c34d5b0de05e6bc1961f0400b21e9b0793e2541eccfba15cb30185db897bd1a56dde15b6b967dbc8ad8be3892c1f19
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.7-configure-check-for-nm.patch b/kde-misc/networkmanagement/files/knetworkmanager-0.7-configure-check-for-nm.patch
index ee181409..ee181409 100644
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.7-configure-check-for-nm.patch
+++ b/kde-misc/networkmanagement/files/knetworkmanager-0.7-configure-check-for-nm.patch
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.7-dbus_access.patch b/kde-misc/networkmanagement/files/knetworkmanager-0.7-dbus_access.patch
index cfc9965c..cfc9965c 100644
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.7-dbus_access.patch
+++ b/kde-misc/networkmanagement/files/knetworkmanager-0.7-dbus_access.patch
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.7-no_blank_psk.patch b/kde-misc/networkmanagement/files/knetworkmanager-0.7-no_blank_psk.patch
index a0541e2b..a0541e2b 100644
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.7-no_blank_psk.patch
+++ b/kde-misc/networkmanagement/files/knetworkmanager-0.7-no_blank_psk.patch
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.7-uuid_fix.patch b/kde-misc/networkmanagement/files/knetworkmanager-0.7-uuid_fix.patch
index e71ec5e7..e71ec5e7 100644
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.7-uuid_fix.patch
+++ b/kde-misc/networkmanagement/files/knetworkmanager-0.7-uuid_fix.patch
diff --git a/kde-misc/networkmanagement/metadata.xml b/kde-misc/networkmanagement/metadata.xml
index 2b8d4265..5977482c 100644
--- a/kde-misc/networkmanagement/metadata.xml
+++ b/kde-misc/networkmanagement/metadata.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-<use>
-	<flag name="openconnect">Build support for the OpenConnect VPN client</flag>
-</use>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		KNetworkManager is the KDE front end for NetworkManager. It
+		provides a sophisticated and intuitive user interface which
+		enables users easily to switch their network environment.
+		The range of functions encompasses the features implemented by
+		NetworkManager daemon. It supports Wired Ethernet, Wireless
+		Ethernet Devices (Unencrypted, WEP, WPA), Virtual Private
+		Networks (OpenVPN, VPNC, PPTP) and Dial-Up (PPP).
+	</longdescription>
+	<use>
+		<flag name="cisco">Adds support for the Cisco VPN client <pkg>net-misc/vpnc</pkg></flag>
+		<flag name="dialup">Enables Dialup (PPP) support</flag>
+		<flag name="openconnect">Build support for the OpenConnect VPN client</flag>
+		<flag name="openvpn">Adds support for the OpenVPN <pkg>net-misc/openvpn</pkg> client</flag>
+		<flag name="pptp">Adds support for the PPTP (PPP) VPN client</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-misc/knetworkmanager/knetworkmanager-0.7_pre1168552.ebuild b/kde-misc/networkmanagement/networkmanagement-0.7_pre1168552.ebuild
index 451e62cf..e99ca3a2 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-0.7_pre1168552.ebuild
+++ b/kde-misc/networkmanagement/networkmanagement-0.7_pre1168552.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2020 Gentoo
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-0.2.2_p20080528.ebuild,v 1.1 2008/06/24 17:55:41 rbu Exp $
 
+KMNAME="knetworkmanager"
 inherit kde eutils
 
-DESCRIPTION="A KDE frontend for NetworkManager"
+DESCRIPTION="KDE frontend for NetworkManager"
 HOMEPAGE="http://en.opensuse.org/Projects/KNetworkManager"
+SRC_URI="mirror://kde-sunset/${KMNAME}-${PV}.tar.bz2"
+
 LICENSE="GPL-2"
-SRC_URI="mirror://kde-sunset/${P}.tar.bz2"
+SLOT="0"
 KEYWORDS="~x86"
-
 IUSE="cisco openvpn pptp dialup"
 
 need-kde 3.5
 
-SLOT="0"
-
 DEPEND="net-misc/networkmanager
 	=kde-frameworks/kdelibs-3.5*
 	>=dev-libs/dbus-qt3-old-0.9
@@ -32,7 +31,7 @@ DEPEND="${DEPEND}
 	>=sys-kernel/linux-headers-2.6.19
 	sys-apps/util-linux"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${KMNAME}"
 
 pkg_setup() {
 	kde_pkg_setup
@@ -41,10 +40,10 @@ pkg_setup() {
 src_unpack() {
 	kde_src_unpack
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.7-dbus_access.patch
-	epatch "${FILESDIR}"/${PN}-0.7-no_blank_psk.patch
-	epatch "${FILESDIR}"/${PN}-0.7-configure-check-for-nm.patch
-	epatch "${FILESDIR}"/${PN}-0.7-uuid_fix.patch
+	epatch "${FILESDIR}"/${KMNAME}-0.7-dbus_access.patch
+	epatch "${FILESDIR}"/${KMNAME}-0.7-no_blank_psk.patch
+	epatch "${FILESDIR}"/${KMNAME}-0.7-configure-check-for-nm.patch
+	epatch "${FILESDIR}"/${KMNAME}-0.7-uuid_fix.patch
 }
 
 src_compile() {
@@ -65,5 +64,5 @@ src_install() {
 	set-kdedir
 	rm -rf "${D}/${KDEDIR}/etc"
 	insinto /etc/dbus-1/system.d/
-	doins ${PN}-0.7/knetworkmanager.conf
+	doins ${KMNAME}-0.7/knetworkmanager.conf
 }
diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild
index 4064f242..e885a718 100644
--- a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild
+++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,8 +15,8 @@ HOMEPAGE="https://projects.kde.org/projects/extragear/base/networkmanagement"
 [[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
 SLOT="4"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug openconnect"
 
 DEPEND="