From: Doug Goldstein <cardoe@gentoo.org>
Date: Tue, 20 Mar 2007 13:58:44 +0000 (+0000)
Subject: Rev bump to 1.4.2. Remove old experimental versions.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26e3a448b274cb868b85dbcf570ad19b67c53d28;p=gentoo.git

Rev bump to 1.4.2. Remove old experimental versions.
Package-Manager: portage-2.1.2.2
---

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index a0227a7a59b7..c5229055a728 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.109 2007/03/06 14:05:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.110 2007/03/20 13:58:44 cardoe Exp $
+
+*cairo-1.4.2 (20 Mar 2007)
+
+  20 Mar 2007; Doug Goldstein <cardoe@gentoo.org> -cairo-1.0.2.ebuild,
+  -cairo-1.3.10.ebuild, -cairo-1.3.12.ebuild, -cairo-1.3.14.ebuild,
+  -cairo-1.3.16.ebuild, +cairo-1.4.2.ebuild:
+  Rev bump to 1.4.2. Remove old experimental versions.
 
 *cairo-1.4.0 (06 Mar 2007)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 50b5ff16dc79..3df4055e35ef 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,27 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cairo-1.0.2-pkg_macro.patch 542 RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f025ad SHA1 0ab6c2c4aa0f441694eecc8a42e37b13efaad2bf SHA256 4ab7469075776de4fadcc733c9ceb9754b075e5a99b05fcdc247fc597b971149
-MD5 6600a332745a27c0333f2c8193a805fa files/cairo-1.0.2-pkg_macro.patch 542
-RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f025ad files/cairo-1.0.2-pkg_macro.patch 542
-SHA256 4ab7469075776de4fadcc733c9ceb9754b075e5a99b05fcdc247fc597b971149 files/cairo-1.0.2-pkg_macro.patch 542
 AUX cairo-1.0.4-ssp-nonsense.patch 591 RMD160 1189664f878f77bd00457a7db682ea6e5fd8ead7 SHA1 d541cd5b503fb21e396e263b9bdf93a00d2a4dcb SHA256 a6a0c993eec5687dd78325a35ee790597194b331290be0f2ae20783d7c638115
 MD5 2a4e0d69f3712d3974defd1e815d272e files/cairo-1.0.4-ssp-nonsense.patch 591
 RMD160 1189664f878f77bd00457a7db682ea6e5fd8ead7 files/cairo-1.0.4-ssp-nonsense.patch 591
 SHA256 a6a0c993eec5687dd78325a35ee790597194b331290be0f2ae20783d7c638115 files/cairo-1.0.4-ssp-nonsense.patch 591
-DIST cairo-1.0.2.tar.gz 1458903 RMD160 59f309974fdac86253ed9a4d00e564a2fac310eb SHA1 3a425049499b0b067ed4dc60d94b4d0819c0841b SHA256 d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e
 DIST cairo-1.0.4.tar.gz 1475777 RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb SHA1 89e72202e5b51a8914fce60f52f7c51ecdea982a SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5
 DIST cairo-1.2.4.tar.gz 2882781 RMD160 dee558b7489aa089de6963d909a8352725e10bdd SHA1 5520b771c8b85acea78fa56fc4c39b4dca6bcc7c SHA256 c1580ca951b2f57c4f8b34549997854bc48dbaf036ca1ca6c017c03db3504ddb
 DIST cairo-1.2.6.tar.gz 2973689 RMD160 4469a661b294e342ee77e726c1cefccd4837ae2e SHA1 b86b4017a9abd565ef11c72b7faee9082a04118f SHA256 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
