Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/freetype: ChangeLog freetype-2.4.12.ebuild
Date: Sun, 28 Jul 2013 14:21:09
Message-Id: 20130728142103.011072171C@flycatcher.gentoo.org
1 aballier 13/07/28 14:21:02
2
3 Modified: ChangeLog freetype-2.4.12.ebuild
4 Log:
5 use proper MULTILIB_USEDEP instead of emul libs
6
7 (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
8
9 Revision Changes Path
10 1.375 media-libs/freetype/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.375&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.375&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?r1=1.374&r2=1.375
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v
19 retrieving revision 1.374
20 retrieving revision 1.375
21 diff -u -r1.374 -r1.375
22 --- ChangeLog 9 Jun 2013 22:58:46 -0000 1.374
23 +++ ChangeLog 28 Jul 2013 14:21:02 -0000 1.375
24 @@ -1,6 +1,9 @@
25 # ChangeLog for media-libs/freetype
26 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.374 2013/06/09 22:58:46 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.375 2013/07/28 14:21:02 aballier Exp $
29 +
30 + 28 Jul 2013; Alexis Ballier <aballier@g.o> freetype-2.4.12.ebuild:
31 + use proper MULTILIB_USEDEP instead of emul libs
32
33 09 Jun 2013; Mike Frysinger <vapier@g.o> metadata.xml:
34 Add upstream CPE tag (security info) from ChromiumOS.
35
36
37
38 1.2 media-libs/freetype/freetype-2.4.12.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild?r1=1.1&r2=1.2
43
44 Index: freetype-2.4.12.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- freetype-2.4.12.ebuild 2 Jun 2013 07:41:04 -0000 1.1
51 +++ freetype-2.4.12.ebuild 28 Jul 2013 14:21:02 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2013 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild,v 1.1 2013/06/02 07:41:04 yngwin Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild,v 1.2 2013/07/28 14:21:02 aballier Exp $
57
58 EAPI=5
59
60 @@ -23,14 +23,11 @@
61 IUSE="X auto-hinter bindist bzip2 adobe-cff debug doc fontforge infinality
62 static-libs utils"
63
64 -# Note: replace emul-linux dep when bzip2 becomes multilib-aware
65 -# (and all [${MULTILIB_USEDEP}] on it then!)
66 -DEPEND="sys-libs/zlib
67 - amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) )
68 - bzip2? ( app-arch/bzip2 )
69 - X? ( x11-libs/libX11
70 - x11-libs/libXau
71 - x11-libs/libXdmcp )"
72 +DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]
73 + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
74 + X? ( x11-libs/libX11[${MULTILIB_USEDEP}]
75 + x11-libs/libXau[${MULTILIB_USEDEP}]
76 + x11-libs/libXdmcp[${MULTILIB_USEDEP}] )"
77 RDEPEND="${DEPEND}
78 infinality? ( media-libs/fontconfig-infinality )
79 abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )"