From a2833df582cf9ce876156d88d0c422a502605b8e Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 22 Jul 2014 07:40:38 +0000 Subject: Added virtual/pkgconfig to DEPEND (bug #517750) (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) --- media-libs/freetype/ChangeLog | 6 +++++- media-libs/freetype/freetype-2.5.3-r1.ebuild | 8 +++++--- media-libs/freetype/freetype-2.5.3.ebuild | 8 +++++--- 3 files changed, 15 insertions(+), 7 deletions(-) (limited to 'media-libs/freetype') diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index fca75a08cfda..f7956656cf10 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,10 @@ # 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.401 2014/07/15 21:24:56 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.402 2014/07/22 07:40:38 polynomial-c Exp $ + + 22 Jul 2014; Lars Wendler freetype-2.5.3.ebuild, + freetype-2.5.3-r1.ebuild: + Added virtual/pkgconfig to DEPEND (bug #517750). 15 Jul 2014; Mikle Kolyada freetype-2.5.3-r1.ebuild: amd64 stable wrt bug #504088 diff --git a/media-libs/freetype/freetype-2.5.3-r1.ebuild b/media-libs/freetype/freetype-2.5.3-r1.ebuild index d9b7822ba233..392d80c8aaf1 100644 --- a/media-libs/freetype/freetype-2.5.3-r1.ebuild +++ b/media-libs/freetype/freetype-2.5.3-r1.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.3-r1.ebuild,v 1.11 2014/07/15 21:24:56 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.3-r1.ebuild,v 1.12 2014/07/22 07:40:38 polynomial-c Exp $ EAPI=5 @@ -20,7 +20,7 @@ IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz infinality png static-libs utils" REQUIRED_USE="harfbuzz? ( auto-hinter )" -DEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] ) @@ -31,7 +31,9 @@ DEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] ) )" -RDEPEND="${DEPEND} +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} infinality? ( media-libs/fontconfig-infinality ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" diff --git a/media-libs/freetype/freetype-2.5.3.ebuild b/media-libs/freetype/freetype-2.5.3.ebuild index 0ed876443110..87f60f22a3ec 100644 --- a/media-libs/freetype/freetype-2.5.3.ebuild +++ b/media-libs/freetype/freetype-2.5.3.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.3.ebuild,v 1.4 2014/06/18 19:29:34 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.3.ebuild,v 1.5 2014/07/22 07:40:38 polynomial-c Exp $ EAPI=5 @@ -19,13 +19,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge infinality png static-libs utils" -DEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} infinality? ( media-libs/fontconfig-infinality ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )" -- cgit v1.2.3-65-gdbad