Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
Date: Tue, 31 Jul 2018 21:50:25
Message-Id: 1533073809.bf30dda1153051ac9324aeac87f68286c613e34c.mattst88@gentoo
1 commit: bf30dda1153051ac9324aeac87f68286c613e34c
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 31 21:49:46 2018 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 31 21:50:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf30dda1
7
8 x11-libs/cairo: Drop old versions
9
10 x11-libs/cairo/Manifest | 2 -
11 x11-libs/cairo/cairo-1.14.10.ebuild | 132 ------------------------------------
12 x11-libs/cairo/cairo-1.14.8.ebuild | 132 ------------------------------------
13 3 files changed, 266 deletions(-)
14
15 diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
16 index f80afa31c95..1aa5bb15b3d 100644
17 --- a/x11-libs/cairo/Manifest
18 +++ b/x11-libs/cairo/Manifest
19 @@ -1,3 +1 @@
20 -DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B 2015594f2a263250b7fd924840155aa3f813e4b6f0eaeaa3f3eec6b26935c073590a32f17b6268d99bb297ba516da7debe7e3e0abf16d36e012e761dbc7ecada SHA512 a381d97e6046da0012eb5595118efb95ff02e3e84310682e458b503ebf22d6b2663bcc1391980768bb9cd02ae809b8df2e11d6200b48745dc5ec824c342b5852
21 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
22 -DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
23
24 diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild b/x11-libs/cairo/cairo-1.14.10.ebuild
25 deleted file mode 100644
26 index 38c7f9c4921..00000000000
27 --- a/x11-libs/cairo/cairo-1.14.10.ebuild
28 +++ /dev/null
29 @@ -1,132 +0,0 @@
30 -# Copyright 1999-2018 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=6
34 -
35 -inherit eutils flag-o-matic autotools multilib-minimal
36 -
37 -if [[ ${PV} == *9999* ]]; then
38 - inherit git-r3
39 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
40 - SRC_URI=""
41 -else
42 - SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
43 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
44 -fi
45 -
46 -DESCRIPTION="A vector graphics library with cross-device output support"
47 -HOMEPAGE="https://www.cairographics.org"
48 -LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
49 -SLOT="0"
50 -IUSE="X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb"
51 -# gtk-doc regeneration doesn't seem to work with out-of-source builds
52 -#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
53 -
54 -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
55 -RESTRICT="test"
56 -
57 -RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
58 - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
59 - >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
60 - >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
61 - sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
62 - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
63 - >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
64 - gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
65 - glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
66 - opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
67 - X? (
68 - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
69 - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
70 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
71 - )
72 - xcb? (
73 - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
74 - )"
75 -DEPEND="${RDEPEND}
76 - virtual/pkgconfig
77 - >=sys-devel/libtool-2
78 - X? ( x11-base/xorg-proto )"
79 -#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
80 -# doc? (
81 -# >=dev-util/gtk-doc-1.6
82 -# ~app-text/docbook-xml-dtd-4.2
83 -# )"
84 -
85 -REQUIRED_USE="
86 - gles2? ( !opengl )
87 -"
88 -
89 -PATCHES=(
90 - "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
91 - "${FILESDIR}"/${PN}-respect-fontconfig.patch
92 -)
93 -
94 -src_prepare() {
95 - default
96 -
97 - # tests and perf tools require X, bug #483574
98 - if ! use X; then
99 - sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
100 - fi
101 -
102 - # Slightly messed build system YAY
103 - if [[ ${PV} == *9999* ]]; then
104 - touch boilerplate/Makefile.am.features
105 - touch src/Makefile.am.features
106 - touch ChangeLog
107 - fi
108 -
109 - eautoreconf
110 -}
111 -
112 -multilib_src_configure() {
113 - local myopts
114 -
115 - [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
116 -
117 - use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
118 - [[ ${CHOST} == *-darwin* ]] && myopts+=" --disable-symbol-lookup"
119 -
120 - # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
121 - if ! multilib_is_native_abi; then
122 - myopts+=" --disable-qt"
123 - fi
124 -
125 - # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
126 -
127 - ECONF_SOURCE="${S}" \
128 - econf \
129 - --disable-dependency-tracking \
130 - $(use_with X x) \
131 - $(use_enable X tee) \
132 - $(use_enable X xlib) \
133 - $(use_enable X xlib-xrender) \
134 - $(use_enable aqua quartz) \
135 - $(use_enable aqua quartz-image) \
136 - $(use_enable debug test-surfaces) \
137 - $(use_enable gles2 glesv2) \
138 - $(use_enable glib gobject) \
139 - $(use_enable opengl gl) \
140 - $(use_enable static-libs static) \
141 - $(use_enable svg) \
142 - $(use_enable valgrind) \
143 - $(use_enable xcb) \
144 - $(use_enable xcb xcb-shm) \
145 - --enable-ft \
146 - --enable-pdf \
147 - --enable-png \
148 - --enable-ps \
149 - --disable-directfb \
150 - --disable-drm \
151 - --disable-gallium \
152 - --disable-qt \
153 - --disable-vg \
154 - --disable-xlib-xcb \
155 - ${myopts}
156 -}
157 -
158 -multilib_src_install_all() {
159 - prune_libtool_files --all
160 - einstalldocs
161 -}
162
163 diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild
164 deleted file mode 100644
165 index a738d2bae07..00000000000
166 --- a/x11-libs/cairo/cairo-1.14.8.ebuild
167 +++ /dev/null
168 @@ -1,132 +0,0 @@
169 -# Copyright 1999-2018 Gentoo Foundation
170 -# Distributed under the terms of the GNU General Public License v2
171 -
172 -EAPI=6
173 -
174 -inherit eutils flag-o-matic autotools multilib-minimal
175 -
176 -if [[ ${PV} == *9999* ]]; then
177 - inherit git-r3
178 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
179 - SRC_URI=""
180 -else
181 - SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
182 - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
183 -fi
184 -
185 -DESCRIPTION="A vector graphics library with cross-device output support"
186 -HOMEPAGE="https://www.cairographics.org"
187 -LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
188 -SLOT="0"
189 -IUSE="X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb"
190 -# gtk-doc regeneration doesn't seem to work with out-of-source builds
191 -#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
192 -
193 -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
194 -RESTRICT="test"
195 -
196 -RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
197 - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
198 - >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
199 - >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
200 - sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
201 - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
202 - >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
203 - gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
204 - glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
205 - opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
206 - X? (
207 - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
208 - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
209 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
210 - )
211 - xcb? (
212 - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
213 - )"
214 -DEPEND="${RDEPEND}
215 - virtual/pkgconfig
216 - >=sys-devel/libtool-2
217 - X? ( x11-base/xorg-proto )"
218 -#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
219 -# doc? (
220 -# >=dev-util/gtk-doc-1.6
221 -# ~app-text/docbook-xml-dtd-4.2
222 -# )"
223 -
224 -REQUIRED_USE="
225 - gles2? ( !opengl )
226 -"
227 -
228 -PATCHES=(
229 - "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
230 - "${FILESDIR}"/${PN}-respect-fontconfig.patch
231 -)
232 -
233 -src_prepare() {
234 - default
235 -
236 - # tests and perf tools require X, bug #483574
237 - if ! use X; then
238 - sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
239 - fi
240 -
241 - # Slightly messed build system YAY
242 - if [[ ${PV} == *9999* ]]; then
243 - touch boilerplate/Makefile.am.features
244 - touch src/Makefile.am.features
245 - touch ChangeLog
246 - fi
247 -
248 - eautoreconf
249 -}
250 -
251 -multilib_src_configure() {
252 - local myopts
253 -
254 - [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
255 -
256 - use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
257 - [[ ${CHOST} == *-darwin* ]] && myopts+=" --disable-symbol-lookup"
258 -
259 - # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
260 - if ! multilib_is_native_abi; then
261 - myopts+=" --disable-qt"
262 - fi
263 -
264 - # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
265 -
266 - ECONF_SOURCE="${S}" \
267 - econf \
268 - --disable-dependency-tracking \
269 - $(use_with X x) \
270 - $(use_enable X tee) \
271 - $(use_enable X xlib) \
272 - $(use_enable X xlib-xrender) \
273 - $(use_enable aqua quartz) \
274 - $(use_enable aqua quartz-image) \
275 - $(use_enable debug test-surfaces) \
276 - $(use_enable gles2 glesv2) \
277 - $(use_enable glib gobject) \
278 - $(use_enable opengl gl) \
279 - $(use_enable static-libs static) \
280 - $(use_enable svg) \
281 - $(use_enable valgrind) \
282 - $(use_enable xcb) \
283 - $(use_enable xcb xcb-shm) \
284 - --enable-ft \
285 - --enable-pdf \
286 - --enable-png \
287 - --enable-ps \
288 - --disable-drm \
289 - --disable-directfb \
290 - --disable-gallium \
291 - --disable-qt \
292 - --disable-vg \
293 - --disable-xlib-xcb \
294 - ${myopts}
295 -}
296 -
297 -multilib_src_install_all() {
298 - prune_libtool_files --all
299 - einstalldocs
300 -}