Remove NM-0.8.995, will add it later when it's working properly.

(Portage version: 2.1.9.42/cvs/Linux x86_64)

5 files changed, 1 insertions, 214 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 1c85832a84c3..52fa876e916e 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,13 +1,6 @@
 # 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.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.
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.102 2011/03/09 11:17:23 qiaomuf Exp $
 
 *networkmanager-0.8.2-r9 (26 Feb 2011)
 
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.995-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.8.995-confchanges.patch
deleted file mode 100644
index a5acc38c0dfe..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.995-confchanges.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index 0b7415230aa2..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.995-fix-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 9d020836f801..727197659ca0 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -25,6 +25,5 @@
 		<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
deleted file mode 100644
index b539edd4965d..000000000000
--- a/net-misc/networkmanager/networkmanager-0.8.995.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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 ""
-}