Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/harfbuzz: harfbuzz-9999.ebuild ChangeLog harfbuzz-0.9.20.ebuild harfbuzz-0.9.17.ebuild
Date: Mon, 02 Sep 2013 19:28:31
Message-Id: 20130902192822.E2B292004C@flycatcher.gentoo.org
1 tetromino 13/09/02 19:28:22
2
3 Modified: harfbuzz-9999.ebuild ChangeLog
4 Added: harfbuzz-0.9.20.ebuild
5 Removed: harfbuzz-0.9.17.ebuild
6 Log:
7 Version bump; fixes various bugs, adds API docs and experimental gobject-introspection support. Drop old.
8
9 (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
10
11 Revision Changes Path
12 1.16 media-libs/harfbuzz/harfbuzz-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild?rev=1.16&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild?rev=1.16&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild?r1=1.15&r2=1.16
17
18 Index: harfbuzz-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v
21 retrieving revision 1.15
22 retrieving revision 1.16
23 diff -u -r1.15 -r1.16
24 --- harfbuzz-9999.ebuild 6 Jun 2013 05:23:28 -0000 1.15
25 +++ harfbuzz-9999.ebuild 2 Sep 2013 19:28:22 -0000 1.16
26 @@ -1,13 +1,13 @@
27 # Copyright 1999-2013 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.15 2013/06/06 05:23:28 tetromino Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.16 2013/09/02 19:28:22 tetromino Exp $
31
32 EAPI=5
33
34 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
35 [[ ${PV} == 9999 ]] && inherit git-2 autotools
36
37 -inherit eutils libtool
38 +inherit eutils libtool autotools
39
40 DESCRIPTION="An OpenType text shaping engine"
41 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
42 @@ -17,24 +17,29 @@
43 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
44 [[ ${PV} == 9999 ]] || \
45 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris"
46 -IUSE="+cairo +glib +graphite icu static-libs +truetype"
47 +# TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
48 +IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
49 +REQUIRED_USE="introspection? ( glib )"
50
51 RDEPEND="
52 cairo? ( x11-libs/cairo:= )
53 glib? ( dev-libs/glib:2 )
54 graphite? ( media-gfx/graphite2:= )
55 icu? ( dev-libs/icu:= )
56 + introspection? ( >=dev-libs/gobject-introspection-1.32 )
57 truetype? ( media-libs/freetype:2= )
58 "
59 DEPEND="${RDEPEND}
60 + >=dev-libs/gobject-introspection-common-1.32
61 + dev-util/gtk-doc-am
62 dev-util/ragel
63 virtual/pkgconfig
64 "
65
66 src_prepare() {
67 - if [[ ${CHOST} == *-darwin* ]] ; then
68 - # on Darwin we need to link with g++, like automake defaults to,
69 - # but overridden by upstream because on Linux this is not
70 + if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
71 + # on Darwin/Solaris we need to link with g++, like automake defaults
72 + # to, but overridden by upstream because on Linux this is not
73 # necessary, bug #449126
74 sed -i \
75 -e 's/\<LINK\>/CXXLINK/' \
76 @@ -43,8 +48,8 @@
77 -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
78 src/Makefile.in || die
79 fi
80 +
81 [[ ${PV} == 9999 ]] && eautoreconf
82 - elibtoolize # for building a shared library on x64-solaris
83 }
84
85 src_configure() {
86 @@ -54,10 +59,11 @@
87 $(use_enable static-libs static) \
88 $(use_with cairo) \
89 $(use_with glib) \
90 + $(use_with glib gobject) \
91 $(use_with graphite graphite2) \
92 $(use_with icu) \
93 + $(use_enable introspection) \
94 $(use_with truetype freetype)
95 -
96 }
97
98 src_install() {
99
100
101
102 1.45 media-libs/harfbuzz/ChangeLog
103
104 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/ChangeLog?rev=1.45&view=markup
105 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/ChangeLog?rev=1.45&content-type=text/plain
106 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/ChangeLog?r1=1.44&r2=1.45
107
108 Index: ChangeLog
109 ===================================================================
110 RCS file: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v
111 retrieving revision 1.44
112 retrieving revision 1.45
113 diff -u -r1.44 -r1.45
114 --- ChangeLog 13 Jul 2013 08:18:34 -0000 1.44
115 +++ ChangeLog 2 Sep 2013 19:28:22 -0000 1.45
116 @@ -1,6 +1,13 @@
117 # ChangeLog for media-libs/harfbuzz
118 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
119 -# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.44 2013/07/13 08:18:34 grobian Exp $
120 +# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.45 2013/09/02 19:28:22 tetromino Exp $
121 +
122 +*harfbuzz-0.9.20 (02 Sep 2013)
123 +
124 + 02 Sep 2013; Alexandre Rostovtsev <tetromino@g.o>
125 + -harfbuzz-0.9.17.ebuild, +harfbuzz-0.9.20.ebuild, harfbuzz-9999.ebuild:
126 + Version bump; fixes various bugs, adds API docs and experimental
127 + gobject-introspection support. Drop old.
128
129 13 Jul 2013; Fabian Groffen <grobian@g.o> harfbuzz-0.9.18-r1.ebuild:
130 Fix linking on Solaris, same fix as necessary for Darwin
131
132
133
134 1.1 media-libs/harfbuzz/harfbuzz-0.9.20.ebuild
135
136 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild?rev=1.1&view=markup
137 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild?rev=1.1&content-type=text/plain
138
139 Index: harfbuzz-0.9.20.ebuild
140 ===================================================================
141 # Copyright 1999-2013 Gentoo Foundation
142 # Distributed under the terms of the GNU General Public License v2
143 # $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild,v 1.1 2013/09/02 19:28:22 tetromino Exp $
144
145 EAPI=5
146
147 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
148 [[ ${PV} == 9999 ]] && inherit git-2 autotools
149
150 inherit eutils libtool autotools
151
152 DESCRIPTION="An OpenType text shaping engine"
153 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
154 [[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
155
156 LICENSE="Old-MIT ISC icu"
157 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
158 [[ ${PV} == 9999 ]] || \
159 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris"
160 # TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
161 IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
162 REQUIRED_USE="introspection? ( glib )"
163
164 RDEPEND="
165 cairo? ( x11-libs/cairo:= )
166 glib? ( dev-libs/glib:2 )
167 graphite? ( media-gfx/graphite2:= )
168 icu? ( dev-libs/icu:= )
169 introspection? ( >=dev-libs/gobject-introspection-1.32 )
170 truetype? ( media-libs/freetype:2= )
171 "
172 DEPEND="${RDEPEND}
173 >=dev-libs/gobject-introspection-common-1.32
174 dev-util/gtk-doc-am
175 dev-util/ragel
176 virtual/pkgconfig
177 "
178
179 src_prepare() {
180 if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
181 # on Darwin/Solaris we need to link with g++, like automake defaults
182 # to, but overridden by upstream because on Linux this is not
183 # necessary, bug #449126
184 sed -i \
185 -e 's/\<LINK\>/CXXLINK/' \
186 src/Makefile.am || die
187 sed -i \
188 -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
189 src/Makefile.in || die
190 fi
191
192 [[ ${PV} == 9999 ]] && eautoreconf
193 }
194
195 src_configure() {
196 econf \
197 --without-coretext \
198 --without-uniscribe \
199 $(use_enable static-libs static) \
200 $(use_with cairo) \
201 $(use_with glib) \
202 $(use_with glib gobject) \
203 $(use_with graphite graphite2) \
204 $(use_with icu) \
205 $(use_enable introspection) \
206 $(use_with truetype freetype)
207 }
208
209 src_install() {
210 default
211 prune_libtool_files --modules
212 }