-DIST cairo-1.3.10.tar.gz 2787973 RMD160 eb40963c760be2e2c8f9dc743cf205c69136b399 SHA1 0a899378673bfda49d1b7530405d62c24b9e051a SHA256 2ed48e592c36bf3a2581cd9935bbe2d9cb6c4d6dbb91b794fb76c632ea1f3b98
-DIST cairo-1.3.12.tar.gz 2812615 RMD160 2604af4bf3f98abdd586391dc5e43a3cb845ad16 SHA1 d84b48e06b2499e894f81c42361650ab5e00b974 SHA256 7337cec2f20e4a350d39f87a86c7fe04ae62bae412a8f3e77d1d749389ae9127
-DIST cairo-1.3.14.tar.gz 2831683 RMD160 f1d859b851077fcbe0d735fba4770f84cd84a464 SHA1 648981b1e04eb231a82befea8eaf39e01502001c SHA256 752918a5519a67a8ce05a740574116a26d98a44a37beba075f03b547903d3ff0
-DIST cairo-1.3.16.tar.gz 4156967 RMD160 23ae73ad7f7e9548cacb9ec7d0f735cb4d081d67 SHA1 8c80376b18a58727f03fea05ef191acb19903e01 SHA256 8120b653e6f298ca2508ba8a82448e9b8a0b2a598a50d9db4184548e36781d1b
 DIST cairo-1.4.0.tar.gz 3067230 RMD160 3bb3fdf41d8452b5094708da3d03796564ed9be2 SHA1 2ce727347d8285cee4ce0c3feb0a2df18316a5d3 SHA256 583f9ae2c9b7d2ef33cfbd194148e71a335dafc226e13e213f07ff2dc398bb47
-EBUILD cairo-1.0.2.ebuild 1520 RMD160 4d3fc5f4aa033901b03c881ad77e446c7921bf52 SHA1 9b32e54ba676ce4611f28cee7e3daa72956f9287 SHA256 1420732f5e05230c59a326e29202a638fa5ac829c8dc339b7393114dbd89bb3f
-MD5 7cc4050786c0cc54928392eb97eca57d cairo-1.0.2.ebuild 1520
-RMD160 4d3fc5f4aa033901b03c881ad77e446c7921bf52 cairo-1.0.2.ebuild 1520
-SHA256 1420732f5e05230c59a326e29202a638fa5ac829c8dc339b7393114dbd89bb3f cairo-1.0.2.ebuild 1520
+DIST cairo-1.4.2.tar.gz 3081092 RMD160 53ad2e60507e181cb754991c1fe8f8de47f366a3 SHA1 9e7a323fc7d81d5011044d7eb22db3bf26ff7314 SHA256 7cf292ae376e7120ec548ad6a807a2f0f4f0539a304229a3bd98921453becd47
 EBUILD cairo-1.0.4-r1.ebuild 1445 RMD160 5e3fa202244f90fcdcb053901496539cbe9cc712 SHA1 39d88ddf61c66c059ff2eecd9767f37e20e07ecc SHA256 e1837f69fb9ebf160e4cb2794d67056d74bbbdeef6a1388875d57c61dfb06cb5
 MD5 ea84d2cd7ae20d7519117887ba901ec7 cairo-1.0.4-r1.ebuild 1445
 RMD160 5e3fa202244f90fcdcb053901496539cbe9cc712 cairo-1.0.4-r1.ebuild 1445
@@ -38,37 +26,22 @@ EBUILD cairo-1.2.6.ebuild 1646 RMD160 27e49316e8a8911297488571c1768d0dd27c1158 S
 MD5 4e360cc95cf879db13750253eb9b05f0 cairo-1.2.6.ebuild 1646
 RMD160 27e49316e8a8911297488571c1768d0dd27c1158 cairo-1.2.6.ebuild 1646
 SHA256 0b1a46608e8788ed094ebaf8ee5e4bbf8d07cba490473da9d395ef2c9d796646 cairo-1.2.6.ebuild 1646
