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

Package-Manager: portage-2.1.4.4

10 files changed, 14 insertions, 191 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/Manifest b/gnome-extra/nm-applet/Manifest
index 189677499546..a38c318372c7 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,16 +1,9 @@
-AUX 10-po_fr.patch 574 RMD160 1f68302ca19fd6ed14ce3148c8f2be709580fe06 SHA1 a14c13aca776ccbbf7bd47f64b1e58deaa828c22 SHA256 a90bc48287bd05ce532d2ecd6110a1f458afc493d0ec28a1cf7fa00d357c1487
-AUX 11-po_de.patch 376 RMD160 e9a7db7683acbd3ece2d7e1e6d942b8bfea99130 SHA1 c6d889b804748c52cb47425ef8b15a9471237be5 SHA256 82db0e29e68c3bd1217a6c7990a69bbee884f7cf887f7184fb0aaaffe4bc9ed9
-AUX 12-po_jp.patch 599 RMD160 f29f345398f1d2eb2da11423158255a79acc3f22 SHA1 da4a06c76e5c070632c8bbfbfd5a00f5e2aa5a93 SHA256 43e7b00691bb53dcfeae119fdd136244331c483dc39918326518b43573a3bd95
 AUX nm-applet-0.6.5-confchanges.patch 978 RMD160 4e506d4653affb6d01902c40100ebb2cffd122b8 SHA1 e9088c5767d5e9598b99dae84ad88023f1746262 SHA256 716d2c6abbc010d0fe42916a279b18262d97cc37e955f04c47b7ca27c8786fec
-AUX nm-applet-makefile.am-2.patch 659 RMD160 d973b535d38b9a2152931e0532c500bba7b92a74 SHA1 a17681638baaeed0976f9aa9cc2ecb9b76dbcac1 SHA256 261e8abf677f2b3d967df1073395abdfe4acc72a258ff2d08e4f861ffbda0cc6
-AUX nm-applet-po-linguas.patch 994 RMD160 c3c81b8d778229661889616dd4670e10a5ee8a8f SHA1 0034542858d63dbd6437536ff620cdc1c48b953b SHA256 cbc73b376d4a060351bdfcad556f8fd0683abc6cb58467c53db36b0d6e7cc875
-AUX nm-applet-potfiles.patch 345 RMD160 1cb0eccf3bb5041f5b3630c9988d139744c43f47 SHA1 870eb8f85b07ac4f06c10a02d1ed7272900e7251 SHA256 c684683de997d459b046db339f7540f6f13f88ae0afa607112b54e9d430a6768
-AUX nm-editor-fdo-categories.patch 409 RMD160 0329581426fd85f0b5335000b113399be881ee4f SHA1 a7f09202d153e91025c2c426dff1b5159181a54d SHA256 48f29f6c4329b7d8d8f17f7f7cdbee0c6bbebf921fcf7447713bb605f6f330ae
 DIST network-manager-applet-0.6.5.tar.gz 715346 RMD160 e4a578d4707476258a539a8b083be539cd28ee50 SHA1 0ce53953b121ea14cc0fe3e371af2144d01b1a91 SHA256 8f0c83cb608845e7afcbc3640fdf74b0bbaa76babcc5b9a8aaac2177e13552bc
-DIST nm-applet-0.6.5.98.tar.gz 763361 RMD160 1ff5a0e58f316fb90d01a3cf5c33ab67fc170f4e SHA1 cfd990d631c4892ad0eef43094b7ee25a72c00ef SHA256 7de821ed6088aa59d4003ec5405a4370f974a2209289d9cf194e8899ff054ea1
 DIST nm-applet-0.6.5_p20080208.tar.gz 780726 RMD160 7f7de8441dedcc3d64313131077329393f5cd996 SHA1 ca764bcd1b3873c96336d3f849ab186f30e54b17 SHA256 bab2fd46f949be0d551e1a365e2e65165805851ad0130812d54753b93facd2c4
-EBUILD nm-applet-0.6.5.98.ebuild 2493 RMD160 8e69a410723dcabe8a7708225bbf05abdfc14e1f SHA1 1238a2f7933df2d76d76e8f7bf1cbe277a7c0c08 SHA256 16ff8e9f9dd2ff37cc859bd10e98e706eba62dfe8475f9df1b45d33a59c5e4ac
+DIST nm-applet-0.6.6.tar.gz 781511 RMD160 4a6e1a2051cd2e77b4077b6218570760e04cd383 SHA1 da572c48ae9ecb5c9ba61c0ed8fd06567dcbc4e3 SHA256 8eb264d5838d1f9e2e507a570cb23dc54e11505023b71b6868cee31da2dff38d
 EBUILD nm-applet-0.6.5.ebuild 1721 RMD160 a832b26c08b73f5ea70c50ab30aeea00834b7c95 SHA1 2ba893dcea0e14a19ad9df8abd5f5518fbeb377c SHA256 4db35530293c54087e6af68b7c42297ad2ad2243c99b93613484cce39136e72b
 EBUILD nm-applet-0.6.5_p20080208.ebuild 1852 RMD160 0584c40d0479532023793f21b62c1e19ce963d8c SHA1 090fce1122a99fdd4927e532310fb40aa77d7bd7 SHA256 8d18e57d8ed68b13d0aad25e97404ffc4d78258c9167bdca1fc8fe6468c88e82
-MISC ChangeLog 2997 RMD160 cba7ed633c5f2dff551e52f345b34b651d0cc87b SHA1 60d6912cef1dc09e519db862378067f798472b99 SHA256 fb3fdfd546f153fd3df33c284ad73aa8be03842c98fae5932e827d2b67816009
+EBUILD nm-applet-0.6.6.ebuild 1822 RMD160 8b8886470073879767c03a3a11698e153e4284be SHA1 67b84eabb510df6859f7aa54f97eff6e871305fc SHA256 40fa9562d3c6de8e6848d3ea1c8a2e63bb73f603913b66dfdf59deec464e164b
+MISC ChangeLog 3431 RMD160 6235b87469fc131d6a17df8f99df17fe6743f699 SHA1 3f472ffd7768c0b1b9fc22c8b41790c196114718 SHA256 9732b64db4681a8c44b1681405d6fb6424c32b2e41c7c51954b745cc182bbe63
 MISC metadata.xml 260 RMD160 3bd2ac88342783f1ced38fe5de95da8d94db7c1c SHA1 7bcafc6b129a5890b55be1edf868f2e8751e7307 SHA256 94e8a0c83eb641ff321069cd9c7ee00744ffecb329ff14dc3a76773a8d2e228c
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() {