Bump to 0.9_rc3, from gnome overlay for great justice (and GNOME 3)

(Portage version: 2.2.0_alpha39_p14/cvs/Linux x86_64)

4 files changed, 190 insertions, 12 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 248768f66f68..5b0424b7ef6a 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.109 2011/08/14 09:04:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.110 2011/08/15 14:58:42 nirbheek Exp $
+
+*networkmanager-0.9_rc3 (15 Aug 2011)
+
+  15 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +networkmanager-0.9_rc3.ebuild,
+  +files/networkmanager-0.9_rc3-fix-tests.patch, metadata.xml:
+  Bump to 0.9_rc3, from gnome overlay for great justice (and GNOME 3)
 
   14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   networkmanager-0.8.4.0-r2.ebuild:
diff --git a/net-misc/networkmanager/files/networkmanager-0.9_rc3-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.9_rc3-fix-tests.patch
new file mode 100644
index 000000000000..7bd8a2bc0aa3
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.9_rc3-fix-tests.patch
@@ -0,0 +1,18 @@
+--- configure.ac
++++ configure.ac
+@@ -577,7 +577,6 @@
+ src/settings/plugins/ifupdown/Makefile
+ src/settings/plugins/ifupdown/tests/Makefile
+ src/settings/plugins/ifnet/Makefile
+-src/settings/plugins/ifnet/tests/Makefile
+ src/settings/plugins/ifcfg-rh/Makefile
+ src/settings/plugins/ifcfg-rh/tests/Makefile
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
+--- src/settings/plugins/ifnet/Makefile.am
++++ src/settings/plugins/ifnet/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . tests
++SUBDIRS = .
+ INCLUDES = \
+        -I$(top_srcdir)/src/settings \
+        -I$(top_srcdir)/include \
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 36784db1dd53..d2c3895a0df0 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -10,21 +10,28 @@
 		<email>nirbheek@gentoo.org</email>
 		<name>Nirbheek Chauhan</name>
 	</maintainer>
-        <maintainer>
-                <email>steev@gentoo.org</email>
-                <name>Stephen Klimaszewski</name>
-        </maintainer>
 	<maintainer>
 		<email>qiaomuf@gentoo.org</email>
 		<name>Mu Qiao</name>
 	</maintainer>
-
+	<maintainer>
+		<email>steev@gentoo.org</email>
+		<name>Stephen Klimaszewski</name>
+	</maintainer>
 	<use>
-		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip.</flag>
-		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip.</flag>
-		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography.</flag>
-                <flag name="ppp">Enable support for mobile broadband and PPPoE connections using <pkg>net-dialup/ppp</pkg>.</flag>
-		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS information</flag>
-		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and <pkg>net-firewall/iptables</pkg> for connection sharing </flag>
+		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
+			<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
+		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
+			getting ip</flag>
+		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
+		<flag name="ppp">Enable support for mobile broadband and PPPoE
+			connections using <pkg>net-dialup/ppp</pkg></flag>
+		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
+			DNS information</flag>
+		<flag name="wimax">Enable support for WiMAX connections using
+			<pkg>net-wireless/wimax</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild b/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild
new file mode 100644
index 000000000000..5d8a8939f9d5
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild,v 1.1 2011/08/15 14:58:42 nirbheek Exp $
+
+EAPI="4"
+GNOME_ORG_MODULE="NetworkManager"
+PATCHSET="${PN}-0.9-patches-0.1"
+REAL_PV="0.8.9997"
+
+inherit autotools eutils gnome.org linux-info systemd
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+# Replace our fake _rc version with the actual version
+SRC_URI="${SRC_URI//${PV}/${REAL_PV}}
+	mirror://gentoo/${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection
+	kernel_linux +ppp resolvconf connection-sharing wimax"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# make consolekit and/or polkit support optional ?
+COMMON_DEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.75
+	>=net-wireless/wireless-tools-28_pre9
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
+	>=dev-libs/glib-2.26
+	>=sys-auth/polkit-0.97
+	>=dev-libs/libnl-1.1
+	>=net-misc/modemmanager-0.4
+	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
+	bluetooth? ( >=net-wireless/bluez-4.82 )
+	avahi? ( net-dns/avahi[autoipd] )
+	gnutls? (
+		dev-libs/libgcrypt
+		net-libs/gnutls )
+	nss? ( >=dev-libs/nss-3.11 )
+	dhclient? ( net-misc/dhcp )
+	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
+	ppp? ( >=net-dialup/ppp-2.4.5 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )
+	wimax? ( >=net-wireless/wimax-1.5.1 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-auth/consolekit"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+# Replace our fake _rc version with the actual version
+S="${WORKDIR}/${GNOME_ORG_MODULE}-${REAL_PV}"
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See http://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See http://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+src_prepare() {
+	# Add useful patches from upstream git (fixing crashes, SSID parsing bugs,
+	# and significant usability problems).
+	epatch "${WORKDIR}/${PATCHSET}/"*.patch
+
+	# Don't build tests
+	epatch "${FILESDIR}/${P}-fix-tests.patch"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		--with-udev-dir=/lib/udev
+		--with-iptables=/sbin/iptables
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable ppp)
+		$(use_enable wimax)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(use_with doc docs)
+		$(use_with resolvconf)
+		$(systemd_with_unitdir)"
+
+		if use nss ; then
+			ECONF="${ECONF} $(use_with nss crypto=nss)"
+		else
+			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
+		fi
+
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+	# 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
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf
+
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+}