summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-09-07 22:30:44 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-09-07 22:30:44 +0000
commit93fdca0cf7c14acea33f0f6f404e4ec9a6083df1 (patch)
treef7afb9fd0e1c1aa0b1553ccca19aee8c96b8ea41 /kde-misc/knetworkmanager
parentFix-up from last commit, thanks to Chris Mayo for pointing it out. (diff)
downloadgentoo-2-93fdca0cf7c14acea33f0f6f404e4ec9a6083df1.tar.gz
gentoo-2-93fdca0cf7c14acea33f0f6f404e4ec9a6083df1.tar.bz2
gentoo-2-93fdca0cf7c14acea33f0f6f404e4ec9a6083df1.zip
Try to blindly fix the networkmanager version problem from bug 381603
(Portage version: 2.1.10.13/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc/knetworkmanager')
-rw-r--r--kde-misc/knetworkmanager/ChangeLog7
-rw-r--r--kde-misc/knetworkmanager/files/knetworkmanager-nm09version.patch12
-rw-r--r--kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild6
3 files changed, 22 insertions, 3 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/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