summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-02 00:51:49 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-02 00:51:49 +0000
commit22b18e2e80c01ad83636ad071d934a57efefbaee (patch)
tree3b833602da603ece217fa6d937143ffc0ab7c27c /gnome-extra
parentStable for AMD64, wrt bug #395843 (diff)
downloadgentoo-2-22b18e2e80c01ad83636ad071d934a57efefbaee.tar.gz
gentoo-2-22b18e2e80c01ad83636ad071d934a57efefbaee.tar.bz2
gentoo-2-22b18e2e80c01ad83636ad071d934a57efefbaee.zip
Move gnome2_src_prepare after eautoreconf (bug #396713, thanks to Julian W. for reporting).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/gnome-power-manager/ChangeLog9
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild8
2 files changed, 11 insertions, 6 deletions
diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 644a13881d1c..bb28f12a277b 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/gnome-power-manager
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.166 2011/11/25 06:58:03 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.167 2012/01/02 00:51:49 tetromino Exp $
+
+ 02 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-power-manager-2.32.0-r2.ebuild:
+ Move gnome2_src_prepare after eautoreconf (bug #396713, thanks to Julian W.
+ for reporting).
25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
-gnome-power-manager-3.0.2-r1.ebuild,
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild
index d159a0521710..d1c7f285cb3e 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.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-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild,v 1.5 2011/10/30 16:21:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild,v 1.6 2012/01/02 00:51:49 tetromino Exp $
EAPI="4"
GNOME_TARBALL_SUFFIX="bz2"
@@ -75,8 +75,6 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
- gnome2_src_prepare
-
# Fix intltoolize broken file, see upstream #577133
sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
|| die "sed libtoolize failed"
@@ -110,6 +108,8 @@ src_prepare() {
intltoolize --force --copy --automake || die "intltoolize failed"
eautoreconf
+ gnome2_src_prepare
+
# This needs to be after eautoreconf to prevent problems like bug #356277
if ! use doc; then
# Remove the docbook2man rules here since it's not handled by a proper