Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/gd: ChangeLog gd-2.0.35-r3.ebuild
Date: Mon, 05 Mar 2012 06:54:41
Message-Id: 20120305065429.BE5982004B@flycatcher.gentoo.org
1 vapier 12/03/05 06:54:29
2
3 Modified: ChangeLog gd-2.0.35-r3.ebuild
4 Log:
5 Restore sed -r flag after refactor in previous commit lost it #406933 by Drake Donahue.
6
7 (Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.82 media-libs/gd/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.82&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.82&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?r1=1.81&r2=1.82
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v
19 retrieving revision 1.81
20 retrieving revision 1.82
21 diff -u -r1.81 -r1.82
22 --- ChangeLog 2 Mar 2012 06:59:29 -0000 1.81
23 +++ ChangeLog 5 Mar 2012 06:54:29 -0000 1.82
24 @@ -1,6 +1,10 @@
25 # ChangeLog for media-libs/gd
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.81 2012/03/02 06:59:29 ulm Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.82 2012/03/05 06:54:29 vapier Exp $
29 +
30 + 05 Mar 2012; Mike Frysinger <vapier@g.o> gd-2.0.35-r3.ebuild:
31 + Restore sed -r flag after refactor in previous commit lost it #406933 by
32 + Drake Donahue.
33
34 02 Mar 2012; Ulrich Müller <ulm@g.o> gd-2.0.35-r3.ebuild:
35 Fix LICENSE, "||" would mean dual licensing which is not the case here.
36
37
38
39 1.15 media-libs/gd/gd-2.0.35-r3.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild?rev=1.15&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild?rev=1.15&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild?r1=1.14&r2=1.15
44
45 Index: gd-2.0.35-r3.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v
48 retrieving revision 1.14
49 retrieving revision 1.15
50 diff -u -r1.14 -r1.15
51 --- gd-2.0.35-r3.ebuild 2 Mar 2012 06:59:29 -0000 1.14
52 +++ gd-2.0.35-r3.ebuild 5 Mar 2012 06:54:29 -0000 1.15
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2012 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.14 2012/03/02 06:59:29 ulm Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.15 2012/03/05 06:54:29 vapier Exp $
58
59 EAPI="2"
60
61 @@ -34,7 +34,7 @@
62 local make_sed=( -e '/^noinst_PROGRAMS/s:noinst:check:' )
63 use png || make_sed+=( -e '/_PROGRAMS/s:(gdparttopng|gdtopng|gd2topng|pngtogd|pngtogd2|webpng)::g' )
64 use zlib || make_sed+=( -e '/_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng|pngtogd2)::g' )
65 - sed -i "${make_sed[@]}" Makefile.am || die
66 + sed -i -r "${make_sed[@]}" Makefile.am || die
67
68 eautoreconf
69 }