[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-shell-extensions: ChangeLog gnome-shell-extensions-3.2.2.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-shell-extensions: ChangeLog gnome-shell-extensions-3.2.2.ebuild

[Alexandre Rostovtsev (tetromino)]

tetromino    11/12/12 19:56:13

  Modified:             ChangeLog gnome-shell-extensions-3.2.2.ebuild
  Log:
  Fix building with <intltool-0.50 (bug #394445, thanks to poncho for reporting).
  
  (Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  gnome-extra/gnome-shell-extensions/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	11 Dec 2011 23:47:05 -0000	1.2
+++ ChangeLog	12 Dec 2011 19:56:13 -0000	1.3
@@ -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)
 



1.2                  gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild?r1=1.1&r2=1.2

Index: gnome-shell-extensions-3.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-shell-extensions-3.2.2.ebuild	11 Dec 2011 23:47:05 -0000	1.1
+++ gnome-shell-extensions-3.2.2.ebuild	12 Dec 2011 19:56:13 -0000	1.2
@@ -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 @@
 	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() {