-EBUILD cairo-1.3.10.ebuild 1903 RMD160 5e7ec6b562053343bfd9a9f51cc145731603a782 SHA1 d747c6a62b24b7f49eca363e7713ba9ca9cb88ec SHA256 38941d85b2fa9135a2537da932cfaa15509926553cfdee046f4dadfdc6c30063
-MD5 ec0d6fc2866e008e986ca171b95aed03 cairo-1.3.10.ebuild 1903
-RMD160 5e7ec6b562053343bfd9a9f51cc145731603a782 cairo-1.3.10.ebuild 1903
-SHA256 38941d85b2fa9135a2537da932cfaa15509926553cfdee046f4dadfdc6c30063 cairo-1.3.10.ebuild 1903
-EBUILD cairo-1.3.12.ebuild 1903 RMD160 8f7b796f99873d5c4e84766a58b09b87fb03bf19 SHA1 48a61beebe7d9f6e1c36d6da22fb62ad53f54526 SHA256 58790abede90ed487777a2689b885f636518a4c43e5c6f73b817f3994d1901ed
-MD5 9c3e5f01b12e39a7343b02257d6c6047 cairo-1.3.12.ebuild 1903
-RMD160 8f7b796f99873d5c4e84766a58b09b87fb03bf19 cairo-1.3.12.ebuild 1903
-SHA256 58790abede90ed487777a2689b885f636518a4c43e5c6f73b817f3994d1901ed cairo-1.3.12.ebuild 1903
-EBUILD cairo-1.3.14.ebuild 1902 RMD160 26e87d32fd4e24ef71412b06daadd161d211663b SHA1 35ae96ea40b31f933c2e7dc2a37a8467e8e7e11d SHA256 9612ddd5a875619284707b4edfb06006a011049d93cdb713c78be07a2f3fcb8c
-MD5 d70d082ddec2148ea9711e529ffa7c75 cairo-1.3.14.ebuild 1902
-RMD160 26e87d32fd4e24ef71412b06daadd161d211663b cairo-1.3.14.ebuild 1902
-SHA256 9612ddd5a875619284707b4edfb06006a011049d93cdb713c78be07a2f3fcb8c cairo-1.3.14.ebuild 1902
-EBUILD cairo-1.3.16.ebuild 1902 RMD160 a351659f9fdf381a520c2667060eeee8b36e850b SHA1 9288ee178eb1ee0fa30fca5c597b1a35d8cac64d SHA256 7cd6e9a8f403d5eae7f67cea2a7cd81362f9ed8d827bb05ba5ad4cf8eb92ad96
-MD5 4db06ab14aea84af6d6983f76ed06666 cairo-1.3.16.ebuild 1902
-RMD160 a351659f9fdf381a520c2667060eeee8b36e850b cairo-1.3.16.ebuild 1902
-SHA256 7cd6e9a8f403d5eae7f67cea2a7cd81362f9ed8d827bb05ba5ad4cf8eb92ad96 cairo-1.3.16.ebuild 1902
 EBUILD cairo-1.4.0.ebuild 1900 RMD160 80d6d615b6e775dc1ee2129526e1b133f17d8e59 SHA1 5cf12fb1d33481acceee1e9cabe1c79f6df3c276 SHA256 3c8cf2babd9a17449b493b336601dc5bf9aeba8092e450fbd8fe28d24304b7ad
 MD5 5fa08475ebb8ceb6cc781c7f52e42d0f cairo-1.4.0.ebuild 1900
 RMD160 80d6d615b6e775dc1ee2129526e1b133f17d8e59 cairo-1.4.0.ebuild 1900
 SHA256 3c8cf2babd9a17449b493b336601dc5bf9aeba8092e450fbd8fe28d24304b7ad cairo-1.4.0.ebuild 1900
