New version of NM gentoo plugin

3 files changed, 143 insertions, 1 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 4e42e3f..ee027be 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.47 2009/06/10 22:03:19 dagger Exp $
 
+*networkmanager-0.8-r104 (30 Jun 2010)
+
+  30 Jun 2010; Robert Piasek <dagger@gentoo.org>
+  +networkmanager-0.8-r104.ebuild:
+  New snapshot of Gentoo plugin for NM.
+
 *networkmanager-0.8-r102 (27 May 2010)
 
   27 May 2010; Robert Piasek <dagger@gentoo.org>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 646c7ca..1e72d82 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,7 +5,9 @@ AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 S
 DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
 DIST systemsettings.patch 200974 RMD160 4117558ecfeadb9f90a8c373b7c830709e93ffd0 SHA1 11d588c679e8023cbe1faea1b3a02c82274b7ceb SHA256 1a82be455b2bbc646f49b884e8bb66bf7830b32a7a53b6eb84d759bab4b0b929
 DIST systemsettings3.patch 257594 RMD160 7d48aee550327e087ccd1fd107284b6340075b35 SHA1 09e6664314d7d134454e82d90a82e5853eb44887 SHA256 eace49bfaa61eb34de9d238da132ca6dbd0c14fc1d6fb135658921088107390d
+DIST systemsettings4.patch 259626 RMD160 3165b12f4e8497f02001d03c805d207323c7e2f1 SHA1 32ab99e5e67f7e0578b36b68613201982d985d49 SHA256 07c6fc868a0efe641071ade681e3ff81ca6bf34e57c6a5806d22bf5c68efed1d
 EBUILD networkmanager-0.8-r100.ebuild 3859 RMD160 3d96abb136d4e14d4e194b2b225115df740e63e2 SHA1 b30d251190c0213b205e6bd27bdebd67e171dc81 SHA256 0b9352cc7dfa134bb162fa11c0739e223d332bfdbbd6ad6ad10a9eff3c6a4007
 EBUILD networkmanager-0.8-r102.ebuild 3861 RMD160 d137946fb1f078fbf8e2919aad1c4b2f173b0311 SHA1 bc133ae919e17fbc490bd2dc75afd8a37a21d7c8 SHA256 e67f4af5a7ea99c637d74306cd12e7cce0387ea35f739dd4c6bf0cd888033b57
-MISC ChangeLog 11683 RMD160 9182e38003ed46ec2f89953726ed7c0da862f0bd SHA1 72c8e8bfacf1d67ba2102d14245f60c40acbda00 SHA256 414e78b8f68b675eb3022f1e8914c50ccb9981f93db07811a844861cf66422ed
+EBUILD networkmanager-0.8-r104.ebuild 3861 RMD160 27bd563f553db07d63dc0ef8edd5c17e8aafbdb4 SHA1 46d04b196b1e8680a4ae79f767be311691fabef7 SHA256 d768c9e34407412d019c87840f61fc4fd5d21aa57c4b6f64a1ba6a7731fca491
+MISC ChangeLog 11848 RMD160 709f4f5cc62203d76d3adf7fbcc1852b8c5a1ff2 SHA1 97d51cb382d0dbfc06da8562bf68b9add3776915 SHA256 74505f15207222bb9b0c2579e4b988c38cde6af51edd7c7810ee44adb1c34651
 MISC metadata.xml 969 RMD160 c16683ef7fed4b5603029ae39f5872032ec37554 SHA1 813e0b48a78ce50d5257030507d22fd0e9452161 SHA256 e4375eae4ff0d47386780e4d29575e6581f7c9b89168372bb1bb7713a452c02f
diff --git a/net-misc/networkmanager/networkmanager-0.8-r104.ebuild b/net-misc/networkmanager/networkmanager-0.8-r104.ebuild
new file mode 100644
index 0000000..0363767
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.8-r104.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.2 2010/04/13 18:13:22 armin76 Exp $
+
+EAPI="2"
+
+inherit gnome.org eutils autotools
+
+# NetworkManager likes itself with capital letters
+MY_PN=${PN/networkmanager/NetworkManager}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}
+	http://patches.piasek.co.uk/systemsettings4.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd resolvconf connection-sharing"
+
+RDEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.75
+	>=net-wireless/wireless-tools-28_pre9
+	>=sys-fs/udev-145[extras]
+	>=dev-libs/glib-2.18
+	>=sys-auth/polkit-0.92
+	>=dev-libs/libnl-1.1
+	>=net-misc/modemmanager-0.2
+	>=net-wireless/wpa_supplicant-0.5.10[dbus]
+	bluetooth? ( net-wireless/bluez )
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+	avahi? ( net-dns/avahi[autoipd] )
+	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 )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	net-dialup/ppp
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.8-confchanges.patch"
+
+	# Hack keyfile plugin to read hostname file, fixes bug 176873
+	epatch "${FILESDIR}/${P}-read-hostname.patch"
+
+	# Clear NSCD cache rather then kill daemon bug 301720
+	epatch "${FILESDIR}/${P}-nscd-clear-cache.patch"
+
+	# Gentoo system-plugin
+	epatch "${DISTDIR}/systemsettings4.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		--with-udev-dir=/etc/udev
+		--with-iptables=/sbin/iptables
+		$(use_enable doc gtk-doc)
+		$(use_with doc docs)
+		$(use_with resolvconf)"
+
+	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
+	if use dhclient ; then
+		if use dhcpcd ; then
+			ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+		else
+			ECONF="${ECONF} --with-dhcp-client=dhclient"
+		fi
+	else
+		ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+	fi
+
+	# default is NSS (if none or both are specified), GnuTLS otherwise
+	if use gnutls ; then
+		if use nss ; then
+			ECONF="${ECONF} --with-crypto=nss"
+		else
+			ECONF="${ECONF} --with-crypto=gnutls"
+		fi
+	else
+		ECONF="${ECONF} --with-crypto=nss"
+	fi
+
+	econf ${ECONF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
+
+	# 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 \
+		|| die "newins failed"
+}
+
+pkg_postinst() {
+	elog "You will need to restart DBUS if this is your first time"
+	elog "installing NetworkManager."
+	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 --user "USERNAME"'
+}