summaryrefslogtreecommitdiff
path: root/kde-misc/knetworkmanager
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-12 11:08:59 +0200
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-12 11:09:14 +0200
commit5e7a32c79bc94338c598e84e990deedbe48ec833 (patch)
treed50bf335568996b1e3c7eeaf88f21ee69f37a4e5 /kde-misc/knetworkmanager
parentef33508158c88afd2f070aba68ee606ee629e507 (diff)
downloadkde-5e7a32c79bc94338c598e84e990deedbe48ec833.tar.gz
kde-5e7a32c79bc94338c598e84e990deedbe48ec833.tar.bz2
kde-5e7a32c79bc94338c598e84e990deedbe48ec833.zip
Drop wicd and networkmanager useflags. Fix dependencies for 0.9 nm series.
Diffstat (limited to 'kde-misc/knetworkmanager')
-rw-r--r--kde-misc/knetworkmanager/Manifest2
-rw-r--r--kde-misc/knetworkmanager/knetworkmanager-9999.ebuild19
2 files changed, 8 insertions, 13 deletions
diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest
index 3efcd3cb2be..845c3b811bc 100644
--- a/kde-misc/knetworkmanager/Manifest
+++ b/kde-misc/knetworkmanager/Manifest
@@ -1,2 +1,2 @@
-EBUILD knetworkmanager-9999.ebuild 1205 RMD160 2251dd930b23ae756900873067b7ab82c5cfd24a SHA1 3cc0e8f8aaf0ba9663288f5959801811938e8879 SHA256 44531407abfec434650e478396f76e129455a3817a10e89acf5b99537bc67eaa
+EBUILD knetworkmanager-9999.ebuild 967 RMD160 7876c2f9cb3f2d48972fb5029ba4f31935ef2818 SHA1 657572e503549e188fd1e5a51e4b30d94bcd0ac9 SHA256 09ceb6dfda5edcdb6a3d24be1565f8bb8853632c3fea0b65f231ffe58779704a
MISC metadata.xml 301 RMD160 3e2112d23805982b5fc816bc6fef1f71b4415a2b SHA1 9bb446718c9b5a238a218ee744b0fea754b68ef1 SHA256 a24dfda69e4b52de8c2d46c361a6855da37e98afbd0c6f13e34149c7c0e01ce1
diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index d23ad3c7e37..7262161f230 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=3
-KDE_MINIMAL="4.5"
+KDE_MINIMAL="4.6"
KDE_SCM="git"
EGIT_REPONAME="networkmanagement"
@@ -18,26 +18,21 @@ HOMEPAGE="http://kde.org/"
LICENSE="GPL-2 LGPL-2"
KEYWORDS=""
SLOT="4"
-IUSE="consolekit debug +networkmanager wicd"
+IUSE="consolekit debug"
+# From 0.9 networkmanager the solid is not used
DEPEND="
- $(add_kdebase_dep solid 'networkmanager?,wicd?')
net-misc/mobile-broadband-provider-info
- >=net-misc/networkmanager-0.7
- consolekit? ( sys-auth/consolekit )
- !wicd? ( $(add_kdebase_dep solid 'networkmanager') )
+ || (
+ >=net-misc/networkmanager-0.8.80
+ $(add_kdebase_dep solid 'networkmanager')
+ )
"
RDEPEND="${DEPEND}"
-RESTRICT="test"
-
src_prepare() {
kde4-base_src_prepare
- #removing monolithic version
- sed -e "s:add_subdirectory(monolithic):#add_subdirectory(monolithic):" \
- -i CMakeLists.txt || die "removing monolithic NM failed"
-
if ! use consolekit; then
# Fix dbus policy
sed -i \