Version bump for networkmanager-0.8.995.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

6 files changed, 221 insertions, 3 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 23e4fd3df93e..1c85832a84c3 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.100 2011/02/26 08:13:31 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.101 2011/03/09 07:56:21 qiaomuf Exp $
+
+*networkmanager-0.8.995 (09 Mar 2011)
+
+  09 Mar 2011; Mu Qiao <qiaomuf@gentoo.org> +networkmanager-0.8.995.ebuild,
+  +files/networkmanager-0.8.995-confchanges.patch,
+  +files/networkmanager-0.8.995-fix-tests.patch, metadata.xml:
+  Version bump for networkmanager-0.8.995.
 
 *networkmanager-0.8.2-r9 (26 Feb 2011)
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 25a518589f5d..1af3f51228b4 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -16,11 +16,15 @@ AUX networkmanager-0.8.2-fix-tests.patch 2156 RMD160 b549d50e96efe7f26402f5d9745
 AUX networkmanager-0.8.2-fix-timestamp.patch 950 RMD160 4217e0332457eae47eb6c2f87a91f87adad37970 SHA1 d9fcaed9f2622937137bb977fba2d1c123b35893 SHA256 7d1d123b0da02ca8f02ce13b805eec912334bf1981032a38dcd2ef7e422bbf81
 AUX networkmanager-0.8.2-ifnet-smarter-write.patch 5969 RMD160 d401c8eae69ea70f5bf08f2950a6e476a03f460b SHA1 9a1fde1c789b42ce6e3b0766125862bde962b4c8 SHA256 b4fbc482cbc22edfff0f89624d857cd35b6cb3d7fe85604c5453e7685eb4e12a
 AUX networkmanager-0.8.2-shared-connection.patch 15067 RMD160 3e878a999e92fdb6baffba6f2a12caa25a2ba2c6 SHA1 e9664c505bc19964082aa319c4d524e6cf6651e2 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6
+AUX networkmanager-0.8.995-confchanges.patch 1279 RMD160 1ff5b6d663aa4417beaf9c7630d710a17a1812b5 SHA1 634ad19b189509e75362e5cd7f069ca795b4aeba SHA256 7c9ed8dc35b5b6d0414f96902fbe8117408ad556af655c0afc593ec5a1beac28
+AUX networkmanager-0.8.995-fix-tests.patch 1166 RMD160 34f50bc37043a4beba0e30015e73841bb265aeef SHA1 28592f3c7fdebc7838a476b0436bb58e4e561b0a SHA256 a16a3ad7eb1a1a8a3562fbc15b200cfd22fc9444e410ba94399dcff5627f9357
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 DIST NetworkManager-0.8.1.tar.bz2 1505134 RMD160 82f5ad1a641fa49acf34604f89154c865f3d5fbc SHA1 778989ed73cfd7ec05714f77121fa8bfc1bf0981 SHA256 dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa
 DIST NetworkManager-0.8.2.tar.bz2 1629296 RMD160 d5ef4adfc74db4a77fadcbeb545175b2f49dfd9c SHA1 2c9a9f0317d2ad4fd8a05631211cfd6040070f8e SHA256 58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1
+DIST NetworkManager-0.8.995.tar.bz2 1793297 RMD160 47c51a3180d5c26c2fbfca183d1d70a0cedaab21 SHA1 b6f1dd23e8976f7f2c68b303081bee0ad8991d58 SHA256 821d37ac75c5327c432a855e26687065459f2b42139f82feebfa6696750ad88a
 DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
