diff options
Diffstat (limited to 'net-misc/networkmanager/networkmanager-9999.ebuild')
| -rw-r--r-- | net-misc/networkmanager/networkmanager-9999.ebuild | 97 |
1 files changed, 50 insertions, 47 deletions
diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild index 994da50..27cd950 100644 --- a/net-misc/networkmanager/networkmanager-9999.ebuild +++ b/net-misc/networkmanager/networkmanager-9999.ebuild @@ -1,54 +1,51 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit autotools eutils subversion +inherit autotools eutils git # NetworkManager likes itself with capital letters MY_P=${P/networkmanager/NetworkManager} DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -ESVN_REPO_URI="svn://svn.gnome.org/svn/NetworkManager/trunk" +EGIT_REPO_URI="git://anongit.freedesktop.org/NetworkManager/NetworkManager" -SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="doc gnome nss gnutls dhclient dhcpcd" - -S=${WORKDIR}/${MY_P} +KEYWORDS="~arm ~amd64 ~ppc ~x86" +IUSE="doc nss gnutls dhclient dhcpcd resolvconf" RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=sys-apps/hal-0.5.10 - >=net-wireless/wireless-tools-28_pre9 - >=dev-libs/glib-2.16 - >=sys-auth/policykit-0.8 - >=dev-libs/libnl-1.1 - >=net-wireless/wpa_supplicant-0.5.10 - || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) - - gnutls? ( - nss? ( >=dev-libs/nss-3.11 ) - !nss? ( dev-libs/libgcrypt - net-libs/gnutls ) ) - !gnutls? ( >=dev-libs/nss-3.11 ) - - dhclient? ( - dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) - !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )" + >=dev-libs/dbus-glib-0.75 + >=sys-apps/hal-0.5.10 + >=net-wireless/wireless-tools-28_pre9 + >=dev-libs/glib-2.16 + >=sys-auth/policykit-0.8 + >=dev-libs/libnl-1.1 + >=net-wireless/wpa_supplicant-0.5.10 + || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) + + gnutls? ( + nss? ( >=dev-libs/nss-3.11 ) + !nss? ( dev-libs/libgcrypt + net-libs/gnutls ) ) + !gnutls? ( >=dev-libs/nss-3.11 ) + + dhclient? ( + dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) + !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) + !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) + + resolvconf? ( net-dns/openresolv )" DEPEND="${RDEPEND} dev-util/pkgconfig dev-util/intltool net-dialup/ppp - >=dev-util/gtk-doc-1.8 - >=dev-util/intltool-0.35" + doc? ( >=dev-util/gtk-doc-1.8 )" -PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 ) - kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )" +PDEPEND=">=net-misc/modemmanager-0.2" S=${WORKDIR}/${MY_P} @@ -57,27 +54,28 @@ pkg_setup() { eerror "Please rebuild net-wireless/wpa_supplicant with the dbus useflag." die "Fix wpa_supplicant first." fi - } src_unpack () { - subversion_src_unpack ${A} - cd "${S}" - - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch" - gtkdocize - intltoolize - eautoreconf + git_src_unpack ${A} + cd "${S}" + + # Fix up the dbus conf file to use plugdev group + epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch" + gtkdocize + intltoolize + eautoreconf } src_compile() { ECONF="--disable-more-warnings \ --localstatedir=/var \ --with-distro=gentoo \ - --with-dbus-sys=/etc/dbus-1/system.d + --with-tests=no \ + --with-dbus-sys-dir=/etc/dbus-1/system.d $(use_enable doc gtk-doc) - $(use_with doc docs)" + $(use_with doc docs) + $(use_with resolvconf)" # default is dhcpcd (if none or both are specified), ISC dchclient otherwise if use dhclient ; then @@ -95,13 +93,13 @@ src_compile() { if use nss ; then ECONF="${ECONF} --with-crypto=nss" else - ECONF="${ECONF} --with-crypto=gnults" + ECONF="${ECONF} --with-crypto=gnutls" fi else ECONF="${ECONF} --with-crypto=nss" fi - econf ${ECONF} || die "econf failed" + econf ${ECONF} emake || die "emake failed" } @@ -111,11 +109,16 @@ src_install() { # Need to keep the /var/run/NetworkManager directory keepdir /var/run/NetworkManager - dodoc AUTHORS ChangeLog NEWS README TODO + # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts + keepdir /etc/NetworkManager/dispatcher.d + + dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" # Add keyfile plugin support + keepdir /etc/NetworkManager/system-connections insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf + newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \ + || die "newins failed" } pkg_postinst() { @@ -131,5 +134,5 @@ pkg_postinst() { elog "" elog "To save system-wide settings as a user, that user needs to have the" elog "right policykit privileges. You can add them by running:" - elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify "USERNAME"' + elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"' } |