[gentoo-commits] gentoo-x86 commit in kde-misc/networkmanagement: networkmanagement-0.9.0.9.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in kde-misc/networkmanagement: networkmanagement-0.9.0.9.ebuild ChangeLog

[Johannes Huber (johu)]

johu        13/10/12 11:09:58

  Modified:             networkmanagement-0.9.0.9.ebuild ChangeLog
  Log:
  Raise minimal kde version and block kde-base/solid to prevent file collision wrt bug #487572.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

Revision  Changes    Path
1.2                  kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild?r1=1.1&r2=1.2

Index: networkmanagement-0.9.0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- networkmanagement-0.9.0.9.ebuild	16 Jun 2013 11:55:10 -0000	1.1
+++ networkmanagement-0.9.0.9.ebuild	12 Oct 2013 11:09:58 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild,v 1.1 2013/06/16 11:55:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild,v 1.2 2013/10/12 11:09:58 johu Exp $
 
 EAPI=5
 
@@ -8,6 +8,7 @@
 nb nds nl nn pl pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin
 sr@Latn sv tr uk zh_CN zh_TW"
 KDE_SCM="git"
+KDE_MINIMAL="4.11"
 inherit kde4-base
 
 DESCRIPTION="KDE frontend for NetworkManager"
@@ -24,7 +25,9 @@
 	>=net-misc/networkmanager-0.9.8.2
 	openconnect? ( net-misc/openconnect )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-base/solid
+"
 
 src_configure() {
 	local mycmakeargs=(



1.35                 kde-misc/networkmanagement/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/networkmanagement/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/networkmanagement/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/networkmanagement/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	16 Jun 2013 11:55:10 -0000	1.34
+++ ChangeLog	12 Oct 2013 11:09:58 -0000	1.35
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/networkmanagement
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/ChangeLog,v 1.34 2013/06/16 11:55:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/ChangeLog,v 1.35 2013/10/12 11:09:58 johu Exp $
+
+  12 Oct 2013; Johannes Huber <johu@gentoo.org>
+  networkmanagement-0.9.0.9.ebuild:
+  Raise minimal kde version and block kde-base/solid to prevent file collision
+  wrt bug #487572.
 
 *networkmanagement-0.9.0.9 (16 Jun 2013)