Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/giflib: ChangeLog giflib-4.1.6-r1.ebuild
Date: Thu, 05 May 2011 15:20:30
Message-Id: 20110505152019.C257620054@flycatcher.gentoo.org
1 scarabeus 11/05/05 15:20:19
2
3 Modified: ChangeLog giflib-4.1.6-r1.ebuild
4 Log:
5 Punt static library and .la file archive.
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.61 media-libs/giflib/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/giflib/ChangeLog?rev=1.61&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/giflib/ChangeLog?rev=1.61&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/giflib/ChangeLog?r1=1.60&r2=1.61
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v
19 retrieving revision 1.60
20 retrieving revision 1.61
21 diff -u -r1.60 -r1.61
22 --- ChangeLog 8 Dec 2008 18:52:29 -0000 1.60
23 +++ ChangeLog 5 May 2011 15:20:19 -0000 1.61
24 @@ -1,6 +1,9 @@
25 # ChangeLog for media-libs/giflib
26 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.60 2008/12/08 18:52:29 maekke Exp $
28 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.61 2011/05/05 15:20:19 scarabeus Exp $
30 +
31 + 05 May 2011; Tomáš Chvátal <scarabeus@g.o> giflib-4.1.6-r1.ebuild:
32 + Punt static library and .la file archive.
33
34 08 Dec 2008; Markus Meier <maekke@g.o> -giflib-4.1.6.ebuild:
35 old
36
37
38
39 1.8 media-libs/giflib/giflib-4.1.6-r1.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/giflib/giflib-4.1.6-r1.ebuild?rev=1.8&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/giflib/giflib-4.1.6-r1.ebuild?rev=1.8&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/giflib/giflib-4.1.6-r1.ebuild?r1=1.7&r2=1.8
44
45 Index: giflib-4.1.6-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r1.ebuild,v
48 retrieving revision 1.7
49 retrieving revision 1.8
50 diff -u -r1.7 -r1.8
51 --- giflib-4.1.6-r1.ebuild 7 Dec 2008 11:49:54 -0000 1.7
52 +++ giflib-4.1.6-r1.ebuild 5 May 2011 15:20:19 -0000 1.8
53 @@ -1,6 +1,8 @@
54 -# Copyright 1999-2008 Gentoo Foundation
55 +# Copyright 1999-2011 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r1.ebuild,v 1.7 2008/12/07 11:49:54 vapier Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r1.ebuild,v 1.8 2011/05/05 15:20:19 scarabeus Exp $
59 +
60 +EAPI=4
61
62 inherit eutils libtool
63
64 @@ -22,29 +24,33 @@
65 )
66 rle? ( media-libs/urt )"
67
68 -src_unpack() {
69 - unpack ${A}
70 - cd "${S}"
71 +src_prepare() {
72 epatch "${FILESDIR}"/${P}-gif2rle.patch
73 epatch "${FILESDIR}"/${P}-giffix-null-Extension-fix.patch
74 elibtoolize
75 epunt_cxx
76 }
77
78 -src_compile() {
79 - local myconf="--disable-gl $(use_enable X x11)"
80 +src_configure() {
81 + local myconf=""
82 +
83 # prevent circular depend #111455
84 if has_version media-libs/urt ; then
85 myconf="${myconf} $(use_enable rle)"
86 else
87 myconf="${myconf} --disable-rle"
88 fi
89 - econf ${myconf}
90 - emake || die "emake failed"
91 +
92 + econf \
93 + --disable-static \
94 + --disable-gl \
95 + $(use_enable X x11) \
96 + ${myconf}
97 }
98
99 src_install() {
100 - emake DESTDIR="${D}" install || die "make install failed"
101 + default
102 + find "${ED}" -name '*.la' -delete
103 dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
104 dohtml -r doc
105 }