Version bump for kde3 networkmanager backend

svn path=/overlay/; revision=96

5 files changed, 44 insertions, 38 deletions

diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog
new file mode 100644
index 0000000..e683e72
--- /dev/null
+++ b/kde-misc/knetworkmanager/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for kde-misc/knetworkmanager
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+* knetworkmanager-0.7_p20090427 (27 Apr 2009)
+
+  27 Apr 2009; Robert Piasek <robert.piasek@member.fsf.org>
+  -files/knetworkmanager-0.2-pam_console-fix.patch,
+  +files/05-no_blank_psk.patch, knetworkmanager-0.7_pre20081028,
+  knetworkmanager-0.7_p20090427:
+  Revision bump for knetworkmanager to work with NM 0.7
+
diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest
index 2163601..08bf31b 100644
--- a/kde-misc/knetworkmanager/Manifest
+++ b/kde-misc/knetworkmanager/Manifest
@@ -1,3 +1,4 @@
-AUX knetworkmanager-0.2-pam_console-fix.patch 1290 RMD160 cab71463e5e73b0a05eceb7cc6e98f2f3e2ecdf0 SHA1 3962ebf997fc9e63fe001061f25c4b6c024eab1a SHA256 7b1c8f6dadc18c7809f7bdb988b0085ea1ff63cdc61d1d0044f55f0b7ef738cb
-DIST knetworkmanager-0.7_pre20081028.tar.bz2 805423 RMD160 06a4724acd5fce1417a1039aca4aff4f4bb8cafe SHA1 c228ed7dfb4fedff180b09b65959ce52b97ce63d SHA256 78545994b9f39f422645413a96951974bdaff8517b4142cfc9f54d3cf6a56cb7
-EBUILD knetworkmanager-0.7_pre20081028.ebuild 1659 RMD160 5ac908a3012062ad856f77bdf68478e9d61773a8 SHA1 51de00f9c0936e19bdc4964cb304566d98f37689 SHA256 ff3053ce47f36a4baf7504238d09339d4610c7aac13d2bbd829f7cc73d038a46
+AUX 05-no_blank_psk.patch 1101 RMD160 ae5dcfd3460804369fdf70198701ec8f28743856 SHA1 9f3e1274cd32f8804bdef7e8ae3b98ebf61a19e2 SHA256 2c2b466982e27bfb02bb61843d6a79b1504c588712edcde17fcc2933e5877b3e
+DIST knetworkmanager-0.7_p20090427.tar.bz2 840909 RMD160 319268b5ce714e8094673f530406e2ef5ef370f4 SHA1 76c1a3779b6436c7b52abea639d4a6d39be81dde SHA256 d88a1d0eb2c1c56e75d72d2d237705cac6b84e7eefe912cbf0eccc932adc46b6
+EBUILD knetworkmanager-0.7_p20090427.ebuild 1551 RMD160 8cb6a53de4fc5567aad6f239a140633807fa20f6 SHA1 a18b0185f0661af049928211d5336d2d8e571ff0 SHA256 16117b066ab54c79e1d04624b0ce47e7906c9d6a1c153a1dfec3cb8d2612fd5e
+MISC ChangeLog 439 RMD160 55ab8b038914e71af26ce8d2c7c7e6a290bc0bac SHA1 5e0a3a8aca78d5212d8bacef2c4900af51ea9ed7 SHA256 5dce6ba876dfc40f8b7d19bcb7ff1000bf8ee4a5328a901a7b4c9def5c525700
diff --git a/kde-misc/knetworkmanager/files/05-no_blank_psk.patch b/kde-misc/knetworkmanager/files/05-no_blank_psk.patch
new file mode 100644
index 0000000..baab770
--- /dev/null
+++ b/kde-misc/knetworkmanager/files/05-no_blank_psk.patch
@@ -0,0 +1,18 @@
+diff -up knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp.fix knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp
+--- knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp.fix        2009-03-02 15:28:38.000000000 -0500
++++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp    2009-03-02 15:30:01.000000000 -0500
+@@ -290,14 +290,9 @@ WirelessSecurity::toMap() const
+                        map.insert(NM_SETTING_WIRELESS_SECURITY_PAIRWISE, QDBusData::fromQValueList(ciphers));
+        }
+ 
+-       if (!_psk.isNull())
+-               map.insert(NM_SETTING_WIRELESS_SECURITY_PSK, QDBusData::fromString(""));
+-
+        if (!_leapUsername.isEmpty())
+                map.insert(NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, QDBusData::fromString(_leapUsername));
+ 
+-       if (!_leapPassword.isEmpty())
+-               map.insert(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, QDBusData::fromString(""));
+        return map;
+ }
+ 
\ No newline at end of file
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch b/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch
deleted file mode 100644
index 87d5ffb..0000000
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Name: knetworkmanager-pam_console-fix.patch
-URL: svn://svn.gentoo-xeffects.org/xeffects/trunk/kde-misc/knetworkmanager/files/knetworkmanager-pam_console-fix.patch
-Repository Root: svn://svn.gentoo-xeffects.org/xeffects
-Repository UUID: 293eb232-8020-0410-9bbe-a7a9c2f1b3fa
-
-Last Changed Author: roderick
-Last Changed Rev: 540
-Last Changed Date: 2007-03-17 22:17:12 +0100 (Sat, 17 Mar 2007)
-
-------------------------------------------------------------------------
-r540 | roderick | 2007-03-17 22:17:12 +0100 (Sat, 17 Mar 2007) | 1 line
-
-Fix to use group permissions plugdev rather than require pam console.
-------------------------------------------------------------------------
-
-
-Index: knetworkmanager-0.2/knetworkmanager/knetworkmanager.conf
-===================================================================
---- knetworkmanager-0.2.orig/knetworkmanager/knetworkmanager.conf
-+++ knetworkmanager-0.2/knetworkmanager/knetworkmanager.conf
-@@ -8,7 +8,7 @@
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
- 	</policy>
--	<policy at_console="true">
-+	<policy group="plugdev">
- 		<allow own="org.freedesktop.NetworkManagerInfo"/>
- 
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
diff --git a/kde-misc/knetworkmanager/knetworkmanager-0.7_pre20081028.ebuild b/kde-misc/knetworkmanager/knetworkmanager-0.7_p20090427.ebuild
index a4a66e8..f6c53a8 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-0.7_pre20081028.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-0.7_p20090427.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # 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 $
+# $Header: $
 
 inherit kde eutils
 
