Add 0.6.5.98 (aka 0.6.6rc1) from upstream and some patches from Debian to use po/LINGUAS, updated translations, and fix a few other misc. issues.

(Portage version: 2.1.4.4)

9 files changed, 251 insertions, 1 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 30442db86e1d..bedc332f5673 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,16 @@
 # 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.14 2008/02/10 01:07:18 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.15 2008/02/14 07:33:12 steev Exp $
+
+*nm-applet-0.6.5.98 (14 Feb 2008)
+
+  14 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  +files/nm-applet-makefile.am-2.patch, +files/10-po_fr.patch,
+  +files/11-po_de.patch, +files/12-po_jp.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:
+  Add 0.6.5.98 (aka 0.6.6rc1) from upstream and some patches from Debian to
+  use po/LINGUAS, updated translations, and fix a few other misc. issues.
 
 *nm-applet-0.6.5_p20080208 (10 Feb 2008)
 
diff --git a/gnome-extra/nm-applet/files/10-po_fr.patch b/gnome-extra/nm-applet/files/10-po_fr.patch
new file mode 100644
index 000000000000..6c5d9260cd59
--- /dev/null
+++ b/gnome-extra/nm-applet/files/10-po_fr.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..25ceff2686af
--- /dev/null
+++ b/gnome-extra/nm-applet/files/11-po_de.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..61c066ccfeff
--- /dev/null
+++ b/gnome-extra/nm-applet/files/12-po_jp.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..d8a9f34f976c
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-makefile.am-2.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..1f04056f9dc3
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-po-linguas.patch
@@ -0,0 +1,68 @@
+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
new file mode 100644
index 000000000000..2ff7e37f6a34
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-potfiles.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..a35b01907056
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-editor-fdo-categories.patch
@@ -0,0 +1,13 @@
+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.5.98.ebuild
new file mode 100644
index 000000000000..17af2e431f20
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.6.5.98.ebuild
@@ -0,0 +1,75 @@
+# 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 $
+
+inherit autotools gnome2 eutils
+
+#MY_PV=${PV/_*/}
+
+DESCRIPTION="Gnome applet for NetworkManager."
+HOMEPAGE="http://people.redhat.com/dcbw/NetworkManager/"
+#SRC_URI="http://ftp.gnome.org/pub/gnome/sources/network-manager-applet/0.6/network-manager-applet-0.6.5.tar.gz"
+SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc libnotify"
+
+RDEPEND=">=sys-apps/dbus-0.60
+	>=sys-apps/hal-0.5
+	sys-apps/iproute2
+	>=net-misc/dhcdbd-1.4
+	>=net-misc/networkmanager-0.6.5_p20080130
+	>=net-wireless/wireless-tools-28_pre9
+	>=net-wireless/wpa_supplicant-0.4.8
+	>=dev-libs/glib-2.10
+	libnotify? ( >=x11-libs/libnotify-0.4.3 )
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-keyring-0.4
+	>=gnome-base/gnome-panel-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeui-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+USE_DESTDIR="1"
+
+G2CONF="${G2CONF} \
+	--disable-more-warnings \
+	--localstatedir=/var \
+	--with-dbus-sys=/etc/dbus-1/system.d \
+	$(use_with libnotify notify)"
+
+#S=${WORKDIR}/${PN}-${MY_PV}
+
+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() {
+	gnome2_pkg_postinst
+	elog "Your user needs to be in the plugdev group in order to use this"
+	elog "package.  If it doesn't start in Gnome for you automatically after"
+	elog 'you log back in, simply run "nm-applet --sm-disable"'
+	elog "You also need the notification area applet on your panel for"
+	elog "this to show up."
+}