Gentoo Archives: gentoo-commits

From: "Sebastian Pipping (sping)" <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/gimp: ChangeLog gimp-2.7.4.ebuild
Date: Mon, 02 Jan 2012 18:49:14
Message-Id: 20120102184904.AE5692004B@flycatcher.gentoo.org
1 sping 12/01/02 18:49:04
2
3 Modified: ChangeLog gimp-2.7.4.ebuild
4 Log:
5 media-gfx/gimp: Fix compilation (bug #395695)
6
7 (Portage version: 2.1.10.44/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.351 media-gfx/gimp/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.351&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.351&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?r1=1.350&r2=1.351
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v
19 retrieving revision 1.350
20 retrieving revision 1.351
21 diff -u -r1.350 -r1.351
22 --- ChangeLog 1 Jan 2012 15:36:55 -0000 1.350
23 +++ ChangeLog 2 Jan 2012 18:49:04 -0000 1.351
24 @@ -1,6 +1,11 @@
25 # ChangeLog for media-gfx/gimp
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.350 2012/01/01 15:36:55 sping Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.351 2012/01/02 18:49:04 sping Exp $
29 +
30 + 02 Jan 2012; Sebastian Pipping <sping@g.o> gimp-2.7.4.ebuild,
31 + +files/gimp-2.7.4-no-deprecation.patch:
32 + Fix compilation with non-dependency dev-libs/atk-1.32.0-r1. Thanks to
33 + cyberbat for testing. (bug #395695)
34
35 *gimp-2.7.4 (01 Jan 2012)
36
37
38
39
40 1.2 media-gfx/gimp/gimp-2.7.4.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild?r1=1.1&r2=1.2
45
46 Index: gimp-2.7.4.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- gimp-2.7.4.ebuild 1 Jan 2012 15:36:55 -0000 1.1
53 +++ gimp-2.7.4.ebuild 2 Jan 2012 18:49:04 -0000 1.2
54 @@ -1,11 +1,11 @@
55 # Copyright 1999-2012 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild,v 1.1 2012/01/01 15:36:55 sping Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild,v 1.2 2012/01/02 18:49:04 sping Exp $
59
60 EAPI="3"
61 PYTHON_DEPEND="python? 2:2.5"
62
63 -inherit versionator gnome2 fdo-mime multilib python
64 +inherit versionator autotools eutils gnome2 fdo-mime multilib python
65
66 DESCRIPTION="GNU Image Manipulation Program"
67 HOMEPAGE="http://www.gimp.org/"
68 @@ -57,7 +57,8 @@
69 >=sys-devel/gettext-0.17
70 doc? ( >=dev-util/gtk-doc-1 )
71 >=sys-devel/libtool-2.2
72 - >=sys-devel/automake-1.11"
73 + >=sys-devel/automake-1.11
74 + dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
75
76 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
77
78 @@ -97,6 +98,9 @@
79 }
80
81 src_prepare() {
82 + epatch "${FILESDIR}"/${P}-no-deprecation.patch # bug 395695, comment 9 and 16
83 + eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
84 +
85 echo '#!/bin/sh' > py-compile
86 gnome2_src_prepare
87 }