Fix bug #318561 and remove old and broken versions.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index f9e6c2cc55aaff3c2a9d1a4e3210aba83ae4a922..e41ad17c6d848bef07a894b5146186fe921e967c 100644 (file)
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.97 2010/05/04 16:14:48 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.98 2010/05/05 17:54:14 pacho Exp $
+
+*gvfs-1.4.3-r1 (05 May 2010)
+
+  05 May 2010; Pacho Ramos <pacho@gentoo.org> -gvfs-1.4.3.ebuild,
+  +gvfs-1.4.3-r1.ebuild:
+  Revision bump to fix translation due broken intltoolize file (bug #318561,
+  thanks a lot to Jeremy Guitton for reporting the problem). Remove broken
+  version.
 
   03 May 2010; Olivier Crête <tester@gentoo.org> gvfs-1.4.3.ebuild:
   amd64 stable, bug #314899

diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 65d5e4210568dfbb8e1496ee5b999fdd3fe88313..734123b3fe43d3d56f29629647e30b91b55e7fe5 100644 (file)
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -6,13 +6,13 @@ AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f
 DIST gvfs-1.2.3.tar.bz2 1041079 RMD160 ea8469449073b9a0e50fde4301fa5bc4ff5bbe56 SHA1 c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4 SHA256 395d480c1b64504ba75a8deb70ef6790f2ff07538fca73ef1d26a996223e5879
 DIST gvfs-1.4.3.tar.bz2 1263024 RMD160 da1458101257f5496b4469acb7bc7c646fd9c652 SHA1 3c28516893d6829b3bbae1768fb44e8a405c44e7 SHA256 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d
 EBUILD gvfs-1.2.3.ebuild 2196 RMD160 3e91f2df2a75b28f528bc907812aad7a43e97d67 SHA1 b38ce67504f22e129fe3c751dc464d20383aab1f SHA256 618733ea882b30cb8e28e33f6d8087e09ddcff700372c7c2832ed0895e1638f6
-EBUILD gvfs-1.4.3.ebuild 2853 RMD160 1fef5ab7317ea949a829890308e526976f0e3cc6 SHA1 0196ccf6ec644099e4cd7876b92db6b31821a466 SHA256 54cef0e837af4adec855a2c4f6f1196e9a8f2932f64baa7e3b627cc277276b0e
-MISC ChangeLog 13726 RMD160 65beb76e474e598e414e4c9d17d5f5a244d2d082 SHA1 0bb839345a0f70f6e391e76990bbc3b2614ca595 SHA256 6c23794727edd4064eeecfdb1856af510891a72d11fe9a465c941689f4ec924c
+EBUILD gvfs-1.4.3-r1.ebuild 2998 RMD160 16d1eff0bbc3aa23280aa2b9e059651484e8b167 SHA1 ba1d7604bda10bd5713739815268f920d73fc50e SHA256 6a73e9cd66b91c90725a487d0c8cbd3f4f04ab071b0fc124bbf3e0c53d9f68e1
+MISC ChangeLog 14010 RMD160 8884403b7c7585986c14cdc1f7e5627ebb82c299 SHA1 7c5bd386979f7e2a7542645022e391a90afffa01 SHA256 ca8553757a69e20422fbb0d8efc7202428883d7d84b8411345cfd543c440031d
 MISC metadata.xml 1026 RMD160 9f60ad05b950ee45d8500c8640f26021f397ab5f SHA1 dd73b18963c0beb12f4ea099833c1376952f0c3b SHA256 b5aa8baad5d63d30113e894a8630e80fb5350dbd91903949e336bd604925fd38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvgSAIACgkQmOfEJZHYOKekogCfS84OaZR+eN1FW8j1s9Zyon9T
-wF8An2W1WmzrD1j62zjnK00HgDTzftsI
-=HRTl
+iEYEARECAAYFAkvhsMwACgkQCaWpQKGI+9TunACeNH/6HSGdWEdp5ZDmhErW7PpQ
+ihEAn0u7g4n3DHc9lBIVl4JDjE2RhjUd
+=2Aqq
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/gvfs/gvfs-1.4.3.ebuild b/gnome-base/gvfs/gvfs-1.4.3-r1.ebuild
similarity index 90%
rename from gnome-base/gvfs/gvfs-1.4.3.ebuild
rename to gnome-base/gvfs/gvfs-1.4.3-r1.ebuild
index 24b97aafa8b5f0fd8d65a7f354e12fe858571db4..7f86500e6b765923c5855e48937475ce09b391a2 100644 (file)
--- a/gnome-base/gvfs/gvfs-1.4.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.3.ebuild,v 1.8 2010/05/04 16:14:48 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.3-r1.ebuild,v 1.1 2010/05/05 17:54:14 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal
 +http samba +udev"
 
@@ -86,6 +86,10 @@ src_prepare() {
                echo "mount-archive.desktop.in.in" >> po/POTFILES.in
        fi
 
+       # Fix intltoolize broken file, see upstream #577133
+       sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+               || die "sed failed"
+
        use gphoto2 || use archive && eautoreconf
 }