-MISC ChangeLog 15767 RMD160 84ee868776affffbccf5465c5672fc5125cedd2b SHA1 aeaeabb1a55932c4cf28fdd96e1d257876c2c269 SHA256 d6ac25f0ddf9ddaf90e705b07cb6cb41849d12d1b89ebc6962f4aa5ec95b68da
-MD5 0b6195e2f820552f15464f998a7522ec ChangeLog 15767
-RMD160 84ee868776affffbccf5465c5672fc5125cedd2b ChangeLog 15767
-SHA256 d6ac25f0ddf9ddaf90e705b07cb6cb41849d12d1b89ebc6962f4aa5ec95b68da ChangeLog 15767
+EBUILD cairo-1.4.2.ebuild 1900 RMD160 430544dd982ca5e43d0e7af574d4e2aa007dde6e SHA1 bf5763de2e948e42afb0498e178df4c8706ef825 SHA256 ad46001843c77ebee6289ee4f30d6ce8d5bfdf97bd726aeea140fea4b2f0837d
+MD5 5d643cda780598aef3aa0381be503f34 cairo-1.4.2.ebuild 1900
+RMD160 430544dd982ca5e43d0e7af574d4e2aa007dde6e cairo-1.4.2.ebuild 1900
+SHA256 ad46001843c77ebee6289ee4f30d6ce8d5bfdf97bd726aeea140fea4b2f0837d cairo-1.4.2.ebuild 1900
+MISC ChangeLog 16035 RMD160 48de764c0a15343906967ebca5e7f0e710d4f4c4 SHA1 78a69754a2a5ed518dd69d9ec2d1cc792293c63e SHA256 7b115f7f16a5e66bef54e02944fc1dce8667d36f3edac43ad6810c0867e10c4d
+MD5 ae0866f90799629d5270b080921ddf60 ChangeLog 16035
+RMD160 48de764c0a15343906967ebca5e7f0e710d4f4c4 ChangeLog 16035
+SHA256 7b115f7f16a5e66bef54e02944fc1dce8667d36f3edac43ad6810c0867e10c4d ChangeLog 16035
 MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
 MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3 metadata.xml 295
-MD5 d38a94545f04a9e53c001ffe35be03da files/digest-cairo-1.0.2 238
-RMD160 aa245933d72bb54db8377414b06a714c3ff29e90 files/digest-cairo-1.0.2 238
-SHA256 9070cfcc6ab84d39744d2ccbac0bc1bc6c8063cee9ab3d6934c795c0189032c4 files/digest-cairo-1.0.2 238
 MD5 dd098b533608d6250bc6d4fbe016256d files/digest-cairo-1.0.4 238
 RMD160 014452a883fabada98aae5064c27a524ff0594ff files/digest-cairo-1.0.4 238
 SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/digest-cairo-1.0.4 238
@@ -81,25 +54,16 @@ SHA256 b04bf38f8f8c64f7e1256aa588f200c2f5619f0710745279beac16b7955eb2fe files/di
 MD5 654e50f761ecfcb9b332c58fc27beac6 files/digest-cairo-1.2.6 238
 RMD160 7002a6abc268946edcdedfcd9f441e07afcbaa4f files/digest-cairo-1.2.6 238
 SHA256 7ede1b5a1356a4f399c0f56ec4c83683b89aa3d60c94b1ebc5039ef02bd8433b files/digest-cairo-1.2.6 238
-MD5 12d026bd1b0ac295697e4e7af24f804c files/digest-cairo-1.3.10 241
-RMD160 29cfe19390032131d4dd16b9870e1e03c69940c3 files/digest-cairo-1.3.10 241
-SHA256 6f6886d51e6fe06676c8e5407da0a7d9cb490f457ee9f1100c946a1ea94866f5 files/digest-cairo-1.3.10 241
-MD5 e76978a61a3b6a64ea676955a8fb3b7a files/digest-cairo-1.3.12 241
-RMD160 36c4890deab42854e6fa5bdcdd1dc6f2b4c5bafa files/digest-cairo-1.3.12 241
-SHA256 707562357ea97d1fdbe3ae63a4ba11a9c1de3a84dacda93ee7dee9d0700d972c files/digest-cairo-1.3.12 241
-MD5 81f1e62790d18daf0e98ba90da8e0644 files/digest-cairo-1.3.14 241
-RMD160 1009cd8af12a61b17a6a141c98a75fb8e47dcd1a files/digest-cairo-1.3.14 241
-SHA256 61bc93897871fd3657a412ea61de33298d40b1e4e14bd5466dc723fc145fa666 files/digest-cairo-1.3.14 241
-MD5 0d053afb2f87583f908e5c0634e953a3 files/digest-cairo-1.3.16 241
-RMD160 c160b3d9d80193395e72563635f5b7c7d907c9e0 files/digest-cairo-1.3.16 241
-SHA256 842f0cbd1f9f8d56fa3f36ba772e5aea5656157798d95aa3017f7489a0fd999e files/digest-cairo-1.3.16 241
 MD5 851e81ade92921fa21d9ecbcf9421c9c files/digest-cairo-1.4.0 238
 RMD160 a14d64cf5524f8f836f6937966034cc4ad45ee43 files/digest-cairo-1.4.0 238
 SHA256 dc72c6a3257c79228879534bc81f148b749d4597f2ca178c123544b514638602 files/digest-cairo-1.4.0 238
