Fix building with <intltool-0.50 (bug #394445, thanks to poncho for reporting).

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

diff --git a/gnome-extra/gnome-shell-extensions/ChangeLog b/gnome-extra/gnome-shell-extensions/ChangeLog
index 473043aeeba0bada127e24d654a8fd84d397b7b4..25dbcd8d2028e70dac0b6150040b5ec30b920494 100644 (file)
--- a/gnome-extra/gnome-shell-extensions/ChangeLog
+++ b/gnome-extra/gnome-shell-extensions/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-shell-extensions
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v 1.2 2011/12/11 23:47:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v 1.3 2011/12/12 19:56:13 tetromino Exp $
+
+  12 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-shell-extensions-3.2.2.ebuild:
+  Fix building with <intltool-0.50 (bug #394445, thanks to poncho for
+  reporting).
 
 *gnome-shell-extensions-3.2.2 (11 Dec 2011)
 

diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index a42da4ba676d4edc78ea5dfde6c2e5d38763a494..90e268b7e2d6f5aba058b0cbfefa00c4e177c5ae 100644 (file)
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -10,13 +10,13 @@ DIST gnome-shell-extensions-3.2.0.tar.xz 123724 RMD160 ab32152b0425c95a22e85e5b5
 DIST gnome-shell-extensions-3.2.2-patches-1.tar.xz 3956 RMD160 3d5c5f6f11829d71799cd302c8ce4b8abd25d004 SHA1 ea8471f6da32a6e2d38f1bc3763cd25dbacd54ef SHA256 612e20ff42b7395b4a6fcdedf61fca0e5fef2d0ca7a9a7205d459be1fbbf30eb
 DIST gnome-shell-extensions-3.2.2.tar.xz 131456 RMD160 3c6281e6367cbf488b9a96e5f4594a7c35002a85 SHA1 cc82195f54baa2bb2f2540c0961dd0a68c1c0c7b SHA256 fdc8dae089e67cd2d4425d32c66f6344ae026879f980c44537b17141c23468c9
 EBUILD gnome-shell-extensions-3.2.0-r2.ebuild 2626 RMD160 5a5b5301bb2904c4f14ad9ecab1e0d9b4d18f260 SHA1 427afa0b2fed4dd38dead90a1f80a6e336fc942d SHA256 336489d29acfded4ed5524b5da7d2b07d561904bd0d98cb78a9372757a676090
-EBUILD gnome-shell-extensions-3.2.2.ebuild 2633 RMD160 5cdfcc35bff7e3bcb81fdadce8e388732e30c8ce SHA1 b0dd6f3e6a1b752c3f55158f2c99a0ca738785f2 SHA256 d23a4ab05301026b9fd73434c2892ad26b0cb6deffa15dca719f12eb442891f9
-MISC ChangeLog 1353 RMD160 a561bd48a038390b31c7aae9b264fd1a5bb757e0 SHA1 5c50665193453505d12b423134966333bcb4ef53 SHA256 3267d6d3af4cd340bcc387228c5c4a40438e14372d60b359f446db240cd0008e
+EBUILD gnome-shell-extensions-3.2.2.ebuild 2814 RMD160 8c5fb6eb018f334b69e2e53518ad172eb326cbd7 SHA1 78491f7403526af558932cabbf5292eb7eab636f SHA256 eb0a60db5fb429a20dfd154f92388c206db841aff0bfb2b91ee4d8562a7847f6
+MISC ChangeLog 1536 RMD160 4f123e02e8c3fa08060fd9b2e4a405d44dbaf1b5 SHA1 ea92d1ee02af2b16df00ee77ea8bde83fc48f3e7 SHA256 d85910d9b255b3433c99434f3735750adb96097db899335161094a60404119f8
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7lQP8ACgkQdjK8w9WeBnDoEAEArct11WUgfWSn9TELNty91Mnl
-ysGTthzS9cfNw3trD7MA/AyJL9nSLVRmAnx43VFQ/P9PtJfDAHEpDJTEPEfzcoaA
-=mM2c
+iF4EAREIAAYFAk7mXGMACgkQdjK8w9WeBnDVMAEAryfvR9Llm8IX6b9tuh6ae3PD
+TLO/7ODFtejlqViijXwA/Rj+/oXz21GicetvcQZ+zA1/HrjqowdyoVDbKBY8HPXz
+=zSJ3
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild
index e0ad00edc5f32e5fa7fc31711b7ffe969001f330..6241bdf3648b7863004557c54671674010ddbdd9 100644 (file)
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild,v 1.1 2011/12/11 23:47:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild,v 1.2 2011/12/12 19:56:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -50,6 +50,10 @@ src_prepare() {
        epatch ../patch/*.patch
 
        gnome2_src_prepare
+
+       # Work around intltool-0.50.0's intltool.m4 backwards incompat; bug #394445
+       sed -e 's:\($(INTLTOOL_MERGE) -x -u \)--no-translations:\1/tmp:' \
+               -i configure || die "sed failed"
 }
 
 src_install() {