diff options
author | Ben de Groot <yngwin@gentoo.org> | 2014-12-13 13:29:03 +0000 |
---|---|---|
committer | Ben de Groot <yngwin@gentoo.org> | 2014-12-13 13:29:03 +0000 |
commit | 1ca9907d4c14bdf2357ea24cb680ef4b591a92e5 (patch) | |
tree | f7d7006edcc3364c7253b791c65434dd94d68588 /media-libs/freetype | |
parent | Bump blaze-markup to 0.6.1.1 (diff) | |
download | gentoo-2-1ca9907d4c14bdf2357ea24cb680ef4b591a92e5.tar.gz gentoo-2-1ca9907d4c14bdf2357ea24cb680ef4b591a92e5.tar.bz2 gentoo-2-1ca9907d4c14bdf2357ea24cb680ef4b591a92e5.zip |
Prevent circular dependencies
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x0F9C590B7FF324F6!)
Diffstat (limited to 'media-libs/freetype')
-rw-r--r-- | media-libs/freetype/ChangeLog | 5 | ||||
-rw-r--r-- | media-libs/freetype/freetype-2.5.4.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 6881a6c0eac9..b6758a0a3212 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.408 2014/12/13 12:28:59 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.409 2014/12/13 13:29:03 yngwin Exp $ + + 13 Dec 2014; Ben de Groot <yngwin@gentoo.org> freetype-2.5.4.ebuild: + Prevent circular dependencies *freetype-2.5.4 (13 Dec 2014) diff --git a/media-libs/freetype/freetype-2.5.4.ebuild b/media-libs/freetype/freetype-2.5.4.ebuild index b920c31fdf2f..20bb2e437bb3 100644 --- a/media-libs/freetype/freetype-2.5.4.ebuild +++ b/media-libs/freetype/freetype-2.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.4.ebuild,v 1.1 2014/12/13 12:28:59 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.4.ebuild,v 1.2 2014/12/13 13:29:03 yngwin Exp $ EAPI=5 inherit autotools-multilib flag-o-matic multilib toolchain-funcs @@ -33,8 +33,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} - infinality? ( media-libs/fontconfig-infinality ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" +PDEPEND="infinality? ( media-libs/fontconfig-infinality )" src_prepare() { enable_option() { |