New upstream release. Unmentioned changes in the release notes include the update backend being committed for Gentoo, as well as new init scripts from compnerd. Remove files that were used by 0.6.5.98

(Portage version: 2.1.4.4)

3 files changed, 16 insertions, 75 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 1e6f7838cd13..a1fb6de5309a 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.29 2008/02/14 07:08:29 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.30 2008/03/07 09:27:02 steev Exp $
+
+  07 Mar 2008; Steev Klimaszewski <steev@gentoo.org>
+  -files/NM-po-linguas.patch, -networkmanager-0.6.5.98.ebuild,
+  +networkmanager-0.6.6.ebuild:
+  Remove the patches that 0.6.5.98 were using
+
+*networkmanager-0.6.6 (07 Mar 2008)
+
+  07 Mar 2008; Steev Klimaszewski <steev@gentoo.org>
+  -networkmanager-0.6.5.98.ebuild, +networkmanager-0.6.6.ebuild:
+  New upstream release. Unmentioned changes in the release notes include the
+  updated backend being committed for Gentoo, as well as new init scripts from
+  compnerd.
 
 *networkmanager-0.6.5.98 (14 Feb 2008)
 
diff --git a/net-misc/networkmanager/files/NM-po-linguas.patch b/net-misc/networkmanager/files/NM-po-linguas.patch
deleted file mode 100644
index 50b5defbbce8..000000000000
--- a/net-misc/networkmanager/files/NM-po-linguas.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(Revision 3318)
-+++ configure.in	(Arbeitskopie)
-@@ -46,8 +46,7 @@
- GETTEXT_PACKAGE=NetworkManager
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
--ALL_LINGUAS="ar be@latin bg bs ca cs da de dz el en_CA en_GB es et fi fr gl gu hr hu it ja ka ko lt pl mk nb ne nl pa pt_BR rw sk sq sr@Latn sr sv uk vi wa zh_CN zh_TW"
--AC_PROG_INTLTOOL([0.27.2])
-+IT_PROG_INTLTOOL([0.35.0])
- AM_GLIB_GNU_GETTEXT
- 
- dnl
-Index: po/LINGUAS
-===================================================================
---- po/LINGUAS	(Revision 0)
-+++ po/LINGUAS	(Revision 0)
-@@ -0,0 +1,45 @@
-+# please keep this list sorted alphabetically
-+#
-+ar
-+be@latin
-+bg
-+bs
-+ca
-+cs
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+fi
-+fr
-+gl
-+gu
-+hr
-+hu
-+it
-+ja
-+ka
-+ko
-+lt
-+pl
-+mk
-+nb
-+ne
-+nl
-+pa
-+pt_BR
-+rw
-+sk
-+sq
-+sr@Latn
-+sr
-+sv
-+uk
-+vi
-+wa
-+zh_CN
-+zh_TW
diff --git a/net-misc/networkmanager/networkmanager-0.6.5.98.ebuild b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
index d4a087139e2d..5c47ccfc1962 100644
--- a/net-misc/networkmanager/networkmanager-0.6.5.98.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5.98.ebuild,v 1.1 2008/02/14 07:08:29 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.6.ebuild,v 1.1 2008/03/07 09:27:02 steev Exp $
 
 inherit autotools gnome2 eutils
 
@@ -10,8 +10,7 @@ MY_P=${P/networkmanager/NetworkManager}
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
 # Release candidate for 0.6.6, Hosted in dcbw's redhat space.
-SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-0.6.5_p20070823-updatedbackend.patch.bz2"
+SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -64,25 +63,18 @@ src_unpack () {
 	unpack ${A}
 	cd "${S}"
 
-	# Update to use our backend
-	epatch "${WORKDIR}/${PN}-0.6.5_p20070823-updatedbackend.patch"
 	# Use the kernel headers
 	epatch "${FILESDIR}/${PN}-use-kernel-headers.patch"
 	# Fix the resolv.conf permissions
 	epatch "${FILESDIR}/${PN}-resolvconf-perms.patch"
 	# Fix up the dbus conf file to use plugdev group
 	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
-	# Switch NM to using po/LINGUAS
-	epatch "${FILESDIR}/NM-po-linguas.patch"
-	# Since the switch to LINGUAS, need to regen configure
-	eautoreconf
 }
 
 src_install() {
 	gnome2_src_install
 	# Need to keep the /var/run/NetworkManager directory
 	keepdir /var/run/NetworkManager
-	newinitd "${FILESDIR}/NetworkManagerDispatcher" NetworkManagerDispatcher
 }
 
 pkg_postinst() {