+DIST networkmanager-0.8.995-shared-connection.patch.bz2 5505 RMD160 8f4654fc57f63779dc56e38500c0dd0199df2eab SHA1 656933dda7d05ef7bd7f6cda29d40225ac6faac1 SHA256 ee7d005269a304fafef7208de89f480a4a901f29fea73f438adeb31b67b8b7b4
 DIST networkmanager-ifnet-540e40f.patch 268068 RMD160 954ffb9915fdd8ae650963b66aba7e185ddfe0c6 SHA1 0bd0cfcb02a0511d17179d2994e40a663b49dd6f SHA256 8a870fb5ed708eea5523b954e23be05471c5b6783cd2d0a19071a1d253fcab51
 EBUILD networkmanager-0.8-r1.ebuild 3682 RMD160 649d13ea5fda20abe261e0fcd74cb0cd3e76b907 SHA1 65fe9cb0447698ad20a51bf4c878ee2f5d36d07c SHA256 5e11ef6646e6ed5a9aeed68e321cd52aac35d052ebd61a0326d96d0badb60924
 EBUILD networkmanager-0.8.1-r6.ebuild 4784 RMD160 cdf8ca556319629e311744d84f08225e4509369f SHA1 72fc18c1e82eceddf57243d9c2cff9b5ebaeb046 SHA256 66170c5881519fd0c60b2fe6c0f1a55fda478833d2dc2947cae6080313bafae7
@@ -28,5 +32,6 @@ EBUILD networkmanager-0.8.2-r1.ebuild 4132 RMD160 1261ce2f0e499ece5e2ea4c010c862
 EBUILD networkmanager-0.8.2-r2.ebuild 4407 RMD160 6ecc01211eb01e86a6856a1379dfdb991177b0d9 SHA1 ae3cc0a5869fc26b155b9704b286e61a01899c8c SHA256 0ead477d6ed601be6d1e3e5fa2a4546cc9cbbde77703406287125b3b639c5db2
 EBUILD networkmanager-0.8.2-r6.ebuild 4837 RMD160 417fa42b1d369fedaa6b7aea043a80cb52fd81e8 SHA1 99779c8f7693c2aeec53c489fa2319e042242b6d SHA256 c591c769bea0660755c3913a879fe74ab6413e2e3e58e83fcf2f0e24f49597de
 EBUILD networkmanager-0.8.2-r9.ebuild 4941 RMD160 c183214554e338d4cef7bb26690b68b7fac9ec7b SHA1 28488b44d53e24963cc2679e7bdafbe140fade1a SHA256 957358e3a9ec961fc3a41830eb8cd93b2998b60c9ab6659fa5d399f49dfc0642
