diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-11-08 23:27:05 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-11-08 23:27:05 +0100 |
| commit | 60c73c38e8b371eecdc10379535368bcbe3e14c3 (patch) | |
| tree | 3bc58aaacda071ac0cf345bb6664915d2c99a416 | |
| parent | f22b77018a00177a8738802c248f6718861c8fe4 (diff) | |
| download | kde-60c73c38e8b371eecdc10379535368bcbe3e14c3.tar.gz kde-60c73c38e8b371eecdc10379535368bcbe3e14c3.tar.bz2 kde-60c73c38e8b371eecdc10379535368bcbe3e14c3.zip | |
[kde-misc/knetworkmanager] Update live ebuild. Drop snapshot. For christ sake next time use tarball.
| -rw-r--r-- | kde-misc/knetworkmanager/Manifest | 3 | ||||
| -rw-r--r-- | kde-misc/knetworkmanager/knetworkmanager-0.9_pre20091104.ebuild | 42 | ||||
| -rw-r--r-- | kde-misc/knetworkmanager/knetworkmanager-9999.ebuild | 32 |
3 files changed, 24 insertions, 53 deletions
diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest index 48d399bc026..9fb08ddc3af 100644 --- a/kde-misc/knetworkmanager/Manifest +++ b/kde-misc/knetworkmanager/Manifest @@ -1,3 +1,2 @@ -EBUILD knetworkmanager-0.9_pre20091104.ebuild 954 RMD160 3807d4d95c083e75e52dac5c33b4cf900adba3e7 SHA1 476a705dae2a93fdd042204822eee295c32ddda3 SHA256 9f1d36be036a0725b93b6e0c1f0bbe2a958fd3a878b4e797d36b90112874e33e -EBUILD knetworkmanager-9999.ebuild 761 RMD160 a067c7209b987a74bca1df0e37ae36e7a0a19e6a SHA1 bf72b2df117b1d5342c80391a47bf6b573127ba6 SHA256 afdc15cc4e653eaa176d46c9a5c5a07663520bd6f75a1b2d0d633f546abaffd5 +EBUILD knetworkmanager-9999.ebuild 1323 RMD160 e138a18d9967922774d87601e70a066b0d937c68 SHA1 de93990af1fcc1d24d782975aad1bccaf4858627 SHA256 0a3ad8761aca1a9bd930751cb525b747d38798d9adace67e07f34419912509d7 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-misc/knetworkmanager/knetworkmanager-0.9_pre20091104.ebuild b/kde-misc/knetworkmanager/knetworkmanager-0.9_pre20091104.ebuild deleted file mode 100644 index 529426eec1a..00000000000 --- a/kde-misc/knetworkmanager/knetworkmanager-0.9_pre20091104.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit kde4-base subversion - -ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager@1044410" - -DESCRIPTION="KDE frontend for NetworkManager" -HOMEPAGE="http://kde.org/" - -LICENSE="GPL-2 LGPL-2" -KEYWORDS="" -SLOT="4" -IUSE="debug" - -DEPEND=" - !kde-misc/networkmanager-applet - >=kde-base/solid-${KDE_MINIMAL}[networkmanager] - >=net-misc/networkmanager-0.7 -" -RDEPEND="${DEPEND}" - -src_configure() { - - # Fix dbus policy - sed -i 's/at_console=".*"/group="plugdev"/' \ - "${S}/NetworkManager-kde4.conf" \ - || die "Fixing dbus policy failed" - - # remove plasmoid, doesnt work - sed -i 's/add_subdirectory(applet)//' \ - "${S}/CMakeLists.txt" \ - || die "removing plasmoid failed" - - mycmakeargs="${mycmakeargs} - -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d" - - kde4-base_src_configure -} diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild index 7afc743f2dd..4d4f9cc3dc6 100644 --- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild +++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild @@ -4,8 +4,8 @@ EAPI="2" -KMNAME="playground/base/plasma/applets" -KMMODULE="networkmanager" +KMNAME="playground/base/plasma/applets" +KMMODULE="networkmanager" inherit kde4-base DESCRIPTION="KDE frontend for NetworkManager" @@ -14,22 +14,36 @@ HOMEPAGE="http://kde.org/" LICENSE="GPL-2 LGPL-2" KEYWORDS="" SLOT="4" -IUSE="debug" +IUSE="consolekit debug +networkmanager wicd" DEPEND=" !kde-misc/networkmanager-applet - >=kde-base/solid-${KDE_MINIMAL}[networkmanager] + >=kde-base/solid-${KDE_MINIMAL}[networkmanager?,wicd?] >=net-misc/networkmanager-0.7 + consolekit? ( sys-auth/consolekit ) " RDEPEND="${DEPEND}" -src_configure() { +pkg_setup() { + if ! use networkmanager && ! use wicd; then + eerror "You need to pick up one of the backend implementations" + eerror " * networkmanager" + eerror " * wicd" + die "No backend selected" + fi - # Fix dbus policy - sed -i 's/at_console=".*"/group="plugdev"/' \ - "${S}/NetworkManager-kde4.conf" \ - || die "Fixing dbus policy failed" + kde4-base_pkg_setup +} +src_configure() { + if ! use consolekit; then + # Fix dbus policy + sed -i \ + -e 's/at_console=".*"/group="plugdev"/' \ + "${S}/NetworkManager-kde4.conf" \ + || die "Fixing dbus policy failed" + fi + mycmakeargs="${mycmakeargs} -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d" |