Version bump. Translation updates.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 30 insertions, 3 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 143aebba35c8..8fa74d01c33f 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.290 2009/05/24 14:03:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.291 2009/07/19 21:38:22 eva Exp $
+
+*gnome-applets-2.26.3 (19 Jul 2009)
+
+  19 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-applets-2.26.1.ebuild, +gnome-applets-2.26.3.ebuild,
+  +files/gnome-applets-2.26.3-documentation-fix.patch:
+  Version bump. Translation updates.
 
   24 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
   gnome-applets-2.26.1.ebuild:
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.26.3-documentation-fix.patch b/gnome-base/gnome-applets/files/gnome-applets-2.26.3-documentation-fix.patch
new file mode 100644
index 000000000000..0daa88cc29e2
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.26.3-documentation-fix.patch
@@ -0,0 +1,13 @@
+Subject: Fix documentation to validate.
+Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=589058
+--- mixer/docs/zh_CN/mixer_applet2.xml	2009-07-19 23:29:32.000000000 +0200
++++ mixer/docs/zh_CN/mixer_applet2.xml	2009-07-19 23:29:56.000000000 +0200
+@@ -252,7 +252,7 @@
+ 		  </varlistentry> 
+ 		</variablelist> 
+ 
+-<para>单击<guibutton>关闭</guibutton>可关闭<guilabel>音量控制首选项<guilabel>对话框。</guilabel></guilabel></para>
++<para>单击<guibutton>关闭</guibutton>可关闭<guilabel>音量控制首选项</guilabel>对话框。</para>
+ 
+ </sect1>
+ </article>
diff --git a/gnome-base/gnome-applets/gnome-applets-2.26.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.26.3.ebuild
index 83571af9ae75..84304b8089b9 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.26.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.26.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.26.1.ebuild,v 1.4 2009/05/24 14:03:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.26.3.ebuild,v 1.1 2009/07/19 21:38:23 eva Exp $
 
 inherit autotools eutils gnome2 python
 
@@ -74,11 +74,18 @@ src_unpack() {
 	ln -s $(type -P true) py-compile
 
 	# Networmanager is automagic, bug #266056
-	epatch "${FILESDIR}/${P}-automagic-networkmanager.patch"
+	epatch "${FILESDIR}/${PN}-2.26.1-automagic-networkmanager.patch"
 
 	# Make it libtool-1 compatible, bug #266248
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 
+	# Invest applet tests need gconf/proxy/...
+	sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
+		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
+
+	# Fix documentation validation, upstream bug #589058
+	epatch "${FILESDIR}/${P}-documentation-fix.patch"
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }