Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libXpm: libXpm-3.5.9.ebuild ChangeLog
Date: Sat, 22 Jan 2011 15:59:49
Message-Id: 20110122155932.C6FFA2004E@flycatcher.gentoo.org
1 grobian 11/01/22 15:59:32
2
3 Modified: libXpm-3.5.9.ebuild ChangeLog
4 Log:
5 Move Solaris fix to src_configure, where it *does* work.
6
7 (Portage version: 2.2.01.17680-prefix/cvs/SunOS i386)
8
9 Revision Changes Path
10 1.9 x11-libs/libXpm/libXpm-3.5.9.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild?rev=1.9&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild?rev=1.9&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild?r1=1.8&r2=1.9
15
16 Index: libXpm-3.5.9.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild,v
19 retrieving revision 1.8
20 retrieving revision 1.9
21 diff -u -r1.8 -r1.9
22 --- libXpm-3.5.9.ebuild 31 Dec 2010 20:07:26 -0000 1.8
23 +++ libXpm-3.5.9.ebuild 22 Jan 2011 15:59:32 -0000 1.9
24 @@ -1,6 +1,6 @@
25 -# Copyright 1999-2010 Gentoo Foundation
26 +# Copyright 1999-2011 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild,v 1.8 2010/12/31 20:07:26 jer Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild,v 1.9 2011/01/22 15:59:32 grobian Exp $
30
31 EAPI=3
32 inherit xorg-2 flag-o-matic
33 @@ -18,10 +18,14 @@
34 DEPEND="${RDEPEND}
35 sys-devel/gettext"
36
37 -src_compile() {
38 +src_configure() {
39 # the gettext configure check and code in sxpm are incorrect; they assume
40 # gettext being in libintl, whereas Solaris has gettext by default
41 # resulting in libintl not being added to LIBS
42 [[ ${CHOST} == *-solaris* ]] && append-libs -lintl
43 + xorg-2_src_configure
44 +}
45 +
46 +src_compile() {
47 xorg-2_src_compile
48 }
49
50
51
52 1.73 x11-libs/libXpm/ChangeLog
53
54 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libXpm/ChangeLog?rev=1.73&view=markup
55 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libXpm/ChangeLog?rev=1.73&content-type=text/plain
56 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libXpm/ChangeLog?r1=1.72&r2=1.73
57
58 Index: ChangeLog
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v
61 retrieving revision 1.72
62 retrieving revision 1.73
63 diff -u -r1.72 -r1.73
64 --- ChangeLog 31 Dec 2010 20:07:26 -0000 1.72
65 +++ ChangeLog 22 Jan 2011 15:59:32 -0000 1.73
66 @@ -1,6 +1,9 @@
67 # ChangeLog for x11-libs/libXpm
68 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
69 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.72 2010/12/31 20:07:26 jer Exp $
70 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
71 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.73 2011/01/22 15:59:32 grobian Exp $
72 +
73 + 22 Jan 2011; Fabian Groffen <grobian@g.o> libXpm-3.5.9.ebuild:
74 + Move Solaris fix to src_configure, where it *does* work.
75
76 31 Dec 2010; Jeroen Roovers <jer@g.o> libXpm-3.5.9.ebuild:
77 Stable for HPPA (bug #344827).