New release: 1.0.0

(Portage version: 2.0.51.22-r2)

7 files changed, 32 insertions, 57 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index a4d0099b9391..26db21d81fca 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.42 2005/08/23 21:09:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.43 2005/08/25 10:42:04 leonardop Exp $
+
+*cairo-1.0.0 (25 Aug 2005)
+
+  25 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -files/cairo-0.9.2-vendor_string.patch, -files/xrender.pc,
+  -cairo-0.9.2-r1.ebuild, +cairo-1.0.0.ebuild:
+  New version.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> cairo-0.3.0-r2.ebuild:
   stable on ia64
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e1a3ccaaa522..7857b228faec 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,18 +1,20 @@
-MD5 3a4cce771cdc4714c6931467622c9ddc cairo-0.1.23-r1.ebuild 757
+MD5 eba3019d177712663b5cab44b12ea2a1 ChangeLog 5983
 MD5 43ded6c4bff0885355373b438d1e9a56 cairo-0.9.2-r1.ebuild 1536
+MD5 3a4cce771cdc4714c6931467622c9ddc cairo-0.1.23-r1.ebuild 757
+MD5 19e36a360f049bd629b5a9cd3d293734 cairo-1.0.0.ebuild 1549
 MD5 4db2c222787dd6470523acdfe996891e cairo-0.2.0-r1.ebuild 900
-MD5 ea284a6e24864155e0176859cbddf1b3 metadata.xml 335
-MD5 eba3019d177712663b5cab44b12ea2a1 ChangeLog 5983
 MD5 627da87d1d67830749f3dafde81804ca cairo-0.3.0.ebuild 843
-MD5 1d2ad415e2e6db1a58640bb93b15a34f cairo-0.4.0.ebuild 994
+MD5 ea284a6e24864155e0176859cbddf1b3 metadata.xml 335
 MD5 c307699f3bb9e8e6f81b2aba114c1ea2 cairo-0.3.0-r2.ebuild 998
-MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
-MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r2 63
-MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0-r1 63
-MD5 4df3bcd9171f83ca24b03ab0f8eefb24 files/cairo-0.3.0-header-fix.diff 697
+MD5 1d2ad415e2e6db1a58640bb93b15a34f cairo-0.4.0.ebuild 994
+MD5 bc9e5e0986980a06b8ce6393b5e84cab files/digest-cairo-0.9.2-r1 64
 MD5 39dcb140b758b53ecaceda25055f2b9d files/cairo-0.9.2-vendor_string.patch 665
 MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64
-MD5 bc9e5e0986980a06b8ce6393b5e84cab files/digest-cairo-0.9.2-r1 64
-MD5 f84da26023eb9d5a29079fbccc555523 files/digest-cairo-0.4.0 63
+MD5 2d06b8355150f68fc54350a976a5e668 files/digest-cairo-1.0.0 64
+MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0-r1 63
 MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0 63
+MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
+MD5 4df3bcd9171f83ca24b03ab0f8eefb24 files/cairo-0.3.0-header-fix.diff 697
 MD5 1ecec7f667ad4b91d876db0efdf4a261 files/cairo-0.4.0-makefile.patch 1553
+MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r2 63
+MD5 f84da26023eb9d5a29079fbccc555523 files/digest-cairo-0.4.0 63
diff --git a/x11-libs/cairo/cairo-0.9.2-r1.ebuild b/x11-libs/cairo/cairo-1.0.0.ebuild
index 05c960b443bf..f265c85e0314 100644
--- a/x11-libs/cairo/cairo-0.9.2-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.0.0.ebuild
@@ -1,28 +1,29 @@
 # 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.9.2-r1.ebuild,v 1.1 2005/08/18 17:13:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.0.0.ebuild,v 1.1 2005/08/25 10:42:04 leonardop 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"
+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 ~sparc ~x86"
 IUSE="doc glitz png static X"
 
-RDEPEND="X? ( ||( (
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2.1
+	sys-libs/zlib
+	X? (
+		||(	(
 			x11-libs/libXrender
 			x11-libs/libX11
 			x11-libs/libXt )
-		virtual/x11 )
+			virtual/x11 )
 		virtual/xft )
-	media-libs/fontconfig
-	>=media-libs/freetype-2.1
-	sys-libs/zlib
-	glitz? ( =media-libs/glitz-0.4.4 )
+	glitz? ( >=media-libs/glitz-0.4.4 )
 	png? ( media-libs/libpng )
 	!<x11-libs/cairo-0.2"
 
@@ -32,20 +33,9 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.2 )"
 
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Recognize gentoo's X server. See
-	# <https://bugs.freedesktop.org/show_bug.cgi?id=4068>. For more details
-	# about the problem it fixes, see --GNOME bug-- #306216.
-	epatch ${FILESDIR}/${P}-vendor_string.patch
-}
-
 src_compile() {
-	local myconf="$(use_enable X xlib) $(use_enable png) \
-		$(use_enable static) $(use_enable doc gtk-doc) \
-		$(use_enable glitz)"
+	local myconf="$(use_enable X xlib) $(use_with X x) $(use_enable png) \
+		$(use_enable static) $(use_enable doc gtk-doc) $(use_enable glitz)"
 
 	econf $myconf || die "./configure failed"
 	emake || die "Compilation failed"
diff --git a/x11-libs/cairo/files/cairo-0.9.2-vendor_string.patch b/x11-libs/cairo/files/cairo-0.9.2-vendor_string.patch
deleted file mode 100644
index a90bba38ad68..000000000000
--- a/x11-libs/cairo/files/cairo-0.9.2-vendor_string.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/cairo-xlib-surface.c.orig	2005-08-10 16:52:14.000000000 +0300
-+++ src/cairo-xlib-surface.c	2005-08-15 18:09:31.000000000 +0300
-@@ -1633,10 +1633,10 @@
-     }
- 
-     surface->buggy_repeat = FALSE;
--    if (strcmp (ServerVendor (dpy), "The X.Org Foundation") == 0) {
-+    if (strstr (ServerVendor (dpy), "The X.Org Foundation") != NULL) {
- 	if (VendorRelease (dpy) <= 60802000)
- 	    surface->buggy_repeat = TRUE;
--    } else if (strcmp (ServerVendor (dpy), "The XFree86 Project, Inc") == 0) {
-+    } else if (strstr (ServerVendor (dpy), "The XFree86 Project, Inc") != NULL) {
- 	if (VendorRelease (dpy) <= 40400000)
- 	    surface->buggy_repeat = TRUE;
-     }
diff --git a/x11-libs/cairo/files/digest-cairo-0.9.2-r1 b/x11-libs/cairo/files/digest-cairo-0.9.2-r1
deleted file mode 100644
index 0463cdceb65c..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.9.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 992095a5db597384a89b41e93737105d cairo-0.9.2.tar.gz 1346039
diff --git a/x11-libs/cairo/files/digest-cairo-1.0.0 b/x11-libs/cairo/files/digest-cairo-1.0.0
new file mode 100644
index 000000000000..8a58e3251d18
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.0.0
@@ -0,0 +1 @@
+MD5 f0ff35c91983b7bf226154e68b280be3 cairo-1.0.0.tar.gz 1439299
diff --git a/x11-libs/cairo/files/xrender.pc b/x11-libs/cairo/files/xrender.pc
deleted file mode 100644
index aeff8273b44a..000000000000
--- a/x11-libs/cairo/files/xrender.pc
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr/X11R6
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Xrender
-Description: Xrender
-Version: 1.0
-Cflags:
-Libs: -L${libdir} -lXrender