Try to blindly fix the networkmanager version problem from bug 381603

Package-Manager: portage-2.1.10.13/cvs/Linux x86_64

4 files changed, 38 insertions, 18 deletions

diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog
index 7a9564239075..38858ab27beb 100644
--- a/kde-misc/knetworkmanager/ChangeLog
+++ b/kde-misc/knetworkmanager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/knetworkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.32 2011/08/15 15:11:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.33 2011/09/07 22:30:44 dilfridge Exp $
+
+  07 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/knetworkmanager-nm09version.patch,
+  knetworkmanager-4.4.0_p30110815.ebuild:
+  Try to blindly fix the networkmanager version problem from bug 381603
 
 *knetworkmanager-4.4.0_p30110815 (15 Aug 2011)
 
diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest
index c7f4fbb0fe7e..af146beeae64 100644
--- a/kde-misc/knetworkmanager/Manifest
+++ b/kde-misc/knetworkmanager/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX knetworkmanager-nm09version.patch 623 RMD160 7430efb5aa863a4185ac7d5beb3d791aa96a026b SHA1 af9458d705fe5046ae0b6cc128424c6a04ea20a4 SHA256 3c13ada22c4456af6cbd2009a5fa3637758217fa7eac0282d4871e00a94092d0
 DIST knetworkmanager-4.4.0_p20110415.tar.xz 484832 RMD160 0d2437f8c2bb606254246f33269f9ce4abb68f4e SHA1 f0bf02e03daf3ccfc72d455b821b6a54c924af27 SHA256 1600c961e4745b5a92f46ffa79ca3162ac39917cdabb831e1325b52982bba89d
 DIST knetworkmanager-4.4.0_p20110513.tar.xz 504340 RMD160 2766b71f54dcb0dffd802bc062963ec0a81fe474 SHA1 00164307c5d2e0b0563eea2c6b08e505c36f6982 SHA256 675a7377f79a2b471ade36f82a6278d56206654dfa0787a6a71c15a9cc928840
 DIST knetworkmanager-4.4.0_p20110714.tar.xz 510128 RMD160 95f98b66f8101881d6cd5ebf4ec19d47b67306e8 SHA1 0d42041280cc293f623871155a93086a278963c5 SHA256 921db31423c825d87d931771a8ef3f6c77a47b552dbd9cce084e42a5369f595d
@@ -8,23 +9,23 @@ DIST knetworkmanager-4.4.0_p30110815.tar.xz 585960 RMD160 5607e2db45dbe973b30854
 EBUILD knetworkmanager-4.4.0_p20110415.ebuild 1112 RMD160 df1595714780b8a1a25f2857e20a48e574a749ca SHA1 3d0afea5a945335347949b53c8257b125086c975 SHA256 a35556e561148ca11b36ec80699f7f519382d7ea788d697207a9dd53aeb69f52
 EBUILD knetworkmanager-4.4.0_p20110513.ebuild 1089 RMD160 3b75bbc043043924c6bb83d430d55f540fadb812 SHA1 e46bc4b7d31505862d9763fd64c6400d3515bfe6 SHA256 89696d426afc60f7599789fe9fba27f57c2868110cff3d700de029785ebc7636
 EBUILD knetworkmanager-4.4.0_p20110714.ebuild 1099 RMD160 255680e0684b9fe4920171dc970f33d42462140e SHA1 786f58200552461b8e5f90a7f9bb2207099aa1dc SHA256 59ca22e8100c4d45e509ebd1caaa063a839f91ad5d42634bed0398331417fab3
-EBUILD knetworkmanager-4.4.0_p30110815.ebuild 1130 RMD160 21c82da8c52a99665a8935ef32db6ea1a3f28d09 SHA1 1114f932fd9d6b09b92d95f2a5d1574ae0d65e7d SHA256 db2bc461fe412ccdb1bfdc3b1ae2c1bfca7c14499bd1c18765be5378d1f3409a
-MISC ChangeLog 4151 RMD160 723dfe3aed48ba9e79969172151f04e1161eb6b5 SHA1 3d32a0951c76d719cbb0b4d35958a3e11d042ca4 SHA256 54a408d0da8bb050ab39c6a503653ccdac57b96a60400b1c5e0fd6017309863d
+EBUILD knetworkmanager-4.4.0_p30110815.ebuild 1178 RMD160 df16da7b779f3a01cb38f26f32f00e0855827a15 SHA1 f3929c2e6da7154be1e7195db436f24fa18d91c8 SHA256 0600945d0b31f68be57240a4b8cd48004d3b2419140cbba27dee4bbb20ac0e34
+MISC ChangeLog 4367 RMD160 e9af41f54774832ca8abade5c969a13e59e3d3b0 SHA1 9d935be708732a7a136c075737b53e7a942c04ea SHA256 cf73c7c15e25b3958c2e79e1a6d75ce9ab0f0342157ba46f70d9a8550a1cfe65
 MISC metadata.xml 251 RMD160 c5c4d068db64874834210e9d079dc4c0348d158d SHA1 53753c8d7372db5ef3f6cf4466710f4adb88b770 SHA256 81d55ba998d5de47f2c20f34348288325123e94ecf9912337c48a0a7196ac43c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOSTc1AAoJEEb+UGWnxTyHtBAP/RS57hFySO8/RuhpWmQB/9iW
