Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/imlib2: imlib2-9999.ebuild imlib2-1.4.6-r1.ebuild imlib2-1.4.6-r2.ebuild imlib2-1.4.5-r1.ebuild ChangeLog
Date: Thu, 29 Jan 2015 17:33:58
Message-Id: 20150129173353.59807109A5@oystercatcher.gentoo.org
1 mgorny 15/01/29 17:33:53
2
3 Modified: imlib2-9999.ebuild imlib2-1.4.6-r1.ebuild
4 imlib2-1.4.6-r2.ebuild imlib2-1.4.5-r1.ebuild
5 ChangeLog
6 Log:
7 Convert to CPU_FLAGS_X86.
8
9 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
10
11 Revision Changes Path
12 1.22 media-libs/imlib2/imlib2-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?rev=1.22&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?rev=1.22&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?r1=1.21&r2=1.22
17
18 Index: imlib2-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v
21 retrieving revision 1.21
22 retrieving revision 1.22
23 diff -u -r1.21 -r1.22
24 --- imlib2-9999.ebuild 3 Jul 2014 20:26:03 -0000 1.21
25 +++ imlib2-9999.ebuild 29 Jan 2015 17:33:53 -0000 1.22
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2014 Gentoo Foundation
28 +# Copyright 1999-2015 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.21 2014/07/03 20:26:03 mgorny Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.22 2015/01/29 17:33:53 mgorny Exp $
32
33 EAPI="4"
34
35 @@ -16,7 +16,7 @@
36 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
37 HOMEPAGE="http://www.enlightenment.org/"
38
39 -IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
40 +IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
41
42 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
43 bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
44 @@ -40,9 +40,9 @@
45 multilib_src_configure() {
46 # imlib2 has diff configure options for x86/amd64 mmx
47 if [[ $(tc-arch) == amd64 ]]; then
48 - E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
49 + E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
50 else
51 - E_ECONF+=( --disable-amd64 $(use_enable mmx) )
52 + E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
53 fi
54
55 [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
56
57
58
59 1.3 media-libs/imlib2/imlib2-1.4.6-r1.ebuild
60
61 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r1.ebuild?rev=1.3&view=markup
62 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r1.ebuild?rev=1.3&content-type=text/plain
63 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r1.ebuild?r1=1.2&r2=1.3
64
65 Index: imlib2-1.4.6-r1.ebuild
66 ===================================================================
67 RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r1.ebuild,v
68 retrieving revision 1.2
69 retrieving revision 1.3
70 diff -u -r1.2 -r1.3
71 --- imlib2-1.4.6-r1.ebuild 18 Jan 2014 20:19:17 -0000 1.2
72 +++ imlib2-1.4.6-r1.ebuild 29 Jan 2015 17:33:53 -0000 1.3
73 @@ -1,6 +1,6 @@
74 -# Copyright 1999-2014 Gentoo Foundation
75 +# Copyright 1999-2015 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r1.ebuild,v 1.2 2014/01/18 20:19:17 vapier Exp $
78 +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r1.ebuild,v 1.3 2015/01/29 17:33:53 mgorny Exp $
79
80 EAPI="4"
81
82 @@ -16,7 +16,7 @@
83 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
84 HOMEPAGE="http://www.enlightenment.org/"
85
86 -IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
87 +IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
88
89 RDEPEND="=media-libs/freetype-2*
90 bzip2? ( app-arch/bzip2 )
91 @@ -45,9 +45,9 @@
92 src_configure() {
93 # imlib2 has diff configure options for x86/amd64 mmx
94 if [[ $(tc-arch) == amd64 ]]; then
95 - E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
96 + E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
97 else
98 - E_ECONF+=( --disable-amd64 $(use_enable mmx) )
99 + E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
100 fi
101
102 [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
103
104
105
106 1.18 media-libs/imlib2/imlib2-1.4.6-r2.ebuild
107
108 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild?rev=1.18&view=markup
109 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild?rev=1.18&content-type=text/plain
110 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild?r1=1.17&r2=1.18
111
112 Index: imlib2-1.4.6-r2.ebuild
113 ===================================================================
114 RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v
115 retrieving revision 1.17
116 retrieving revision 1.18
117 diff -u -r1.17 -r1.18
118 --- imlib2-1.4.6-r2.ebuild 20 Nov 2014 00:09:49 -0000 1.17
119 +++ imlib2-1.4.6-r2.ebuild 29 Jan 2015 17:33:53 -0000 1.18
120 @@ -1,6 +1,6 @@
121 -# Copyright 1999-2014 Gentoo Foundation
122 +# Copyright 1999-2015 Gentoo Foundation
123 # Distributed under the terms of the GNU General Public License v2
124 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.17 2014/11/20 00:09:49 vapier Exp $
125 +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.18 2015/01/29 17:33:53 mgorny Exp $
126
127 EAPI="4"
128
129 @@ -21,7 +21,7 @@
130
131 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
132
133 -IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
134 +IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
135
136 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
137 bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
138 @@ -54,9 +54,9 @@
139 multilib_src_configure() {
140 # imlib2 has diff configure options for x86/amd64 mmx
141 if [[ $(tc-arch) == amd64 ]]; then
142 - E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
143 + E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
144 else
145 - E_ECONF+=( --disable-amd64 $(use_enable mmx) )
146 + E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
147 fi
148
149 [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
150
151
152
153 1.3 media-libs/imlib2/imlib2-1.4.5-r1.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.5-r1.ebuild?rev=1.3&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.5-r1.ebuild?rev=1.3&content-type=text/plain
157 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.5-r1.ebuild?r1=1.2&r2=1.3
158
159 Index: imlib2-1.4.5-r1.ebuild
160 ===================================================================
161 RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5-r1.ebuild,v
162 retrieving revision 1.2
163 retrieving revision 1.3
164 diff -u -r1.2 -r1.3
165 --- imlib2-1.4.5-r1.ebuild 18 Jan 2014 20:19:17 -0000 1.2
166 +++ imlib2-1.4.5-r1.ebuild 29 Jan 2015 17:33:53 -0000 1.3
167 @@ -1,6 +1,6 @@
168 -# Copyright 1999-2014 Gentoo Foundation
169 +# Copyright 1999-2015 Gentoo Foundation
170 # Distributed under the terms of the GNU General Public License v2
171 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5-r1.ebuild,v 1.2 2014/01/18 20:19:17 vapier Exp $
172 +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5-r1.ebuild,v 1.3 2015/01/29 17:33:53 mgorny Exp $
173
174 EAPI="4"
175
176 @@ -16,7 +16,7 @@
177 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
178 HOMEPAGE="http://www.enlightenment.org/"
179
180 -IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
181 +IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
182
183 RDEPEND="=media-libs/freetype-2*
184 bzip2? ( app-arch/bzip2 )
185 @@ -45,9 +45,9 @@
186 src_configure() {
187 # imlib2 has diff configure options for x86/amd64 mmx
188 if [[ $(tc-arch) == amd64 ]]; then
189 - E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
190 + E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
191 else
192 - E_ECONF+=( --disable-amd64 $(use_enable mmx) )
193 + E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
194 fi
195
196 [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
197
198
199
200 1.139 media-libs/imlib2/ChangeLog
201
202 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?rev=1.139&view=markup
203 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?rev=1.139&content-type=text/plain
204 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?r1=1.138&r2=1.139
205
206 Index: ChangeLog
207 ===================================================================
208 RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v
209 retrieving revision 1.138
210 retrieving revision 1.139
211 diff -u -r1.138 -r1.139
212 --- ChangeLog 20 Nov 2014 00:09:49 -0000 1.138
213 +++ ChangeLog 29 Jan 2015 17:33:53 -0000 1.139
214 @@ -1,6 +1,10 @@
215 # ChangeLog for media-libs/imlib2
216 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
217 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.138 2014/11/20 00:09:49 vapier Exp $
218 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
219 +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.139 2015/01/29 17:33:53 mgorny Exp $
220 +
221 + 29 Jan 2015; Michał Górny <mgorny@g.o> imlib2-1.4.5-r1.ebuild,
222 + imlib2-1.4.6-r1.ebuild, imlib2-1.4.6-r2.ebuild, imlib2-9999.ebuild:
223 + Convert to CPU_FLAGS_X86.
224
225 20 Nov 2014; Mike Frysinger <vapier@g.o> imlib2-1.4.6-r2.ebuild:
226 Select automake-1.13 so we can run just eautomake #529740.