Revision bump to fix the cairo-xlib.h header. See bug #87420

Package-Manager: portage-2.0.51.19

5 files changed, 89 insertions, 11 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 2da3bc4ecb0a..df8cb0e6ff56 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.32 2005/03/07 16:57:21 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.33 2005/04/11 20:23:08 latexer Exp $
+
+*cairo-0.3.0-r2 (11 Apr 2005)
+
+  11 Apr 2005; Peter Johanson <latexer@gentoo.org>
+  +files/cairo-0.3.0-header-fix.diff, +cairo-0.3.0-r2.ebuild:
+  Revision bump to fix the cairo-xlib.h header. See bug #87420
 
   07 Mar 2005; Markus Rothe <corsair@gentoo.org> cairo-0.3.0.ebuild:
   Stable on ppc64
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 9e72a7be157b..0da0f6f0629e 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,19 +1,22 @@
-MD5 df329bb9cedc0f181c69dc6249ab867f ChangeLog 4097
+MD5 05870f431e2e9533a37becb88815f8b7 cairo-0.3.0.ebuild 899
 MD5 1cb8a3a70a7b169cdbcd216194abf2f1 cairo-0.1.18-r1.ebuild 749
-MD5 ee987de739d03f978cd25cf5ec32a737 cairo-0.1.18.ebuild 780
-MD5 43802562ae8fc1669597fcfe89bdb8f7 cairo-0.1.23-r1.ebuild 809
 MD5 0fee0f88c83902870755e9bba23fe7dd cairo-0.1.23.ebuild 823
-MD5 65d1d5c2aa536148fb35cee02b3a8428 metadata.xml 337
-MD5 cccbbcd4ad886bc80def1fcb5b8b4035 cairo-0.2.0.ebuild 899
-MD5 05870f431e2e9533a37becb88815f8b7 cairo-0.3.0.ebuild 899
+MD5 41995944647f476ada53a020c1cc9b43 cairo-0.3.0-r2.ebuild 1048
 MD5 6bfb62d3c9642fff997fe8bc5b4a88cf cairo-0.2.0-r1.ebuild 950
+MD5 43802562ae8fc1669597fcfe89bdb8f7 cairo-0.1.23-r1.ebuild 809
+MD5 ee987de739d03f978cd25cf5ec32a737 cairo-0.1.18.ebuild 780
 MD5 acda6c97791710684d51c1652d2342b0 cairo-0.3.0-r1.ebuild 951
-MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18 64
-MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18-r1 64
-MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23 64
-MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64
+MD5 cccbbcd4ad886bc80def1fcb5b8b4035 cairo-0.2.0.ebuild 899
+MD5 d725b85394ed7f7a992311d14645068b ChangeLog 4305
+MD5 65d1d5c2aa536148fb35cee02b3a8428 metadata.xml 337
+MD5 4df3bcd9171f83ca24b03ab0f8eefb24 files/cairo-0.3.0-header-fix.diff 697
 MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
 MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0 63
 MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0 63
+MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18 64
+MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23 64
+MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18-r1 64
+MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64
 MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0-r1 63
 MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r1 63
+MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r2 63
diff --git a/x11-libs/cairo/cairo-0.3.0-r2.ebuild b/x11-libs/cairo/cairo-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..e0cf45e40565
--- /dev/null
+++ b/x11-libs/cairo/cairo-0.3.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.3.0-r2.ebuild,v 1.1 2005/04/11 20:23:08 latexer Exp $
+
+inherit eutils
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
+IUSE="glitz png X"
+
+DEPEND="X? (
+			virtual/x11
+			virtual/xft
+			|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
+		)
+		media-libs/fontconfig
+		>=media-libs/freetype-2*
+		>=media-libs/libpixman-0.1.2
+		glitz? ( =media-libs/glitz-0.3.0* )
+		png? ( media-libs/libpng )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-header-fix.diff
+}
+
+src_compile() {
+	econf \
+		$(use_enable X xlib) \
+		$(use_enable glitz) \
+		$(use_enable png) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+}
diff --git a/x11-libs/cairo/files/cairo-0.3.0-header-fix.diff b/x11-libs/cairo/files/cairo-0.3.0-header-fix.diff
new file mode 100644
index 000000000000..0dacd9fe5052
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-0.3.0-header-fix.diff
@@ -0,0 +1,24 @@
+diff -aur cairo-0.3.0-orig/src/cairo-xlib.h cairo-0.3.0/src/cairo-xlib.h
+--- cairo-0.3.0-orig/src/cairo-xlib.h	2005-01-20 11:28:54.000000000 -0500
++++ cairo-0.3.0/src/cairo-xlib.h	2005-04-08 20:23:30.000000000 -0400
+@@ -40,6 +40,9 @@
+ #define CAIRO_XLIB_H
+ #ifdef  CAIRO_HAS_XLIB_SURFACE
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
+ #include <X11/extensions/Xrender.h>
+ 
+ /* XXX: This shold be renamed to cairo_set_target_xlib to match the
+@@ -66,6 +69,10 @@
+ cairo_xlib_surface_set_size (cairo_surface_t *surface, int width, int height);
+ */
+ 
++#ifdef __cplusplus
++} /* extern "C" */
++#endif /* __cplusplus */
++
+ #endif /* CAIRO_HAS_XLIB_SURFACE */
+ #endif /* CAIRO_XLIB_H */
+ 
diff --git a/x11-libs/cairo/files/digest-cairo-0.3.0-r2 b/x11-libs/cairo/files/digest-cairo-0.3.0-r2
new file mode 100644
index 000000000000..31d20e43ed9f
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-0.3.0-r2
@@ -0,0 +1 @@
+MD5 78c1a536d3a45bdc06a8335d33e63d8f cairo-0.3.0.tar.gz 514446