-BfiVH43cNMGSBdnG/njm7y2Uy7vSS3Rztvl34Ek2ye0IEFYRjGa+aJ5QU8ulxaEP
-6U/O1Alw5WLj9yB4pM1CEKloNKWL8ILS8obuFPLu3Y0VvvM8xsyEdIHCPDR5EAX+
-QnGzIVe2j4LXqrv7x/RAIzHqA7TVrb+X+KkkJFf+wOyKRIZ/jhBmwH+FSQaWcRL1
-34umjIPX8zqLkz2r6okUCapaUU9q5QHq64utbJ9wVvHKLMMuJEYfTP4oyXaObmRw
-3Vm1uWlNk54scFc3gg+2ISP9v6/4eBEkY0k/sFEiBFBGrdvcyQNRj9iNXvXG2rQy
-6jLYIF7zYAX8ohQHBRhOvsoAlSsFkDe2e3FocXulUellxL03UtiuN+iVsfe7Frbb
-9DT0viz4FxCRsBd8UZfxm4vtsq5qu8Yetc8onHXYLShea3CJUFmpX1NT2nmBb2c5
-1YQ4FrL4slqV4qZBTt24Z7VG2/PhGcvCHanVk2HWiVuao/2oVnMS3gQG2y2xUhkr
-w31br7uxPcbEnKNp1DNG6/qZvCV3d+7dQYV+jJk1GyBF4ZAt48/OwWX9/xQZmCJZ
-9sySpJW+EPDshe5NsplB0qZFsKCHKlDVA9zwiODydWzw9vsn5BUdUdZIHYqAaTr6
-vOq4k6Zky4+zhlCzAR3N
-=0+Q3
+iQIcBAEBCgAGBQJOZ/CuAAoJENwGBM22xffed1gQAIHJEDca3mjLxhIP1NVYsGSR
+x6JPsXL+Xnj4De2Sq+vgLDtelNAnyx9oaZNFAWuaE3UGfK5efoPlNd+gN06v09Vd
+kK7h+NtY4NdNB1mT5WawVGo0sjxIYMRf/QJd4OoEYDXnpI80+8hw3Thl8zdCkbHX
+8BX58vn+m4k00W8qB+uZtCeHu/q2vLGAZu7b2InVc91bclsaKph6U2spUr2erCqc
+8FVc9h0+q4/ErsdPcW4/nrpSYBj0HKEKHa3fBGIc8WN0j2AND1xOqB6brsf6ap/o
+7QoQvl6IumdPOT8V1iF2h2N0B1RFkCMlOaGliixOPVlQq3xxq+uksaqagv9gLRH9
+GXjxsTO8Km5+7bizMtjpW1NP6RWR0Ql7/GMkgpApPLILsSN4LI4c/S/OuUmHRv+I
+56t/onImMiintJn/NNEaTHCXwAAOe0EOlJaTKdQ/njh8Sp62I4IKPEJC+XmKR/oR
++CxILka4NS2Xtf5jiWRBmTrcEgzP97oIccxFOD5lqzDZ5UGahU2nKE07xxJA/ANn
+I/cvVXZ5cBazef47OczX5K+5krpyvaM31QveBiXrx31NvI8F/eVkOan9+Jv38GZj
+MESaf0yGVHNP/qmNf0RfNB3DptLQDsuQ+9ICLC8Pi31jK6kJ013madF6ZcRwNZJ4
+n4hS/2Ql2z3uKmMDxEcB
+=6ga1
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-nm09version.patch b/kde-misc/knetworkmanager/files/knetworkmanager-nm09version.patch
new file mode 100644
index 000000000000..8e30ba4dc06d
--- /dev/null
+++ b/kde-misc/knetworkmanager/files/knetworkmanager-nm09version.patch
@@ -0,0 +1,12 @@
+diff -ruN knetworkmanager-4.4.0_p30110815.orig/CMakeLists.txt knetworkmanager-4.4.0_p30110815/CMakeLists.txt
+--- knetworkmanager-4.4.0_p30110815.orig/CMakeLists.txt	2011-08-15 14:07:37.000000000 +0200
++++ knetworkmanager-4.4.0_p30110815/CMakeLists.txt	2011-09-08 00:27:18.655236639 +0200
+@@ -1,7 +1,7 @@
+ project(plasma-networkmanagement)
+ 
+ option(INSTALL_KNM_AUTOSTART "Install the autostart file for knetworkmanager. Warning: This prevents the plasmoid from working properly")
+-set (MINIMUM_NM_VERSION_REQUIRED "0.8.999")
++set (MINIMUM_NM_VERSION_REQUIRED "0.9.0")
+ 
+ find_package(KDE4 REQUIRED)
+ include (KDE4Defaults)
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild
index 371c384cc0b3..80117623d682 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild,v 1.1 2011/08/15 15:11:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild,v 1.2 2011/09/07 22:30:44 dilfridge Exp $
 
 #
 # NOTE: the "3" in the patchlevel is not a typo!!!
@@ -27,12 +27,14 @@ IUSE="consolekit debug"
 
 DEPEND="
 	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.8.9997
+	>=net-misc/networkmanager-0.9.0
 "
 RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-nm09version.patch" )
+
 src_prepare() {
 	kde4-base_src_prepare