-MISC ChangeLog 20982 RMD160 cff30c4b7ca4e888121d5645c2e4da800efabfca SHA1 8e318f963aef10b66c03aaaa23b8409f4dd13795 SHA256 a375a5a91510f0bd3bcb07a662e7d83507aa8259f61b32624f087a1e0c041024
-MISC metadata.xml 1064 RMD160 28d68851ef6cb80bfef006ab6f88d2f93f44bee9 SHA1 ea76e3b1043d5933df8ed0531f89b0bc8e4b7d7c SHA256 ebb4664fb8edea0672a185e68c1cda3c0f3d5fa0ad906a50a67caafe380ef6be
+EBUILD networkmanager-0.8.995.ebuild 4497 RMD160 af16b966f8a8c2d461b9e394eac59e3395a70039 SHA1 f2f21a84b5f0245f94c3c8a964ec39c6849de06a SHA256 16ea63fa4a2334bb70bf4aae10664ee46fa82aaeb18f3d94616df0858d49cbf5
+MISC ChangeLog 21255 RMD160 1953edd1092d7f64b1d326302ead98941b731f12 SHA1 520e41cd3ed2dacaf7a514b0447812ddf50e7dfd SHA256 94cbac71715ad219649074dc849fc8dd97bd5bd7bf8ae17ecb2e34c58951e012
+MISC metadata.xml 1151 RMD160 1631406f9a50fc8556b6f5963c04f044f74acf26 SHA1 fc692876998ecf1fd45ae81fbb1baacb2d89bb92 SHA256 683ae58137d709a2cfb884211c47ea17cd3208e93acc9016f4ba6a703a2b63b6
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.995-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.8.995-confchanges.patch
new file mode 100644
index 000000000000..a5acc38c0dfe
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8.995-confchanges.patch
@@ -0,0 +1,25 @@
+--- src/NetworkManager.conf~	2010-11-03 13:04:05.000000000 +0000
++++ src/NetworkManager.conf	2010-12-17 12:12:48.391177001 +0000
+@@ -57,6 +57,9 @@
+                 <allow send_destination="org.freedesktop.NetworkManager"
+                        send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
+ 
++                <allow send_destination="org.freedesktop.NetworkManager"
++                       send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
++
+                 <deny send_destination="org.freedesktop.NetworkManager"
+                        send_interface="org.freedesktop.NetworkManager"
+                        send_member="SetLogging"/>
+@@ -73,6 +76,12 @@
+                        send_interface="org.freedesktop.NetworkManager"
+                        send_member="wake"/>
+         </policy>
++        <policy group="plugdev">
++                <allow send_destination="org.freedesktop.NetworkManager"/>
++
++                <deny send_destination="org.freedesktop.NetworkManager"
++                      send_interface="org.freedesktop.NetworkManager.PPP"/>
++        </policy>
+         <policy context="default">
+                 <deny own="org.freedesktop.NetworkManager"/>
+                 <deny own="org.freedesktop.NetworkManagerSystemSettings"/>
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.995-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.8.995-fix-tests.patch
new file mode 100644
index 000000000000..0b7415230aa2
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8.995-fix-tests.patch
@@ -0,0 +1,23 @@
+diff -urN NetworkManager-0.8.995/configure.ac NetworkManager-0.8.995-patched//configure.ac
+--- NetworkManager-0.8.995/configure.ac	2011-03-05 04:39:53.000000000 +0800
++++ NetworkManager-0.8.995-patched//configure.ac	2011-03-09 15:30:18.831000026 +0800
+@@ -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
+diff -urN NetworkManager-0.8.995/src/settings/plugins/ifnet/Makefile.in NetworkManager-0.8.995-patched//src/settings/plugins/ifnet/Makefile.in
+--- NetworkManager-0.8.995/src/settings/plugins/ifnet/Makefile.in	2011-03-05 04:40:28.000000000 +0800
++++ NetworkManager-0.8.995-patched//src/settings/plugins/ifnet/Makefile.in	2011-03-09 15:30:54.228000025 +0800
+@@ -367,7 +367,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-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 727197659ca0..9d020836f801 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -25,5 +25,6 @@
 		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography.</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="wimax">Use <pkg>net-wireless/wimax</pkg> to enable WiMAX support </flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-0.8.995.ebuild b/net-misc/networkmanager/networkmanager-0.8.995.ebuild
new file mode 100644
index 000000000000..b539edd4965d
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.8.995.ebuild
@@ -0,0 +1,157 @@
+# 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.8.995.ebuild,v 1.1 2011/03/09 07:56:21 qiaomuf Exp $
+
+EAPI="2"
+
+inherit eutils gnome.org linux-info
+
+# 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}}
+	mirror://gentoo/${P}-shared-connection.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf
+connection-sharing wimax"
+
+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.4
+	>=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 ) )
+	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )
+	wimax? ( net-wireless/wimax )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=net-dialup/ppp-2.4.5
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+S=${WORKDIR}/${MY_P}
+
+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_setup() {
+	# FIXME. Required by -confchanges.patch, but the patch is invalid as
+	# ConsoleKit and PolicyKit is enough to get authorization.
+	enewgroup plugdev
+
+	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() {
+	# dbus policy patch
+	epatch "${FILESDIR}/${P}-confchanges.patch"
+	# ifnet plugin fix
+	epatch "${WORKDIR}/${P}-shared-connection.patch"
+	# fix tests
+	epatch "${FILESDIR}/${P}-fix-tests.patch"
+}
+
+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_enable wimax)
+		$(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-dhcpcd --without-dhclient"
+		else
+			ECONF="${ECONF} --with-dhclient --without-dhcpcd"
+		fi
+	else
+		ECONF="${ECONF} --with-dhcpcd --without-dhclient"
+	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-ifnet" nm-system-settings.conf \
+		|| die "newins failed"
+}
+
+pkg_postinst() {
+	elog "You will need to reload DBus if this is your first time installing"
+	elog "NetworkManager, or if you're upgrading from 0.7 or older."
+	elog ""
+}