summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild')
-rw-r--r--gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild11
1 files changed, 8 insertions, 3 deletions
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild
index 7461b4e17472..30b2070ad48d 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild,v 1.7 2010/09/26 19:39:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild,v 1.8 2010/09/29 09:51:35 nirbheek Exp $
EAPI="2"
@@ -51,8 +51,13 @@ src_prepare() {
gnome2_src_prepare
# Remove idiotic -D.*DISABLE_DEPRECATED cflags
- find . -iname 'Makefile.*' -exec \
- sed -e 's/-D[A-Z_]*DISABLE_DEPRECATED//g' -i {} + || die "sed 1 failed"
+ # This method is kinda prone to breakage. Recheck carefully with next bump.
+ # bug 339074
+ find . -iname 'Makefile.am' -exec \
+ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
+ # Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+ find . -iname 'Makefile.in' -exec \
+ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
if ! use test ; then
sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"