@@ -16,16 +16,16 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="vpnc openvpn pptp dialup"
 
-DEPEND=">=net-misc/networkmanager-0.7.0_pre20080831
+DEPEND=">=net-misc/networkmanager-0.7.0
 	>=sys-apps/dbus-1.2
 	=kde-base/kdelibs-3.5*
 	>=sys-apps/hal-0.5.10
 	>=net-wireless/wireless-tools-28_pre9
 	>=dev-libs/libnl-1.1
 	>=dev-libs/dbus-qt3-0.9
-	vpnc?   ( >=net-misc/networkmanager-vpnc-0.7.0_pre20080822 )
-	openvpn? ( >=net-misc/networkmanager-openvpn-0.7.0_pre20080822 )
-	pptp?    ( >=net-misc/networkmanager-pptp-0.7.0_pre20080822 )
+	vpnc?   ( >=net-misc/networkmanager-vpnc-0.7.0 )
+	openvpn? ( >=net-misc/networkmanager-openvpn-0.7.0 )
+	pptp?    ( >=net-misc/networkmanager-pptp-0.7.0 )
 	dialup? ( || ( =kde-base/kppp-3.5* =kde-base/kdenetwork-3.5* ) )"
 
 RDEPEND="${DEPEND}"
@@ -33,6 +33,10 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
+
+	# debian patch
+	epatch "${FILESDIR}"/05-no_blank_psk.patch
+
 	set-kdedir
 	export PREFIX="${KDEDIR}"
 	local myconf="$(use_with vpnc vpnc) \