Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/
Date: Thu, 03 May 2018 08:17:46
Message-Id: 1525335454.9faed462ed36cfb0494ef03a8711d715a9b402f4.polynomial-c@gentoo
1 commit: 9faed462ed36cfb0494ef03a8711d715a9b402f4
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 3 08:13:01 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu May 3 08:17:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9faed462
7
8 media-libs/freetype: Synced live ebuild.
9
10 Package-Manager: Portage-2.3.31, Repoman-2.3.9
11
12 media-libs/freetype/freetype-9999.ebuild | 7 ++++---
13 1 file changed, 4 insertions(+), 3 deletions(-)
14
15 diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
16 index ba2ddfe1a61..b5c2fb86dea 100644
17 --- a/media-libs/freetype/freetype-9999.ebuild
18 +++ b/media-libs/freetype/freetype-9999.ebuild
19 @@ -28,7 +28,7 @@ RESTRICT="!bindist? ( bindist )" # bug 541408
20
21 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
22 bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
23 - harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
24 + harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
25 png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
26 utils? (
27 X? (
28 @@ -49,7 +49,7 @@ PATCHES=(
29 )
30
31 _egit_repo_handler() {
32 - if [[ "${PV}" = 9999 ]] ; then
33 + if [[ "${PV}" == 9999 ]] ; then
34 local phase="${1}"
35 case ${phase} in
36 fetch|unpack)
37 @@ -82,7 +82,7 @@ src_unpack() {
38 }
39
40 src_prepare() {
41 - if [[ "${PV}" = 9999 ]] ; then
42 + if [[ "${PV}" == 9999 ]] ; then
43 # inspired by shipped autogen.sh script
44 eval $(sed -nf version.sed include/freetype/freetype.h)
45 pushd builds/unix &>/dev/null || die
46 @@ -162,6 +162,7 @@ multilib_src_configure() {
47 type -P gmake &> /dev/null && export GNUMAKE=gmake
48
49 local myeconfargs=(
50 + --disable-freetype-config
51 --enable-biarch-config
52 --enable-shared
53 $(use_with bzip2)