bump to latest cairo 1.6 release candidate. fix freetype depend

Package-Manager: portage-2.1.5_rc2

4 files changed, 20 insertions, 14 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index f28c8a341f04..10b97e06301e 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.169 2008/04/02 13:37:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.170 2008/04/06 17:31:14 cardoe Exp $
+
+*cairo-1.5.18 (06 Apr 2008)
+
+  06 Apr 2008; Doug Goldstein <cardoe@gentoo.org> -cairo-1.5.14.ebuild,
+  cairo-1.5.16.ebuild, +cairo-1.5.18.ebuild:
+  bump to latest cairo 1.6 release candidate. fix freetype depend
 
 *cairo-1.5.16 (02 Apr 2008)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 5aabb0f5ef19..739604c7e267 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST cairo-1.4.12.tar.gz 3276610 RMD160 5ed65d5872c0561f3392e60007898d9360d83d0a SHA1 45d5257e5a0c1524bcc25660a96b2c79d012ad3f SHA256 a1a1e4ccec8da980141d903adbe83535481b4fda96a479456438d3dfbc767d5d
 DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
-DIST cairo-1.5.14.tar.gz 4877446 RMD160 93d2e085612201a906e9f2ca654bf4558f423ce3 SHA1 af40870b3ec62bbdeaecdf3ea4cce23919fedc42 SHA256 fbca8a292b83cbf184835be0e6007c194d7bab3ce4ee2bced8ea7bf07a7e151b
 DIST cairo-1.5.16.tar.gz 4948652 RMD160 7388a0bd8258623298e92f96c78ec4d953269e0c SHA1 46e08f540f0abf18dea4b889c82455c556c50f2e SHA256 620633a6bee112d5ed1da2447119235127cdb34935bdbc8ee172e807cd47f419
+DIST cairo-1.5.18.tar.gz 4997107 RMD160 0c0382a51a7ec60f16f54d1691590a3ca4de6fc0 SHA1 68d9e7fed9158d8584cf8a7831fe7b3441f7970f SHA256 ccb82a7ff945b49ab842340ab28ce2b41acb23f3a6a1a40387c7f56b9e27e0e0
 EBUILD cairo-1.4.12.ebuild 1968 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c SHA1 10cd93281e9af9858cd0f61a0708d53681c81afd SHA256 6f25e6e271d47c75deeee9121d25098eb0c6aa25cbdf60349e76d094a4f0d912
 EBUILD cairo-1.4.14.ebuild 1979 RMD160 e02b8f16936817056ed0b9bc3ad92f62a03441fa SHA1 78017dbb2d8e38b903ed94a47a59c6c7c2b1b474 SHA256 56197b3bf132e8f84caece71e62368c7b3481e69458b1ca9597cd7e77200ba3f
-EBUILD cairo-1.5.14.ebuild 2074 RMD160 4fc2441177b7ba2c29e6c46767e9058dc953a05b SHA1 f5e0b21eb9098e8bf9aafead17fc373fd19681be SHA256 8e81ab95cdb38fa98b3de8f6fc152cbbd15006579ce9eed269cdcc19c7d67e58
-EBUILD cairo-1.5.16.ebuild 2075 RMD160 579d210d71e1774ba6913a20f69b7be3844a4d01 SHA1 38ad16ac41a2823cee976d511efbc06063d1ba8b SHA256 01ba38b08e4c019a9fbd2d349f8e5b56e7304a0eed5ed1a85ecb84ab51b9d14b
-MISC ChangeLog 23726 RMD160 6aa06c8d656826728eeff6cf876c8ccc7a1f92d0 SHA1 d0b342e7ba935cbf4c4a6b9284209468a358daa1 SHA256 b44dfa02e13245a1366f84a56c7bb799663295626298c0a1d06685067f8e4585
+EBUILD cairo-1.5.16.ebuild 2075 RMD160 3ae92bd7a48e88a1044dcbcd0d8f6a8b0e06eaf6 SHA1 ba79bfe120cd8571d665f3f1f5d783c1a7349782 SHA256 392702d99fa7737eceebd84171237bb54dcf02f981a95791509e53e62dba66b0
+EBUILD cairo-1.5.18.ebuild 2075 RMD160 f9daa90cdf6ed9fbaf21719b852ef2b0a9a8a135 SHA1 1a913aae722ce7f522023c5ea182b6cc016aec05 SHA256 0e0c3e457eb7843726f30dc1b4d159529f7e73e7ffaa9caaf4f8fbb01a2cf94e
+MISC ChangeLog 23939 RMD160 cd92726a69475e0ce8a3c890e91801699ea4e548 SHA1 7ed89fdc97ef3c79e9e6078eae6ce3dceec4aa36 SHA256 c61ac04f5435999787923e8e877059fa4a76a9a5012da192f23bea164b339d96
 MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfz3q8ACgkQoeSe8B0zEfwwNQCeN1DMz1uJ3HaXYFfj3I9sPXqc
-Tw4An0fvcSG1pn3LdmMTv9DRaCpN3Wq0
-=qqlO
+iEYEARECAAYFAkf5CPYACgkQoeSe8B0zEfyG/ACeLrLs0eI9lGCHoN9k26xmv5uV
+L9UAnjfITgPO4Pv/4+noL0f79DM9m5tR
+=1Myr
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.5.16.ebuild b/x11-libs/cairo/cairo-1.5.16.ebuild
index 0fdaa66361d1..6ce83abb1d27 100644
--- a/x11-libs/cairo/cairo-1.5.16.ebuild
+++ b/x11-libs/cairo/cairo-1.5.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.16.ebuild,v 1.1 2008/04/02 13:37:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.16.ebuild,v 1.2 2008/04/06 17:31:14 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE="debug directfb doc glitz opengl svg test X xcb"
 
 RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
+		>=media-libs/freetype-2.1.9
 		sys-libs/zlib
 		media-libs/libpng
 		>=x11-libs/pixman-0.10.0
diff --git a/x11-libs/cairo/cairo-1.5.14.ebuild b/x11-libs/cairo/cairo-1.5.18.ebuild
index 5ac8f0503688..7fd08c850a60 100644
--- a/x11-libs/cairo/cairo-1.5.14.ebuild
+++ b/x11-libs/cairo/cairo-1.5.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.14.ebuild,v 1.3 2008/04/02 19:29:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.18.ebuild,v 1.1 2008/04/06 17:31:14 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -11,13 +11,13 @@ 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 ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz opengl svg X xcb test"
+IUSE="debug directfb doc glitz opengl svg test X xcb"
 
 RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
+		>=media-libs/freetype-2.1.9
 		sys-libs/zlib
 		media-libs/libpng
-		>=x11-libs/pixman-0.9.6
+		>=x11-libs/pixman-0.10.0
 		X?	(
 				x11-libs/libXrender
 				x11-libs/libXext