1 |
commit: a363f5ee4c6ba40e2c0b28f62d8963d43fce6b41 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 3 09:28:11 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 3 09:28:26 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a363f5ee |
7 |
|
8 |
media-libs/harfbuzz: Added "debug" USE flag (bug #616816). |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
.../{harfbuzz-9999.ebuild => harfbuzz-1.4.6-r1.ebuild} | 12 ++++++++---- |
13 |
media-libs/harfbuzz/harfbuzz-9999.ebuild | 10 +++++++--- |
14 |
2 files changed, 15 insertions(+), 7 deletions(-) |
15 |
|
16 |
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.6-r1.ebuild |
17 |
similarity index 89% |
18 |
copy from media-libs/harfbuzz/harfbuzz-9999.ebuild |
19 |
copy to media-libs/harfbuzz/harfbuzz-1.4.6-r1.ebuild |
20 |
index 6227e71e7bd..2df1f9d8211 100644 |
21 |
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild |
22 |
+++ b/media-libs/harfbuzz/harfbuzz-1.4.6-r1.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2016 Gentoo Foundation |
25 |
+# Copyright 1999-2017 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=6 |
29 |
@@ -8,7 +8,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz" |
30 |
|
31 |
PYTHON_COMPAT=( python2_7 ) |
32 |
|
33 |
-inherit eutils libtool multilib-minimal python-any-r1 xdg-utils |
34 |
+inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils |
35 |
|
36 |
DESCRIPTION="An OpenType text shaping engine" |
37 |
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" |
38 |
@@ -19,13 +19,13 @@ SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 |
39 |
[[ ${PV} == 9999 ]] || \ |
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 |
|
42 |
-IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype" |
43 |
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype" |
44 |
REQUIRED_USE="introspection? ( glib )" |
45 |
|
46 |
RDEPEND=" |
47 |
cairo? ( x11-libs/cairo:= ) |
48 |
fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] ) |
49 |
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
50 |
+ glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) |
51 |
graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) |
52 |
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
53 |
introspection? ( >=dev-libs/gobject-introspection-1.34:= ) |
54 |
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND} |
55 |
|
56 |
pkg_setup() { |
57 |
use test && python-any-r1_pkg_setup |
58 |
+ if ! use debug ; then |
59 |
+ append-cppflags -DNDEBUG |
60 |
+ append-cppflags -DHB_NDEBUG |
61 |
+ fi |
62 |
} |
63 |
|
64 |
src_prepare() { |
65 |
|
66 |
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild |
67 |
index 6227e71e7bd..260fc8ecd14 100644 |
68 |
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild |
69 |
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild |
70 |
@@ -1,4 +1,4 @@ |
71 |
-# Copyright 1999-2016 Gentoo Foundation |
72 |
+# Copyright 1999-2017 Gentoo Foundation |
73 |
# Distributed under the terms of the GNU General Public License v2 |
74 |
|
75 |
EAPI=6 |
76 |
@@ -8,7 +8,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz" |
77 |
|
78 |
PYTHON_COMPAT=( python2_7 ) |
79 |
|
80 |
-inherit eutils libtool multilib-minimal python-any-r1 xdg-utils |
81 |
+inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils |
82 |
|
83 |
DESCRIPTION="An OpenType text shaping engine" |
84 |
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" |
85 |
@@ -19,7 +19,7 @@ SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 |
86 |
[[ ${PV} == 9999 ]] || \ |
87 |
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" |
88 |
|
89 |
-IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype" |
90 |
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype" |
91 |
REQUIRED_USE="introspection? ( glib )" |
92 |
|
93 |
RDEPEND=" |
94 |
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND} |
95 |
|
96 |
pkg_setup() { |
97 |
use test && python-any-r1_pkg_setup |
98 |
+ if ! use debug ; then |
99 |
+ append-cppflags -DNDEBUG |
100 |
+ append-cppflags -DHB_NDEBUG |
101 |
+ fi |
102 |
} |
103 |
|
104 |
src_prepare() { |