Add patch for Interix; move prefix keywords from overlay

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 37 insertions, 8 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/Manifest b/x11-libs/cairo/Manifest
index 93741655fd12..9aacec263cd6 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,7 @@
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a
 AUX cairo-1.6.4-libpng-api-change.patch 799 RMD160 407e2bdbaa1624c2b70c4837eb872b84d48086e6 SHA1 aac038b81fba395b68b27c64814e19bbc1e8826d SHA256 82cf3e542f46b6c07dc32b16c622c0b15bb356f5069b34a9d1cdbd4b4d7481f4
 AUX cairo-1.8.6-status-return-fix.patch 784 RMD160 cfa21d49438ad4493fd27f619c2ec3286dc4ce97 SHA1 448a1a5c188ac8543c410700dfefa7938c37fcb5 SHA256 9ac4c13454d7ba44a4e3998bf1e25ff3b6dc937885e2f5275de74b9a825bf056
+AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b5 SHA1 857a4d2be0118a6d2d0d80388b5963a5f768341d SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299
 DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
 DIST cairo-1.6.4.tar.gz 5042623 RMD160 ccae736a40d985b72bda7c2f0a98a0838020658e SHA1 9d990fe39a125ceb07221623c237cd7015855d5c SHA256 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
 DIST cairo-1.8.6.tar.gz 6616544 RMD160 2374236afabbe248a642bf1cac6a5996f64bed62 SHA1 d1e5479d4eeb7b1a3589672e3ef8f4899e7c5eba SHA256 93a347af0cecf258be8fb54265b16a0fb16317df4a32896141d2987c30773535
@@ -8,6 +9,6 @@ DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750
 EBUILD cairo-1.4.14.ebuild 1970 RMD160 0e4e5bd351fb6abd816b446e3556b628e88ef003 SHA1 032284f0d54252fe14d7eced9e4ebb5b87d4e727 SHA256 e69b9626809f4462dc9ba7d79b1494551e6675f062987436e51d0d72aba85876
 EBUILD cairo-1.6.4-r1.ebuild 2285 RMD160 2b1fee38aa461cfb7cc5cb0bc819735e154f2392 SHA1 7fe1d1697203fc44845aad8c3d8d157d8251f680 SHA256 1be22a3f9f761680e5421552ea04d949e7b6ce814ac87a0680c07509c4b3424e
 EBUILD cairo-1.8.6-r1.ebuild 3034 RMD160 9d6af9d05603e8425ab1e20fdc45ba06e868523c SHA1 c31f2b35f8cf3e888ad845029589a2139a8ac9eb SHA256 ce3b5862e8e0c8749d45adec8517b359b9f70cff565d5e7d390d2f77d08cd345
-EBUILD cairo-1.8.8.ebuild 2732 RMD160 33546771019f2f595793d8c401af31518a2a19a0 SHA1 9702eb73380fb65f43b65d7b377db2d0633ec027 SHA256 96081a08b5002f89eb1c049bcfa67e01b6520547e6bb009f03ca8bededc75665
-MISC ChangeLog 31915 RMD160 1a539ccff03347be2c4364f7a2c97e0411404c53 SHA1 230cfae57cbf467762be7952ce6abe5b1a1a66fe SHA256 d074aedbf0c83ea3efa6ad69fe0895df9e23fa1d56dcb581a18b9da035c8760a
+EBUILD cairo-1.8.8.ebuild 3226 RMD160 1e45398f9ef62ee7de1067e3c7777ef3e81726f5 SHA1 2e7a795656deb696025f676757872864d3699a43 SHA256 28c4e8c1fd078baa9f65c3d5b953e8606aaa2240f00adba7c0a01d03e392647e
+MISC ChangeLog 32077 RMD160 6f58623b18228798f5bc727972cbef33f50fc7da SHA1 f68c9bf7f1436ef19543ea194462c4b2cc8745b8 SHA256 2170f8392967faf57cea39c8356d0b0583dc136462f1ece02baee49b2546463b
 MISC metadata.xml 628 RMD160 589b0a5e55683527204892191462856d90661d4e SHA1 b0f6e67dffc97e5c0ed9acea7448cd5f92e36c41 SHA256 802fcf2d639a4125475acd325ebfa874ef3e89055e02636968baa9fa6fc5e406
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)
+