diff options
| author |   Johannes Huber <johu@gentoo.org> | 2013-10-15 22:45:02 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-10-15 22:45:02 +0000 |
| commit | c38e9189317e2dcbee0ded32e5c8caa1a0c5b59d (patch) | |
| tree | e266a96d48534f8e34574e84df1000677f1afd56 /kde-misc | |
| parent | New package. Import from kde overlay. KDE networkmanager GUI. Alternative to ... (diff) | |
| download | gentoo-2-c38e9189317e2dcbee0ded32e5c8caa1a0c5b59d.tar.gz gentoo-2-c38e9189317e2dcbee0ded32e5c8caa1a0c5b59d.tar.bz2 gentoo-2-c38e9189317e2dcbee0ded32e5c8caa1a0c5b59d.zip | |
Block kde-misc/plasma-nm to prevent file collisions.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/networkmanagement/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-misc/networkmanagement/networkmanagement-0.9.0.8.ebuild | 6 | ||||
| -rw-r--r-- | kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/kde-misc/networkmanagement/ChangeLog b/kde-misc/networkmanagement/ChangeLog index fb737b9fb6c2..5928033984df 100644 --- a/kde-misc/networkmanagement/ChangeLog +++ b/kde-misc/networkmanagement/ChangeLog @@ -1,6 +1,10 @@ # 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.35 2013/10/12 11:09:58 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/ChangeLog,v 1.36 2013/10/15 22:45:02 johu Exp $ + + 15 Oct 2013; Johannes Huber <johu@gentoo.org> + networkmanagement-0.9.0.8.ebuild, networkmanagement-0.9.0.9.ebuild: + Block kde-misc/plasma-nm to prevent file collisions. 12 Oct 2013; Johannes Huber <johu@gentoo.org> networkmanagement-0.9.0.9.ebuild: diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.8.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.8.ebuild index 2e7ffd80debc..e1e59039506f 100644 --- a/kde-misc/networkmanagement/networkmanagement-0.9.0.8.ebuild +++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.8.ebuild @@ -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.8.ebuild,v 1.4 2013/06/16 11:55:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.8.ebuild,v 1.5 2013/10/15 22:45:02 johu Exp $ EAPI=5 @@ -24,7 +24,9 @@ DEPEND=" >=net-misc/networkmanager-0.9.4.0 openconnect? ( net-misc/openconnect ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-misc/plasma-nm +" src_configure() { local mycmakeargs=( diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild index 11f81479b0cd..8bfe92535154 100644 --- a/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild +++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild @@ -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.2 2013/10/12 11:09:58 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.9.ebuild,v 1.3 2013/10/15 22:45:02 johu Exp $ EAPI=5 @@ -27,6 +27,7 @@ DEPEND=" " RDEPEND="${DEPEND} !kde-base/solid + !kde-misc/plasma-nm " src_configure() { |