From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1P0tKD-0001Nc-Bf for garchives@archives.gentoo.org; Wed, 29 Sep 2010 09:51:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 064F2E05A4; Wed, 29 Sep 2010 09:51:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C5457E05FE for ; Wed, 29 Sep 2010 09:51:37 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 279DD1B413D for ; Wed, 29 Sep 2010 09:51:37 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2240) id A62ED20051; Wed, 29 Sep 2010 09:51:35 +0000 (UTC) From: "Nirbheek Chauhan (nirbheek)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, nirbheek@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-utils: ChangeLog gnome-utils-2.30.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog gnome-utils-2.30.0.ebuild X-VCS-Directories: gnome-extra/gnome-utils X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan Content-Type: text/plain; charset=utf8 Message-Id: <20100929095135.A62ED20051@flycatcher.gentoo.org> Date: Wed, 29 Sep 2010 09:51:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 68e8a73d-3275-4f02-a005-15f6ef6dffe0 X-Archives-Hash: d5327a5f84a0ed91e44ea5e71f46ed39 nirbheek 10/09/29 09:51:35 Modified: ChangeLog gnome-utils-2.30.0.ebuild Log: Fix problem with empty backslashes, bug 339074, avoid automake maintain= er-mode rebuild =20 (Portage version: 2.1.9.10/cvs/Linux x86_64) Revision Changes Path 1.204 gnome-extra/gnome-utils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-= utils/ChangeLog?rev=3D1.204&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-= utils/ChangeLog?rev=3D1.204&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-= utils/ChangeLog?r1=3D1.203&r2=3D1.204 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- ChangeLog 26 Sep 2010 19:39:24 -0000 1.203 +++ ChangeLog 29 Sep 2010 09:51:35 -0000 1.204 @@ -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; gnome-utils-2.30.0.ebuild: + Fix problem with empty backslashes, bug 339074, avoid automake + maintainer-mode rebuild =20 26 Sep 2010; gnome-utils-2.30.0.ebuild: Fix build issues with gtk+-2.22 by removing -D*DISABLE_DEPRECATED cfla= gs. 1.8 gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-= utils/gnome-utils-2.30.0.ebuild?rev=3D1.8&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-= utils/gnome-utils-2.30.0.ebuild?rev=3D1.8&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-= utils/gnome-utils-2.30.0.ebuild?r1=3D1.7&r2=3D1.8 Index: gnome-utils-2.30.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.3= 0.0.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnome-utils-2.30.0.ebuild 26 Sep 2010 19:39:24 -0000 1.7 +++ gnome-utils-2.30.0.ebuild 29 Sep 2010 09:51:35 -0000 1.8 @@ -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 $ =20 EAPI=3D"2" =20 @@ -51,8 +51,13 @@ gnome2_src_prepare =20 # 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 b= ump. + # 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=20 + find . -iname 'Makefile.in' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" =20 if ! use test ; then sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"