diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-28 14:21:02 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-28 14:21:02 +0000 |
| commit | a698e2c6821f43de3505e17b3c85d0676042a989 (patch) | |
| tree | 8447b512c30458eedc6496313369da62f3e95003 /media-libs/freetype | |
| parent | use the proper MULTILIB_USEDEP on zlib (diff) | |
| download | gentoo-2-a698e2c6821f43de3505e17b3c85d0676042a989.tar.gz gentoo-2-a698e2c6821f43de3505e17b3c85d0676042a989.tar.bz2 gentoo-2-a698e2c6821f43de3505e17b3c85d0676042a989.zip | |
use proper MULTILIB_USEDEP instead of emul libs
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs/freetype')
| -rw-r--r-- | media-libs/freetype/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/freetype/freetype-2.4.12.ebuild | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 6e9c79cfb709..48a4169b21ee 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.374 2013/06/09 22:58:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.375 2013/07/28 14:21:02 aballier Exp $ + + 28 Jul 2013; Alexis Ballier <aballier@gentoo.org> freetype-2.4.12.ebuild: + use proper MULTILIB_USEDEP instead of emul libs 09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml: Add upstream CPE tag (security info) from ChromiumOS. diff --git a/media-libs/freetype/freetype-2.4.12.ebuild b/media-libs/freetype/freetype-2.4.12.ebuild index 6145ff41778e..3ef663473b47 100644 --- a/media-libs/freetype/freetype-2.4.12.ebuild +++ b/media-libs/freetype/freetype-2.4.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild,v 1.1 2013/06/02 07:41:04 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild,v 1.2 2013/07/28 14:21:02 aballier Exp $ EAPI=5 @@ -23,14 +23,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh IUSE="X auto-hinter bindist bzip2 adobe-cff debug doc fontforge infinality static-libs utils" -# Note: replace emul-linux dep when bzip2 becomes multilib-aware -# (and all [${MULTILIB_USEDEP}] on it then!) -DEPEND="sys-libs/zlib - amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) ) - bzip2? ( app-arch/bzip2 ) - X? ( x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp )" +DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}] + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXau[${MULTILIB_USEDEP}] + x11-libs/libXdmcp[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND} infinality? ( media-libs/fontconfig-infinality ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )" |