summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-11-04 09:54:57 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-11-04 09:54:57 +0000
commit6bbf634bc0ff29f47dc3f4795c5066e06c67bc89 (patch)
tree45f17bbedaec12b01fa0f051a1c9108cdf231fe2 /x11-libs
parentRevbump to make gcov optional (bug 436812 by Alexander E. Patrakov), avoid co... (diff)
downloadgentoo-2-6bbf634bc0ff29f47dc3f4795c5066e06c67bc89.tar.gz
gentoo-2-6bbf634bc0ff29f47dc3f4795c5066e06c67bc89.tar.bz2
gentoo-2-6bbf634bc0ff29f47dc3f4795c5066e06c67bc89.zip
Leave -buggy_gradients.patch behind USE="legacy-drivers" for users of, for example, <x11-drivers/nvidia-drivers-304.30.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/ChangeLog7
-rw-r--r--x11-libs/cairo/cairo-1.12.6.ebuild6
-rw-r--r--x11-libs/cairo/cairo-9999.ebuild6
-rw-r--r--x11-libs/cairo/metadata.xml1
4 files changed, 13 insertions, 7 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 6c01f36a4e7c..7f380aaf50c1 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.309 2012/10/31 23:12:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.310 2012/11/04 09:54:57 ssuominen Exp $
+
+ 04 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> cairo-1.12.6.ebuild,
+ cairo-9999.ebuild, metadata.xml:
+ Leave -buggy_gradients.patch behind USE="legacy-drivers" for users of, for
+ example, <x11-drivers/nvidia-drivers-304.30.
*cairo-1.12.6 (31 Oct 2012)
diff --git a/x11-libs/cairo/cairo-1.12.6.ebuild b/x11-libs/cairo/cairo-1.12.6.ebuild
index 2ff3fb4f7e34..5224c819dc8b 100644
--- a/x11-libs/cairo/cairo-1.12.6.ebuild
+++ b/x11-libs/cairo/cairo-1.12.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.6.ebuild,v 1.1 2012/10/31 23:12:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.6.ebuild,v 1.2 2012/11/04 09:54:57 ssuominen Exp $
EAPI=4
@@ -20,7 +20,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
HOMEPAGE="http://cairographics.org/"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
+IUSE="X aqua debug directfb doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb"
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
RESTRICT="test"
@@ -71,7 +71,7 @@ REQUIRED_USE="
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
- epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+ use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
epatch_user
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index e6305f7e4900..cecdb468476d 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.23 2012/10/31 23:12:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.24 2012/11/04 09:54:57 ssuominen Exp $
EAPI=4
@@ -20,7 +20,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
HOMEPAGE="http://cairographics.org/"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
+IUSE="X aqua debug directfb doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb"
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
RESTRICT="test"
@@ -72,7 +72,7 @@ REQUIRED_USE="
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
- epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+ use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
epatch_user
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 9253bd379cc8..30bed9b241cc 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -17,6 +17,7 @@
<flag name='drm'>Use Linux DRM for backend acceleration</flag>
<flag name='gallium'>Use Mesa's Gallium backend for acceleration</flag>
<flag name='glib'>Compile with GLib Object System support</flag>
+ <flag name='legacy-drivers'>Include the buggy gradients patch (for legacy drivers, such as nvidia-drivers older than 304.30)</flag>
<flag name='openvg'>Use OpenVG for backend acceleration</flag>
</use>
</pkgmetadata>