summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-02-15 03:56:39 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-02-15 03:56:39 +0000
commit9a64de2921a2bcf7e0729b55c498637cb867fa86 (patch)
tree57acbdfe0d801edd917b4c57676784341c643198 /gnome-base
parentDon't call elibtoolize multiple times or before eautoreconf (bug #403695, tha... (diff)
downloadgentoo-2-9a64de2921a2bcf7e0729b55c498637cb867fa86.tar.gz
gentoo-2-9a64de2921a2bcf7e0729b55c498637cb867fa86.tar.bz2
gentoo-2-9a64de2921a2bcf7e0729b55c498637cb867fa86.zip
Move gnome2_src_prepare after eautoreconf (bug #403685, thanks to Kris Hepler for reporting).
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/orbit/ChangeLog9
-rw-r--r--gnome-base/orbit/orbit-2.14.19-r1.ebuild7
2 files changed, 10 insertions, 6 deletions
diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 03e9c24e65ae..627ef821e9be 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/orbit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.181 2011/10/05 17:35:18 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.182 2012/02/15 03:56:39 tetromino Exp $
+
+ 15 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ orbit-2.14.19-r1.ebuild:
+ Move gnome2_src_prepare after eautoreconf (bug #403685, thanks to Kris Hepler
+ for reporting).
05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> orbit-2.14.19-r1.ebuild:
ppc/ppc64 stable wrt #369909
diff --git a/gnome-base/orbit/orbit-2.14.19-r1.ebuild b/gnome-base/orbit/orbit-2.14.19-r1.ebuild
index 17ae1b558964..c8243a51f7c9 100644
--- a/gnome-base/orbit/orbit-2.14.19-r1.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r1.ebuild,v 1.9 2011/10/05 17:35:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r1.ebuild,v 1.10 2012/02/15 03:56:39 tetromino Exp $
EAPI="3"
GCONF_DEBUG="yes"
@@ -35,8 +35,6 @@ pkg_setup() {
}
src_prepare() {
- gnome2_src_prepare
-
# Fix wrong process kill, bug #268142
sed "s:killall lt-timeout-server:killall timeout-server:" \
-i test/timeout.sh || die "sed 1 failed"
@@ -52,6 +50,7 @@ src_prepare() {
sed -i -e 's/test-mem //' test/Makefile.am || die
eautoreconf
+ gnome2_src_prepare
}
src_configure() {