summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-05-21 05:38:48 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-05-21 05:38:48 +0000
commit916d4ae5f79acfeccf5f14a9b0903d09398f411e (patch)
tree7f5c8433654838d707e21775b6e07a98f5721c41 /gnome-base/gnome-shell
parentTemporary workaround for autotools.eclass breakage (bug #416789). (diff)
downloadgentoo-2-916d4ae5f79acfeccf5f14a9b0903d09398f411e.tar.gz
gentoo-2-916d4ae5f79acfeccf5f14a9b0903d09398f411e.tar.bz2
gentoo-2-916d4ae5f79acfeccf5f14a9b0903d09398f411e.zip
Temporary workaround for autotools.eclass breakage (bug #416789).
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-shell')
-rw-r--r--gnome-base/gnome-shell/ChangeLog6
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild3
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index bf445875ac9a..b7529d7c661d 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-shell
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.13 2012/05/14 00:04:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.14 2012/05/21 05:38:48 tetromino Exp $
+
+ 21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-shell-3.2.2.1.ebuild, gnome-shell-3.4.1.ebuild:
+ Temporary workaround for autotools.eclass breakage (bug #416789).
*gnome-shell-3.4.1 (14 May 2012)
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
index 494afbcc9c00..a968e79c82b7 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild,v 1.4 2012/05/05 05:38:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild,v 1.5 2012/05/21 05:38:48 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -134,6 +134,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-3.2.1-optional-networkmanager.patch"
eautoreconf
+ intltoolize --automake --copy --force || die #416789
gnome2_src_prepare
# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
diff --git a/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild
index 8f6a90d56efa..e10dbebfb191 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild,v 1.1 2012/05/14 00:04:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild,v 1.2 2012/05/21 05:38:48 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -136,6 +136,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-3.4.0-libgnome-shell-js.so-link"-{1,2}.patch
eautoreconf
+ intltoolize --automake --copy --force || die #416789
gnome2_src_prepare
# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765