New upstream release, remove the old patches that 0.6.5.98 were using.

(Portage version: 2.1.4.4)

9 files changed, 11 insertions, 181 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index bedc332f5673..7672d0e461b7 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.15 2008/02/14 07:33:12 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.16 2008/03/07 09:25:47 steev Exp $
+
+*nm-applet-0.6.6 (07 Mar 2008)
+
+  07 Mar 2008; Steev Klimaszewski <steev@gentoo.org> -files/10-po_fr.patch,
+  -files/12-po_jp.patch, -files/nm-applet-makefile.am-2.patch,
+  -files/11-po_de.patch, -files/nm-applet-po-linguas.patch,
+  -files/nm-applet-potfiles.patch, -files/nm-editor-fdo-categories.patch,
+  -nm-applet-0.6.5.98.ebuild, +nm-applet-0.6.6.ebuild:
+  New upstream release, remove the old patches that 0.6.5.98 were using.
 
 *nm-applet-0.6.5.98 (14 Feb 2008)
 
diff --git a/gnome-extra/nm-applet/files/10-po_fr.patch b/gnome-extra/nm-applet/files/10-po_fr.patch
deleted file mode 100644
index 6c5d9260cd59..000000000000
--- a/gnome-extra/nm-applet/files/10-po_fr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: po/fr.po
-===================================================================
-RCS file: /cvs/gnome/NetworkManager/po/fr.po,v
-retrieving revision 1.2.6.2
-diff -u -3 -p -r1.2.6.2 fr.po
---- po/fr.po	12 Jun 2006 15:47:57 -0000	1.2.6.2
-+++ po/fr.po	30 Nov 2006 17:29:17 -0000
-@@ -250,7 +250,7 @@ msgstr "_Se connecter à un autre résea
- 
- #: ../gnome/applet/applet.c:1562
- msgid "Create _New Wireless Network..."
--msgstr "Créer_un nouveau réseau sans fil..."
-+msgstr "Créer _un nouveau réseau sans fil..."
- 
- #: ../gnome/applet/applet.c:1685
- msgid "_VPN Connections"
diff --git a/gnome-extra/nm-applet/files/11-po_de.patch b/gnome-extra/nm-applet/files/11-po_de.patch
deleted file mode 100644
index 25ceff2686af..000000000000
--- a/gnome-extra/nm-applet/files/11-po_de.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: po/de.po
-===================================================================
---- po/de.po	(Revision 2227)
-+++ po/de.po	(Arbeitskopie)
-@@ -276,7 +276,7 @@
- #. 'Enable Networking' item
- #: ../gnome/applet/applet.c:2170
- msgid "Enable _Networking"
--msgstr "Netzwerk_aktivieren"
-+msgstr "Netzwerk _aktivieren"
- 
- #. 'Enable Wireless' item
- #: ../gnome/applet/applet.c:2176
diff --git a/gnome-extra/nm-applet/files/12-po_jp.patch b/gnome-extra/nm-applet/files/12-po_jp.patch
deleted file mode 100644
index 61c066ccfeff..000000000000
--- a/gnome-extra/nm-applet/files/12-po_jp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- po/ja.po.orig	2006-06-17 04:46:19.000000000 +0900
-+++ po/ja.po	2007-06-26 20:51:13.000000000 +0900
-@@ -204,7 +204,7 @@
- 
- #: ../gnome/applet/applet.c:1093
- msgid "Wired network connection"
--msgstr "無線ネットワーク接続"
-+msgstr "有線ネットワーク接続"
- 
- #: ../gnome/applet/applet.c:1097
- msgid "Connected to an Ad-Hoc wireless network"
-@@ -382,7 +382,7 @@
- #: ../gnome/applet/menu-items.c:88
- #, c-format
- msgid "Wired Network (%s)"
--msgstr "無線ネットワーク (%s)"
-+msgstr "有線ネットワーク (%s)"
- 
- #: ../gnome/applet/menu-items.c:91
- msgid "_Wired Network"
diff --git a/gnome-extra/nm-applet/files/nm-applet-makefile.am-2.patch b/gnome-extra/nm-applet/files/nm-applet-makefile.am-2.patch
deleted file mode 100644
index d8a9f34f976c..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-makefile.am-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: Makefile.am
-===================================================================
---- Makefile.am	(Revision 525)
-+++ Makefile.am	(Arbeitskopie)
-@@ -11,14 +11,14 @@
- dbusservice_DATA = nm-applet.conf
- 
- toolsdir = $(datadir)/nm-applet
--tools_DATA = nm-disconnect-wireless-on-exit.sh
-+tools_SCRIPTS = nm-disconnect-wireless-on-exit.sh
- 
- EXTRA_DIST +=				\
- 	$(dbusservice_DATA)		\
--	nm-applet.desktop		\
--	$(tools_DATA)
-+	$(autostart_DATA)		\
-+	$(tools_SCRIPTS)
- 
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update
- 
--autostartdir = $(datadir)/gnome/autostart
-+autostartdir = $(sysconfdir)/xdg/autostart
- autostart_DATA = nm-applet.desktop
diff --git a/gnome-extra/nm-applet/files/nm-applet-po-linguas.patch b/gnome-extra/nm-applet/files/nm-applet-po-linguas.patch
deleted file mode 100644
index 1f04056f9dc3..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-po-linguas.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(Revision 525)
-+++ configure.ac	(Arbeitskopie)
-@@ -49,8 +49,7 @@
- GETTEXT_PACKAGE=nm-applet
- 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 ko lt pl mk nb ne nl pa pt pt_BR ru rw sk sl sq sr@Latn sr sv tr uk vi wa zh_CN zh_HK 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,49 @@
-+# 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
-+ko
-+lt
-+pl
-+mk
-+nb
-+ne
-+nl
-+pa
-+pt
-+pt_BR
-+ru
-+rw
-+sk
-+sl
-+sq
-+sr@Latn
-+sr
-+sv
-+tr
-+uk
-+vi
-+wa
-+zh_CN
-+zh_HK
-+zh_TW
diff --git a/gnome-extra/nm-applet/files/nm-applet-potfiles.patch b/gnome-extra/nm-applet/files/nm-applet-potfiles.patch
deleted file mode 100644
index 2ff7e37f6a34..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-potfiles.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: po/POTFILES.in
-===================================================================
---- po/POTFILES.in	(Revision 525)
-+++ po/POTFILES.in	(Arbeitskopie)
-@@ -11,6 +11,7 @@
- src/menu-items.c
- src/nm-gconf-wso.c
- src/nm-gconf-wso-wpa-eap.c
-+src/nm-wired-dialog.c
- src/other-network-dialog.c
- src/passphrase-dialog.c
- src/vpn-password-dialog.c
diff --git a/gnome-extra/nm-applet/files/nm-editor-fdo-categories.patch b/gnome-extra/nm-applet/files/nm-editor-fdo-categories.patch
deleted file mode 100644
index a35b01907056..000000000000
--- a/gnome-extra/nm-applet/files/nm-editor-fdo-categories.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: editor/nm-editor.desktop
-===================================================================
---- editor/nm-editor.desktop	(Revision 525)
-+++ editor/nm-editor.desktop	(Arbeitskopie)
-@@ -6,7 +6,7 @@
- Exec=nm-editor
- Terminal=false
- Type=Application
--Categories=System;SystemSetup;
-+Categories=Network;Settings;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=NetworkManager
diff --git a/gnome-extra/nm-applet/nm-applet-0.6.5.98.ebuild b/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild
index 17af2e431f20..6e1e801003a4 100644
--- a/gnome-extra/nm-applet/nm-applet-0.6.5.98.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-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/gnome-extra/nm-applet/nm-applet-0.6.5.98.ebuild,v 1.1 2008/02/14 07:33:12 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.6.6.ebuild,v 1.1 2008/03/07 09:25:47 steev Exp $
 
 inherit autotools gnome2 eutils
 
@@ -49,20 +49,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
-	#Patches from Debian, use po/LINGUAS, update translations
-	epatch "${FILESDIR}/${PN}-po-linguas.patch"
-	epatch "${FILESDIR}/${PN}-potfiles.patch"
-	epatch "${FILESDIR}/10-po_fr.patch"
-	epatch "${FILESDIR}/11-po_de.patch"
-	epatch "${FILESDIR}/12-po_jp.patch"
-	# Patches from Debian, use an fdo compliant category for the editor.
-	# install nm-disconnect-wireless-on-exit.sh as a script.
-	# install nm-applet autostart file according to the fdo spec
-	epatch "${FILESDIR}/nm-editor-fdo-categories.patch"
-	epatch "${FILESDIR}/${PN}-makefile.am-2.patch"
-	eautoreconf
-	# Eva, next time, please comment on what you are doing.
-#	echo "src/nm-wired-dialog.c" >> po/POTFILES.in
 }
 
 pkg_postinst() {