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/harfbuzz/
Date: Wed, 31 Jan 2018 09:13:54
Message-Id: 1517388252.59ec8745484cfaf0e9d3e9ef41ee2b887921360a.polynomial-c@gentoo
1 commit: 59ec8745484cfaf0e9d3e9ef41ee2b887921360a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 31 08:41:56 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 31 08:44:12 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ec8745
7
8 media-libs/harfbuzz: Synced live ebuild.
9
10 Package-Manager: Portage-2.3.21, Repoman-2.3.6
11
12 media-libs/harfbuzz/harfbuzz-9999.ebuild | 48 +++++++++++++++++---------------
13 1 file changed, 25 insertions(+), 23 deletions(-)
14
15 diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
16 index c785260b6c4..3ba2f34c80b 100644
17 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
18 +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
19 @@ -1,22 +1,21 @@
20 -# Copyright 1999-2017 Gentoo Foundation
21 +# Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=6
25
26 PYTHON_COMPAT=( python2_7 )
27
28 -inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
29 +inherit flag-o-matic libtool ltprune multilib-minimal python-any-r1 xdg-utils
30
31 DESCRIPTION="An OpenType text shaping engine"
32 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
33
34 -if [[ ${PV} != 9999 ]] ; then
35 +if [[ ${PV} = 9999 ]] ; then
36 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
37 + inherit git-r3 autotools
38 +else
39 SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
40 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
41 -else
42 - inherit git-r3 autotools
43 - #EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
44 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
45 fi
46
47 LICENSE="Old-MIT ISC icu"
48 @@ -41,10 +40,12 @@ DEPEND="${RDEPEND}
49 "
50 # eautoreconf requires gobject-introspection-common
51 # ragel needed if regenerating *.hh files from *.rl
52 -[[ ${PV} = 9999 ]] && DEPEND+="
53 - >=dev-libs/gobject-introspection-common-1.34
54 - dev-util/ragel
55 -"
56 +if [[ ${PV} = 9999 ]] ; then
57 + DEPEND+="
58 + >=dev-libs/gobject-introspection-common-1.34
59 + dev-util/ragel
60 + "
61 +fi
62
63 pkg_setup() {
64 use test && python-any-r1_pkg_setup
65 @@ -81,20 +82,21 @@ src_prepare() {
66 }
67
68 multilib_src_configure() {
69 - ECONF_SOURCE="${S}" \
70 # harfbuzz-gobject only used for instrospection, bug #535852
71 - econf \
72 - --without-coretext \
73 - --without-uniscribe \
74 - $(use_enable static-libs static) \
75 - $(multilib_native_use_with cairo) \
76 - $(use_with fontconfig) \
77 - $(use_with glib) \
78 - $(use_with introspection gobject) \
79 - $(use_with graphite graphite2) \
80 - $(use_with icu) \
81 - $(multilib_native_use_enable introspection) \
82 + local myeconfargs=(
83 + --without-coretext
84 + --without-uniscribe
85 + $(use_enable static-libs static)
86 + $(multilib_native_use_with cairo)
87 + $(use_with fontconfig)
88 + $(use_with glib)
89 + $(use_with introspection gobject)
90 + $(use_with graphite graphite2)
91 + $(use_with icu)
92 + $(multilib_native_use_enable introspection)
93 $(use_with truetype freetype)
94 + )
95 + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
96
97 if multilib_is_native_abi; then
98 ln -s "${S}"/docs/html docs/html || die