diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2010-09-29 09:51:35 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2010-09-29 09:51:35 +0000 |
| commit | 8590c57439040223d4393d7c451b01e5cb92b3cd (patch) | |
| tree | 7398fc38f8f40f5c659485f4a1a193e19f832863 /gnome-extra/gnome-utils | |
| parent | Fix install of missing documentation (bug #304619 by Flameeyes) and add prope... (diff) | |
| download | gentoo-2-8590c57439040223d4393d7c451b01e5cb92b3cd.tar.gz gentoo-2-8590c57439040223d4393d7c451b01e5cb92b3cd.tar.bz2 gentoo-2-8590c57439040223d4393d7c451b01e5cb92b3cd.zip | |
Fix problem with empty backslashes, bug 339074, avoid automake maintainer-mode rebuild
(Portage version: 2.1.9.10/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/gnome-utils')
| -rw-r--r-- | gnome-extra/gnome-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog index a3bd78ab79b8..5fd9d1f92b76 100644 --- a/gnome-extra/gnome-utils/ChangeLog +++ b/gnome-extra/gnome-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gnome-utils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.203 2010/09/26 19:39:24 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.204 2010/09/29 09:51:35 nirbheek Exp $ + + 29 Sep 2010; <nirbheek@gentoo.org> gnome-utils-2.30.0.ebuild: + Fix problem with empty backslashes, bug 339074, avoid automake + maintainer-mode rebuild 26 Sep 2010; <nirbheek@gentoo.org> gnome-utils-2.30.0.ebuild: Fix build issues with gtk+-2.22 by removing -D*DISABLE_DEPRECATED cflags. 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" |