Version bump fixes bug #351319. Drop older.

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

8 files changed, 17 insertions, 265 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 201579d26fcb..b0edef273cea 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/cairo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.265 2010/11/06 15:34:56 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.266 2011/01/11 18:58:37 scarabeus Exp $
+
+*cairo-1.10.2 (11 Jan 2011)
+
+  11 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cairo-1.8.8.ebuild,
+  -cairo-1.8.8-r1.ebuild, -files/cairo-1.8.8-libpng14.patch,
+  -cairo-1.10.0-r3.ebuild, -files/cairo-1.10.0-buggy_gradients.patch,
+  -files/cairo-1.10.0-install-sh.patch, +cairo-1.10.2.ebuild,
+  cairo-9999.ebuild:
+  Version bump fixes bug #351319. Drop older.
 
   06 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> cairo-1.10.0-r3.ebuild,
   cairo-9999.ebuild:
diff --git a/x11-libs/cairo/cairo-1.10.0-r3.ebuild b/x11-libs/cairo/cairo-1.10.2.ebuild
index 50731f769dea..59aae6499207 100644
--- a/x11-libs/cairo/cairo-1.10.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0-r3.ebuild,v 1.3 2010/11/06 15:34:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2.ebuild,v 1.1 2011/01/11 18:58:37 scarabeus Exp $
 
 EAPI=3
 
@@ -62,8 +62,6 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-	epatch "${FILESDIR}"/${P}-buggy_gradients.patch #336696
-	epatch "${FILESDIR}"/${P}-install-sh.patch #336329
 
 	# Slightly messed build system YAY
 	if [[ ${PV} == *9999* ]]; then
