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: Sat, 15 Aug 2020 02:19:46
Message-Id: 1597457978.d668e91a605e066423d7f4f517083c45adb30ac0.polynomial-c@gentoo
1 commit: d668e91a605e066423d7f4f517083c45adb30ac0
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 15 02:19:26 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 15 02:19:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d668e91a
7
8 media-libs/harfbuzz: ebuild cleanup regarding change to meson
9
10 Package-Manager: Portage-3.0.2, Repoman-2.3.23
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-libs/harfbuzz/harfbuzz-2.7.1.ebuild | 6 ------
14 media-libs/harfbuzz/harfbuzz-9999.ebuild | 6 ------
15 2 files changed, 12 deletions(-)
16
17 diff --git a/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild
18 index 774a139ec6a..7c89b2800e3 100644
19 --- a/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild
20 +++ b/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild
21 @@ -59,11 +59,6 @@ src_prepare() {
22 test/shaping/data/in-house/Makefile.sources \
23 || die # bug 726120
24
25 - if ! use doc ; then
26 - # Taken from shipped autogen.sh script
27 - echo "EXTRA_DIST = " > gtk-doc.make
28 - fi
29 -
30 # bug 618772
31 append-cxxflags -std=c++14
32 }
33 @@ -83,7 +78,6 @@ multilib_src_configure() {
34 -Dcoretext="disabled"
35 -Ddocs="$(meson_multilib_native_feature doc)"
36 -Dfontconfig="disabled" #609300
37 - #-Dgobject="$(meson_multilib_native_feature introspection)"
38 -Dintrospection="$(meson_multilib_native_feature introspection)"
39 -Dstatic="$(usex static-libs true false)"
40 $(meson_feature glib)
41
42 diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
43 index 774a139ec6a..7c89b2800e3 100644
44 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
45 +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
46 @@ -59,11 +59,6 @@ src_prepare() {
47 test/shaping/data/in-house/Makefile.sources \
48 || die # bug 726120
49
50 - if ! use doc ; then
51 - # Taken from shipped autogen.sh script
52 - echo "EXTRA_DIST = " > gtk-doc.make
53 - fi
54 -
55 # bug 618772
56 append-cxxflags -std=c++14
57 }
58 @@ -83,7 +78,6 @@ multilib_src_configure() {
59 -Dcoretext="disabled"
60 -Ddocs="$(meson_multilib_native_feature doc)"
61 -Dfontconfig="disabled" #609300
62 - #-Dgobject="$(meson_multilib_native_feature introspection)"
63 -Dintrospection="$(meson_multilib_native_feature introspection)"
64 -Dstatic="$(usex static-libs true false)"
65 $(meson_feature glib)