Add patch for Interix; move prefix keywords from overlay

(Portage version: -svn/cvs/Linux i686)

3 files changed, 34 insertions, 6 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 1cc7677d8a27..64d667fe6869 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.230 2009/10/09 18:42:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.231 2009/12/24 05:09:56 abcd Exp $
+
+  24 Dec 2009; Jonathan Callen <abcd@gentoo.org> cairo-1.8.8.ebuild,
+  +files/cairo-1.8.8-interix.patch:
+  Add patch for Interix; move prefix keywords from overlay
 
   09 Oct 2009; Raúl Porcel <armin76@gentoo.org> cairo-1.8.8.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #285154
diff --git a/x11-libs/cairo/cairo-1.8.8.ebuild b/x11-libs/cairo/cairo-1.8.8.ebuild
index ee3e3bd5afbf..4f735941523a 100644
--- a/x11-libs/cairo/cairo-1.8.8.ebuild
+++ b/x11-libs/cairo/cairo-1.8.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 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.12 2009/10/09 18:42:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.8.ebuild,v 1.13 2009/12/24 05:09:56 abcd Exp $
 
 EAPI=2
 
-inherit eutils flag-o-matic libtool
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -12,8 +12,8 @@ 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"
-IUSE="cleartype debug directfb doc glitz opengl svg X xcb"
+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"
@@ -54,11 +54,18 @@ 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
+
 	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	elibtoolize
+	# 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
 
@@ -71,6 +78,7 @@ src_configure() {
 		$(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"
 }
 
diff --git a/x11-libs/cairo/files/cairo-1.8.8-interix.patch b/x11-libs/cairo/files/cairo-1.8.8-interix.patch
new file mode 100644
index 000000000000..dc20714ae26b
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.8.8-interix.patch
@@ -0,0 +1,16 @@
+diff -ru cairo-1.8.8.orig/build/configure.ac.tools cairo-1.8.8/build/configure.ac.tools
+--- cairo-1.8.8.orig/build/configure.ac.tools	2009-09-30 13:36:42 +0200
++++ cairo-1.8.8/build/configure.ac.tools	2009-09-30 13:50:50 +0200
+@@ -21,5 +21,12 @@
+ *) PKGCONFIG_REQUIRES="Requires.private"; ;;
+ esac
+ 
++dnl hmm... on interix, things go really bad with Requires.private, since libpng12
++dnl is missing on the final link commands, so gtk+'s configure checks for cairo
++dnl fail miserably with unresolved symbols to it.
++case "$host_os" in
++interix*) PKGCONFIG_REQUIRES="Requires" ;;
++esac
++
+ AC_SUBST(PKGCONFIG_REQUIRES)
+