@@ -87,11 +85,9 @@ src_configure() {
 	#gets rid of fbmmx.c inlining warnings
 	append-flags -finline-limit=1200
 
-	# bug #342319
-	[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
-
 	if use X; then
 		myopts+="
+			--enable-tee=yes
 			$(use_enable drm)
 		"
 
diff --git a/x11-libs/cairo/cairo-1.8.8-r1.ebuild b/x11-libs/cairo/cairo-1.8.8-r1.ebuild
deleted file mode 100644
index ee0742bf72dc..000000000000
--- a/x11-libs/cairo/cairo-1.8.8-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.8-r1.ebuild,v 1.8 2010/07/19 14:39:48 josejx Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz
-	mirror://gentoo/${PN}-1.8-lcd_filter.patch.bz2"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cleartype debug directfb doc glitz lcdfilter opengl +svg X xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2.1.9
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0
-	>=x11-libs/pixman-0.12.0
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
-	svg? ( dev-libs/libxml2 )
-	X? ( 	>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft )
-	xcb? (	>=x11-libs/libxcb-0.92
-		x11-libs/xcb-util )"
-#	test? (
-#	pdf test
-#	x11-libs/pango
-#	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2[gtk]
-#	ps test
-#	app-text/ghostscript-gpl
-#	svg test
-#	>=x11-libs/gtk+-2.0
-#	>=gnome-base/librsvg-2.15.0
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/libtool-2
-	doc? (	>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2 )
-	X? ( x11-proto/renderproto )"
-
-src_prepare() {
-	if use lcdfilter; then
-		# LCD filter patch from Ubuntu, taken from:
-		# http://bazaar.launchpad.net/%7Eubuntu-branches/ubuntu/lucid/cairo/lucid/files/head%3A/debian/patches/
-		epatch "${WORKDIR}"/${PN}-1.8-lcd_filter.patch
-	elif use cleartype; then
-		# ClearType-like patches applied by ArchLinux
-		epatch "${FILESDIR}"/${PN}-1.2.4-lcd-cleartype-like.diff
-	fi
-
-	epatch "${FILESDIR}"/${P}-interix.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	# upgraded to an eautoreconf for the above interix patch.
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=$(pkg-config --libs glitz-glx)
-	fi
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		--enable-ft --enable-ps \
-		$(use_enable aqua quartz) $(use_enable aqua quartz-image) \
-		|| die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if use xcb; then
-		ewarn "You have enabled the Cairo XCB backend which is used only by"
-		ewarn "a select few apps. The Cairo XCB backend is presently"
-		ewarn "un-maintained and needs a lot of work to get it caught up"
-		ewarn "to the Xrender and Xlib backends, which are the backends used"
-		ewarn "by most applications. See:"
-		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
-	fi
-}
diff --git a/x11-libs/cairo/cairo-1.8.8.ebuild b/x11-libs/cairo/cairo-1.8.8.ebuild
deleted file mode 100644
index 785aefd8b641..000000000000
--- a/x11-libs/cairo/cairo-1.8.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.8.ebuild,v 1.18 2010/03/08 09:00:40 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cleartype debug directfb doc glitz opengl +svg X xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2.1.9
-	sys-libs/zlib
-	media-libs/libpng
-	>=x11-libs/pixman-0.12.0
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
-	svg? ( dev-libs/libxml2 )
-	X? ( 	>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft )
-	xcb? (	>=x11-libs/libxcb-0.92
-		x11-libs/xcb-util )"
-#	test? (
-#	pdf test
-#	x11-libs/pango
-#	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2[gtk]
-#	ps test
-#	app-text/ghostscript-gpl
-#	svg test
-#	>=x11-libs/gtk+-2.0
-#	>=gnome-base/librsvg-2.15.0
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/libtool-2
-	doc? (	>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2 )
-	X? ( x11-proto/renderproto )"
-
-src_prepare() {
-	# ClearType-like patches applied by ArchLinux
-	use cleartype && epatch "${FILESDIR}"/cairo-1.2.4-lcd-cleartype-like.diff
-
-	epatch "${FILESDIR}"/${P}-interix.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	# upgraded to an eautoreconf for the above interix patch.
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=$(pkg-config --libs glitz-glx)
-	fi
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		--enable-ft --enable-ps \
-		$(use_enable aqua quartz) $(use_enable aqua quartz-image) \
-		|| die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if use xcb; then
-		ewarn "You have enabled the Cairo XCB backend which is used only by"
-		ewarn "a select few apps. The Cairo XCB backend is presently"
-		ewarn "un-maintained and needs a lot of work to get it caught up"
-		ewarn "to the Xrender and Xlib backends, which are the backends used"
-		ewarn "by most applications. See:"
-		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
-	fi
-}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index d47c6ad18ab5..57fbab4e1386 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.8 2010/11/06 15:34:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.9 2011/01/11 18:58:37 scarabeus Exp $
 
 EAPI=3
 
@@ -87,6 +87,7 @@ src_configure() {
 
 	if use X; then
 		myopts+="
+			--enable-tee=yes
 			$(use_enable drm)
 		"
 
diff --git a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index a58c2f8f4138..000000000000
--- a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch
-http://bugs.gentoo.org/336696
-
---- src/cairo-xlib-display.c
-+++ src/cairo-xlib-display.c
-@@ -353,11 +353,7 @@
-     /* Prior to Render 0.10, there is no protocol support for gradients and
-      * we call function stubs instead, which would silently consume the drawing.
-      */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
-     display->buggy_gradients = TRUE;
--#else
--    display->buggy_gradients = FALSE;
--#endif
-     display->buggy_pad_reflect = FALSE;
-     display->buggy_repeat = FALSE;
- 
diff --git a/x11-libs/cairo/files/cairo-1.10.0-install-sh.patch b/x11-libs/cairo/files/cairo-1.10.0-install-sh.patch
deleted file mode 100644
index b654fd10eede..000000000000
--- a/x11-libs/cairo/files/cairo-1.10.0-install-sh.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.ac.orig	2010-09-09 11:23:11.298237207 -0600
-+++ configure.ac	2010-09-09 11:21:38.149557655 -0600
-@@ -3,12 +3,12 @@
- AC_INIT([cairo],
- 	[cairo_version_major.cairo_version_minor.cairo_version_micro],
- 	[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
-+AC_CONFIG_AUX_DIR(build)
-+AC_CONFIG_MACRO_DIR(build)
- AC_GNU_SOURCE
- AC_USE_SYSTEM_EXTENSIONS
- AC_CONFIG_SRCDIR(src/cairo.h)
- AC_CONFIG_HEADERS(config.h)
--AC_CONFIG_AUX_DIR(build)
--AC_CONFIG_MACRO_DIR(build)
- AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
diff --git a/x11-libs/cairo/files/cairo-1.8.8-libpng14.patch b/x11-libs/cairo/files/cairo-1.8.8-libpng14.patch
deleted file mode 100644
index 7756791f8dff..000000000000
--- a/x11-libs/cairo/files/cairo-1.8.8-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=305117
-
---- configure.ac
-+++ configure.ac
-@@ -161,7 +161,7 @@
-   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-   if test "x$png_REQUIRES" = x; then
-     # libpng13 is GnuWin32's libpng-1.2.8 :-(
--    for l in libpng12 libpng13 libpng10 ; do
-+    for l in libpng14 libpng12 libpng13 libpng10 ; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes