Version bump. Translation updates.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 37 insertions, 9 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/Manifest b/gnome-base/gnome-applets/Manifest
index cab174706e35..e3bcffc0558b 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX gnome-applets-2.26.1-automagic-networkmanager.patch 1601 RMD160 748c0b5b2f3fb088669717a3c9d3e53951891d0d SHA1 70bf11d1a628270ea32b939dd1a08117e982f052 SHA256 5102332db7758817f970ffb6ba3751ad03a8c47f1950d59d706d5f6d3ba31ac1
+AUX gnome-applets-2.26.3-documentation-fix.patch 582 RMD160 c8dc16e2e50369c539914f39eb58030d38197caf SHA1 56accfe9073a35fbba03dc794996f160f4e9da11 SHA256 8007ebd047e600b53bd3a9f6a1c8917083cb03e06b826cf0d7bfae5a6b4d4d61
 DIST gnome-applets-2.24.3.1.tar.bz2 7880607 RMD160 aa36ca16e88821a860d825bff9ab94e144e283f7 SHA1 cc9a121bb06f687c221902c24dbdbe37bd68b07f SHA256 b9a3d207b78755c49c49bf780815f3b25fd16b6c23f3815cdeb41b5c7d685185
-DIST gnome-applets-2.26.1.tar.bz2 8786596 RMD160 f76aa8a6b03e1375bad3bce5e2ee1b477a2e9097 SHA1 42b678064e4d0923c2130ac02f488871b9db7c88 SHA256 87a2262dd777a31dafda23d91da42f7b17e542dea51b5597ecada4fa74793a07
 DIST gnome-applets-2.26.2.tar.bz2 9056741 RMD160 3605219a5b3f2c9f23c34b72a226f9950d7d1341 SHA1 5126d80c8661ab6b85850e919d2d295693e0ee7e SHA256 9f6a1b7454d28cbd1dd0f57ae0eaccce2b49a7a8f528b498f9a5864300d9ec32
+DIST gnome-applets-2.26.3.tar.bz2 9544328 RMD160 34035faeac68a44433a3a558963f2b571e650c41 SHA1 52279066e6b0e0af664b4cf6404123bf51fe2791 SHA256 f6e93d98cbb45f15fff605966eca5e4172cd4404509d612b03da748b9e2e0ee5
 EBUILD gnome-applets-2.24.3.1.ebuild 3260 RMD160 7e170270d1eafe9179ac29211ec75df83e05f403 SHA1 56f858b21a9026ed6dc92aab82e9d7b5d836964b SHA256 5c508fd83bcd4ae10d3845f9a85ba8b5c55d05f7fb79ef68e9ecbc7cc85c0a5b
-EBUILD gnome-applets-2.26.1.ebuild 3901 RMD160 bf62d2699cd07b32900d828ee19ff89f47ef9411 SHA1 b777407c14f2419dd5c31064c56d7c239141cf13 SHA256 c1ae80dc37d24ddd36c8e3eca8881cd63d9a6e9202df28e371cd5ec49481414f
 EBUILD gnome-applets-2.26.2.ebuild 3904 RMD160 b0f9afff41f2caf3b1b936a37b8562119693e926 SHA1 6f76f64815c62560f5dfb27cebf44a718ab3257b SHA256 3db4ed885e1e41a7675d8cf4f75b72c3cd9679ec53073aff065c6e03432bfcda
-MISC ChangeLog 41866 RMD160 2dca4aef830c7d52dd935cba09fb739f2b9a33df SHA1 267161c91640eb513307b7092b8c77eb429e9d79 SHA256 8e212cde14522fa566385d202f5bcda6c383e18c57cb954a8fb36ab5c112f6eb
+EBUILD gnome-applets-2.26.3.ebuild 4194 RMD160 63e98a2897b212d15b9049c23771e48a8ef0058e SHA1 54c279d990baff993173d150c3852499acd2e1d3 SHA256 4336e4b87872d267c1b1101b554b2aeeb681817551a7b9355183da28a6bcdada
+MISC ChangeLog 42107 RMD160 c09f4b80039c54db8c6815f433ad25d7dccf56b2 SHA1 167c6fc1bab2110187e2cbed4f467402abaad717 SHA256 d925e61ffc6fee99e6840a275cff6c00689de0b880c278aa14d57a6d783c0c41
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko51ikACgkQ/ejvha5XGaN8KwCggqP8lmVKYd55bQEgLuFxlmVS
-B9gAn1Vfy+sCF5R39a+yvL5css1ll664
-=Yy6e
+iEYEARECAAYFAkpjklQACgkQ1fmVwcYIWAYBRACdH1lCs5XPAY/CYyP7QlI8VVLy
+XmIAoLealFV2hrQnHx/PBLpNFf3Ueb3W
+=egXQ
 -----END PGP SIGNATURE-----
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
 }