+MD5 befd66c00b97c7a4c998b62a9e102e73 files/digest-cairo-1.4.2 238
+RMD160 51714588c264ff45c4352157720a5b5bd9fd82ac files/digest-cairo-1.4.2 238
+SHA256 a223f637084ce9f59606a5b06beddb6cf91a34d396c66cff11897534203f66d3 files/digest-cairo-1.4.2 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF7XUZoeSe8B0zEfwRAvNlAJ0XXd4iZCY+j6+cjBoGCkDoaU3+wwCdHUsQ
-fbIbZIZG14TCUr7GLIEWP4A=
-=qoyE
+iD8DBQFF/+hxoeSe8B0zEfwRAvmTAKCK2FpBI/sDYL44qFwdyhegatLmcwCcCy5B
++nApvbYw2Ak4yLW6rlm6hVw=
+=jjTY
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.0.2.ebuild b/x11-libs/cairo/cairo-1.0.2.ebuild
deleted file mode 100644
index 930e64225ad9..000000000000
--- a/x11-libs/cairo/cairo-1.0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.0.2.ebuild,v 1.15 2007/02/18 10:32:33 grobian Exp $
-
-inherit eutils
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-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"
-IUSE="doc glitz png X"
-
-RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2.1
-	sys-libs/zlib
-	X? ( || ( (	x11-libs/libXrender
-			x11-libs/libXt )
-			virtual/x11 )
-		virtual/xft )
-	glitz? ( >=media-libs/glitz-0.4.4 )
-	png? ( media-libs/libpng )
-	!<x11-libs/cairo-0.2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? (	>=dev-util/gtk-doc-1.3
-		~app-text/docbook-xml-dtd-4.2 )"
-
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# Call PKG_PROG_PKG_CONFIG to fix other standard pkg-config calls
-	epatch ${FILESDIR}/${P}-pkg_macro.patch
-
-	cp aclocal.m4 old_macros.m4
-	aclocal -I . || die "aclocal failed"
-	autoconf || die "autoconf failed"
-}
-
-
-src_compile() {
-	local myconf="$(use_with X x) \
-		$(use_enable X xlib)      \
-		$(use_enable png)         \
-		$(use_enable doc gtk-doc) \
-		$(use_enable glitz)"
-
-	econf $myconf || die "./configure failed"
-	emake || die "Compilation failed"
-}
-
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.3.10.ebuild b/x11-libs/cairo/cairo-1.3.10.ebuild
deleted file mode 100644
index 2c1f84606365..000000000000
--- a/x11-libs/cairo/cairo-1.3.10.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.3.10.ebuild,v 1.7 2007/02/18 10:32:33 grobian Exp $
-
-inherit eutils flag-o-matic libtool
-
-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 ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz 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"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
-		media-libs/libpng
-		X?	(
-				x11-libs/libXrender
-				x11-libs/libXext
-				x11-libs/libX11
-				virtual/xft
-				xcb? ( x11-libs/libxcb
-						x11-libs/xcb-util )
-			)
-		directfb? ( >=dev-libs/DirectFB-0.9.24 )
-		glitz? ( >=media-libs/glitz-0.5.1 )
-		svg? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19
-		X? ( x11-proto/renderproto
-			xcb? ( x11-proto/xcb-proto ) )
-		doc?	(
-					>=dev-util/gtk-doc-1.3
-					 ~app-text/docbook-xml-dtd-4.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	elibtoolize
-}
-
-src_compile() {
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(use_enable svg) $(use_enable glitz) \
-		  $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		  --enable-freetype --enable-ps $(use_enable xcb) \
-		  || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.3.12.ebuild b/x11-libs/cairo/cairo-1.3.12.ebuild
deleted file mode 100644
index 3ef3809696ef..000000000000
--- a/x11-libs/cairo/cairo-1.3.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.3.12.ebuild,v 1.2 2007/02/18 10:32:33 grobian Exp $
-
-inherit eutils flag-o-matic libtool
-
-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 ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz 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"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
-		media-libs/libpng
-		X?	(
-				x11-libs/libXrender
-				x11-libs/libXext
-				x11-libs/libX11
-				virtual/xft
-				xcb? ( x11-libs/libxcb
-						x11-libs/xcb-util )
-			)
-		directfb? ( >=dev-libs/DirectFB-0.9.24 )
-		glitz? ( >=media-libs/glitz-0.5.1 )
-		svg? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19
-		X? ( x11-proto/renderproto
-			xcb? ( x11-proto/xcb-proto ) )
-		doc?	(
-					>=dev-util/gtk-doc-1.3
-					 ~app-text/docbook-xml-dtd-4.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	elibtoolize
-}
-
-src_compile() {
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(use_enable svg) $(use_enable glitz) \
-		  $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		  --enable-freetype --enable-ps $(use_enable xcb) \
-		  || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.3.14.ebuild b/x11-libs/cairo/cairo-1.3.14.ebuild
deleted file mode 100644
index 2a6a4e06349a..000000000000
--- a/x11-libs/cairo/cairo-1.3.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.3.14.ebuild,v 1.1 2007/02/19 05:54:06 cardoe Exp $
-
-inherit eutils flag-o-matic libtool
-
-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 ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz 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"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
-		media-libs/libpng
-		X?	(
-				x11-libs/libXrender
-				x11-libs/libXext
-				x11-libs/libX11
-				virtual/xft
-				xcb? ( x11-libs/libxcb
-						x11-libs/xcb-util )
-			)
-		directfb? ( >=dev-libs/DirectFB-0.9.24 )
-		glitz? ( >=media-libs/glitz-0.5.1 )
-		svg? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19
-		X? ( x11-proto/renderproto
-			xcb? ( x11-proto/xcb-proto ) )
-		doc?	(
-					>=dev-util/gtk-doc-1.3
-					 ~app-text/docbook-xml-dtd-4.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	elibtoolize
-}
-
-src_compile() {
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(use_enable svg) $(use_enable glitz) \
-		  $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		  --enable-freetype --enable-ps $(use_enable xcb) \
-		  || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.3.16.ebuild b/x11-libs/cairo/cairo-1.4.2.ebuild
similarity index 91%
rename from x11-libs/cairo/cairo-1.3.16.ebuild
rename to x11-libs/cairo/cairo-1.4.2.ebuild
index 7bd239599fec..58125ab2a6ef 100644
--- a/x11-libs/cairo/cairo-1.3.16.ebuild
+++ b/x11-libs/cairo/cairo-1.4.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.3.16.ebuild,v 1.1 2007/03/03 15:54:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.2.ebuild,v 1.1 2007/03/20 13:58:44 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
 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"
diff --git a/x11-libs/cairo/files/cairo-1.0.2-pkg_macro.patch b/x11-libs/cairo/files/cairo-1.0.2-pkg_macro.patch
deleted file mode 100644
index e983054d1112..000000000000
--- a/x11-libs/cairo/files/cairo-1.0.2-pkg_macro.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -NurdB cairo-1.0.2/configure.in cairo-1.0.2-patched/configure.in
---- cairo-1.0.2/configure.in	2005-10-04 18:56:21.000000000 -0500
-+++ cairo-1.0.2-patched/configure.in	2005-10-04 19:28:12.000000000 -0500
-@@ -83,6 +83,10 @@
- 
- dnl ===========================================================================
- 
-+PKG_PROG_PKG_CONFIG
-+
-+dnl ===========================================================================
-+
- AC_ARG_ENABLE(xlib,
-   [  --disable-xlib          Disable cairo's Xlib backend],
-   [use_xlib=$enableval], [use_xlib=yes])
diff --git a/x11-libs/cairo/files/digest-cairo-1.0.2 b/x11-libs/cairo/files/digest-cairo-1.0.2
deleted file mode 100644
index 8b125ac6546e..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0b7111a14f90ec3afa777ec40c44984 cairo-1.0.2.tar.gz 1458903
-RMD160 59f309974fdac86253ed9a4d00e564a2fac310eb cairo-1.0.2.tar.gz 1458903
-SHA256 d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e cairo-1.0.2.tar.gz 1458903
diff --git a/x11-libs/cairo/files/digest-cairo-1.3.10 b/x11-libs/cairo/files/digest-cairo-1.3.10
deleted file mode 100644
index 61b82abd538e..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.3.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78e1c1c57568f51e4da73f52cf57eadb cairo-1.3.10.tar.gz 2787973
-RMD160 eb40963c760be2e2c8f9dc743cf205c69136b399 cairo-1.3.10.tar.gz 2787973
-SHA256 2ed48e592c36bf3a2581cd9935bbe2d9cb6c4d6dbb91b794fb76c632ea1f3b98 cairo-1.3.10.tar.gz 2787973
diff --git a/x11-libs/cairo/files/digest-cairo-1.3.12 b/x11-libs/cairo/files/digest-cairo-1.3.12
deleted file mode 100644
index cda44ca8d913..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.3.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b6ac81de3c47529d1f39390943728c3d cairo-1.3.12.tar.gz 2812615
-RMD160 2604af4bf3f98abdd586391dc5e43a3cb845ad16 cairo-1.3.12.tar.gz 2812615
-SHA256 7337cec2f20e4a350d39f87a86c7fe04ae62bae412a8f3e77d1d749389ae9127 cairo-1.3.12.tar.gz 2812615
diff --git a/x11-libs/cairo/files/digest-cairo-1.3.14 b/x11-libs/cairo/files/digest-cairo-1.3.14
deleted file mode 100644
index 0dd9e35026bb..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.3.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08eef0800258bff5b3f13d787dd68402 cairo-1.3.14.tar.gz 2831683
-RMD160 f1d859b851077fcbe0d735fba4770f84cd84a464 cairo-1.3.14.tar.gz 2831683
-SHA256 752918a5519a67a8ce05a740574116a26d98a44a37beba075f03b547903d3ff0 cairo-1.3.14.tar.gz 2831683
diff --git a/x11-libs/cairo/files/digest-cairo-1.3.16 b/x11-libs/cairo/files/digest-cairo-1.3.16
deleted file mode 100644
index 8aeb731171b3..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.3.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 149a8006181a07c1447559058a3750df cairo-1.3.16.tar.gz 4156967
-RMD160 23ae73ad7f7e9548cacb9ec7d0f735cb4d081d67 cairo-1.3.16.tar.gz 4156967
-SHA256 8120b653e6f298ca2508ba8a82448e9b8a0b2a598a50d9db4184548e36781d1b cairo-1.3.16.tar.gz 4156967
diff --git a/x11-libs/cairo/files/digest-cairo-1.4.2 b/x11-libs/cairo/files/digest-cairo-1.4.2
new file mode 100644
index 000000000000..093048125879
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.4.2
@@ -0,0 +1,3 @@
+MD5 b254633046eafe603776d0bee791b751 cairo-1.4.2.tar.gz 3081092
+RMD160 53ad2e60507e181cb754991c1fe8f8de47f366a3 cairo-1.4.2.tar.gz 3081092
+SHA256 7cf292ae376e7120ec548ad6a807a2f0f4f0539a304229a3bd98921453becd47 cairo-1.4.2.tar.gz 3081092