remove old version. rev bump to 1.4.8

Package-Manager: portage-2.1.2.9

14 files changed, 35 insertions, 326 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 6250befc6140..5016175f8e9d 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.122 2007/05/30 13:30:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.123 2007/06/13 22:53:47 cardoe Exp $
+
+*cairo-1.4.8 (13 Jun 2007)
+
+  13 Jun 2007; Doug Goldstein <cardoe@gentoo.org>
+  -files/cairo-1.0.4-ssp-nonsense.patch, -cairo-1.0.4.ebuild,
+  -cairo-1.0.4-r1.ebuild, -cairo-1.2.4.ebuild, -cairo-1.4.0.ebuild,
+  -cairo-1.4.2.ebuild, +cairo-1.4.8.ebuild:
+  remove old version. rev bump to 1.4.8
 
   30 May 2007; Raúl Porcel <armin76@gentoo.org> cairo-1.4.4.ebuild:
   alpha stable wrt #176367
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 0b664fab047c..89b3294d3933 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,38 +1,14 @@
-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.4.tar.gz 1475777 RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb SHA1 89e72202e5b51a8914fce60f52f7c51ecdea982a SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5
-DIST cairo-1.2.4.tar.gz 2882781 RMD160 dee558b7489aa089de6963d909a8352725e10bdd SHA1 5520b771c8b85acea78fa56fc4c39b4dca6bcc7c SHA256 c1580ca951b2f57c4f8b34549997854bc48dbaf036ca1ca6c017c03db3504ddb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST cairo-1.2.6.tar.gz 2973689 RMD160 4469a661b294e342ee77e726c1cefccd4837ae2e SHA1 b86b4017a9abd565ef11c72b7faee9082a04118f SHA256 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
-DIST cairo-1.4.0.tar.gz 3067230 RMD160 3bb3fdf41d8452b5094708da3d03796564ed9be2 SHA1 2ce727347d8285cee4ce0c3feb0a2df18316a5d3 SHA256 583f9ae2c9b7d2ef33cfbd194148e71a335dafc226e13e213f07ff2dc398bb47
-DIST cairo-1.4.2.tar.gz 3081092 RMD160 53ad2e60507e181cb754991c1fe8f8de47f366a3 SHA1 9e7a323fc7d81d5011044d7eb22db3bf26ff7314 SHA256 7cf292ae376e7120ec548ad6a807a2f0f4f0539a304229a3bd98921453becd47
 DIST cairo-1.4.4.tar.gz 3129412 RMD160 69b71c4dc43a4f843772b6653ec158bea7680fe4 SHA1 71a7ce8352500944f7b2b73d4dc25ee947ec56ec SHA256 6469711192ebd359cd77cf299cfbea285dbba3cc857ff9268c74345bddf2b473
 DIST cairo-1.4.6.tar.gz 3181592 RMD160 144ba5422c414070ceb691dcd59fa887f82697b1 SHA1 bfd1532e10789fc4f87a196540c049d88c6ece42 SHA256 ca632afcb4acde553463c0682c0605383762e9174f8040aa997d715aff3d8896
-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
-SHA256 e1837f69fb9ebf160e4cb2794d67056d74bbbdeef6a1388875d57c61dfb06cb5 cairo-1.0.4-r1.ebuild 1445
-EBUILD cairo-1.0.4.ebuild 1342 RMD160 25e4d91dad3637c1d2ab17e0a66da321ccfd9e8f SHA1 58adf6b6e179465d85fb5698c3509e90f2340451 SHA256 710334671bd9d021d132be0bcc5d2f53d7bcfc58328c2adbbe147f172bc1e890
-MD5 5eaa6eeb959b86e4993b12768ee1d31e cairo-1.0.4.ebuild 1342
-RMD160 25e4d91dad3637c1d2ab17e0a66da321ccfd9e8f cairo-1.0.4.ebuild 1342
-SHA256 710334671bd9d021d132be0bcc5d2f53d7bcfc58328c2adbbe147f172bc1e890 cairo-1.0.4.ebuild 1342
-EBUILD cairo-1.2.4.ebuild 1812 RMD160 d6dc15cf4e59f59708c6a95d8747400246afc5fd SHA1 30d8a59f72af8ea5cac69e14207f8379befd3112 SHA256 0a1620659df4b66f0d89c0f43c0db22f9138fa44ed6a092fde732ffe2d42c7c3
-MD5 b533a115142c5b8ac837b2992fc17780 cairo-1.2.4.ebuild 1812
-RMD160 d6dc15cf4e59f59708c6a95d8747400246afc5fd cairo-1.2.4.ebuild 1812
-SHA256 0a1620659df4b66f0d89c0f43c0db22f9138fa44ed6a092fde732ffe2d42c7c3 cairo-1.2.4.ebuild 1812
+DIST cairo-1.4.8.tar.gz 3210242 RMD160 262e424ef8f63b8e0b85279dd0d4572cf4cede0e SHA1 e0730d852262d68a68d5a4c4a99657b0baeed13c SHA256 a3e9b0f07910ee325406118cf3e136fc78a5155c47fdb19e66e895a3c587bc51
 EBUILD cairo-1.2.6.ebuild 1647 RMD160 6a36df2bb99acf75696cae5f8b64d42bcf2cc08f SHA1 9238226c12312ac6a1d1f1dc26611514b2b62735 SHA256 5abd3942899a397e3b325c0b6dfa8131d97a790ce3d5d4f86c0c196383bff35c
 MD5 c6648b7c38f7b294a588311c8fa1b65c cairo-1.2.6.ebuild 1647
 RMD160 6a36df2bb99acf75696cae5f8b64d42bcf2cc08f cairo-1.2.6.ebuild 1647
 SHA256 5abd3942899a397e3b325c0b6dfa8131d97a790ce3d5d4f86c0c196383bff35c cairo-1.2.6.ebuild 1647
-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
-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
 EBUILD cairo-1.4.4.ebuild 1892 RMD160 038d1b25906411c5be74ea96e029f9c53619624b SHA1 8dcf7a93b8f7fb95e8f90fde78e949e2864ad40e SHA256 6cadd60c7cd2c424dcb65d9b87ac7e45ecfea613b5207f8e51fe9ba7a6efe11c
 MD5 4d747a496a7c7b6dc779317c39f29f4e cairo-1.4.4.ebuild 1892
 RMD160 038d1b25906411c5be74ea96e029f9c53619624b cairo-1.4.4.ebuild 1892
@@ -41,35 +17,34 @@ EBUILD cairo-1.4.6.ebuild 1900 RMD160 e7d0bbcb0276f9e303b6312fa2531137a9b7ce14 S
 MD5 fb5fab75f1f9e51b550e84748b1cd764 cairo-1.4.6.ebuild 1900
 RMD160 e7d0bbcb0276f9e303b6312fa2531137a9b7ce14 cairo-1.4.6.ebuild 1900
 SHA256 c3b1be91db9cf10a693b4ef1cb1fd3599ea7a56850244df2403e288c2e2d4616 cairo-1.4.6.ebuild 1900
-MISC ChangeLog 17369 RMD160 6573b5e8e592419deb8035ac7932b64995d893db SHA1 30bfc2893679260659c8de4ceb2d8ecf047a33d2 SHA256 9ba7948214ad0ee079bc3a9ccff382a8ade207cf55cfc50ceb915d5e929818d9
-MD5 882aef476e9d7032bb1036aa8616bd0d ChangeLog 17369
-RMD160 6573b5e8e592419deb8035ac7932b64995d893db ChangeLog 17369
-SHA256 9ba7948214ad0ee079bc3a9ccff382a8ade207cf55cfc50ceb915d5e929818d9 ChangeLog 17369
+EBUILD cairo-1.4.8.ebuild 1900 RMD160 984ac8167f88a64e4fdf471c9eeabb197a242b10 SHA1 2387a9aea8f67424910fcba8c21056a88c0b01e1 SHA256 b8d8046d4e25a5b606acd617141f539b62664c038a3538fe02b3dd11da34d059
+MD5 ced3ada4c847f93b782ae62dc2512dc4 cairo-1.4.8.ebuild 1900
+RMD160 984ac8167f88a64e4fdf471c9eeabb197a242b10 cairo-1.4.8.ebuild 1900
+SHA256 b8d8046d4e25a5b606acd617141f539b62664c038a3538fe02b3dd11da34d059 cairo-1.4.8.ebuild 1900
+MISC ChangeLog 17661 RMD160 ccf91938850a1e6f1a683b03d470a6077550d2cd SHA1 819a74518c8de7ac4e3880ab57f6ee4477d31506 SHA256 a9932b745f46731aa3dd5ee202c4802b5945e6d7de7f8784c78da67f62a3db44
+MD5 6ca92b1b4cbd5a9c58ad229b280349b4 ChangeLog 17661
+RMD160 ccf91938850a1e6f1a683b03d470a6077550d2cd ChangeLog 17661
+SHA256 a9932b745f46731aa3dd5ee202c4802b5945e6d7de7f8784c78da67f62a3db44 ChangeLog 17661
 MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
 MD5 b11544cc1116038b149ab213e9d56262 metadata.xml 316
 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 metadata.xml 316
 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53 metadata.xml 316
-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
-MD5 dd098b533608d6250bc6d4fbe016256d files/digest-cairo-1.0.4-r1 238
-RMD160 014452a883fabada98aae5064c27a524ff0594ff files/digest-cairo-1.0.4-r1 238
-SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/digest-cairo-1.0.4-r1 238
-MD5 ad8f70972aca60be3e0459b112265b0e files/digest-cairo-1.2.4 238
-RMD160 72f3842866c3dba95a661b08a00010b85945244b files/digest-cairo-1.2.4 238
-SHA256 b04bf38f8f8c64f7e1256aa588f200c2f5619f0710745279beac16b7955eb2fe files/digest-cairo-1.2.4 238
 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 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
 MD5 072ef9a2d0755f05bf78a189350e5769 files/digest-cairo-1.4.4 238
 RMD160 b7fc48f09a17c53bac545da145cf3a117749d8ab files/digest-cairo-1.4.4 238
 SHA256 952828b2c734ff068401eca786bed256ba6152e732faf1c640d88ca1719c8ae5 files/digest-cairo-1.4.4 238
 MD5 b781fda7d72034fce4edcc592310df43 files/digest-cairo-1.4.6 238
 RMD160 4007358a1ec252e6458d3d2dd2142204cdf59081 files/digest-cairo-1.4.6 238
 SHA256 a83b198cc834e136f49d06c3be0c03f38917d67db6b3526bcacc7b1f06209640 files/digest-cairo-1.4.6 238
+MD5 f494cfa2c79edbc6fbdb82b5b866dc99 files/digest-cairo-1.4.8 238
+RMD160 dfa3becb9173eb21c23a7ae55e45a624c3b2049c files/digest-cairo-1.4.8 238
+SHA256 7669cf859fcac6c89e7fc116ca6b22c5ef461e6850c0e40a2b80b814b6de6b9b files/digest-cairo-1.4.8 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGcHWJoeSe8B0zEfwRAsM8AJ9MBOblvSginNPnxRbBudQAxILqMQCggcx+
+T0gpSVeTWxnlv+vUXNJPYk8=
+=jofw
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.0.4-r1.ebuild b/x11-libs/cairo/cairo-1.0.4-r1.ebuild
deleted file mode 100644
index 5fe687d9ddec..000000000000
--- a/x11-libs/cairo/cairo-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,59 +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.4-r1.ebuild,v 1.4 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 ~x86-fbsd"
-IUSE="doc glitz png X"
-# bug 118106: not entirely broken, just too flakey
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2.1
-	X? ( || ( (	x11-libs/libXrender
-			x11-libs/libX11 )
-			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
-	X? ( || ( x11-proto/renderproto virtual/x11 ) )
-	doc? (	>=dev-util/gtk-doc-1.3
-		~app-text/docbook-xml-dtd-4.2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/${P}-ssp-nonsense.patch #109480
-}
-
-src_compile() {
-
-	econf $(use_enable X xlib) \
-		$(use_enable png) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable glitz) \
-		--enable-freetype || 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.0.4.ebuild b/x11-libs/cairo/cairo-1.0.4.ebuild
deleted file mode 100644
index d219478f3584..000000000000
--- a/x11-libs/cairo/cairo-1.0.4.ebuild
+++ /dev/null
@@ -1,52 +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.4.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 ~x86-fbsd"
-IUSE="doc glitz png X"
-# bug 118106: not entirely broken, just too flakey
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2.1
-	X? ( || ( (	x11-libs/libXrender
-			x11-libs/libX11 )
-			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
-	X? ( || ( x11-proto/renderproto virtual/x11 ) )
-	doc? (	>=dev-util/gtk-doc-1.3
-		~app-text/docbook-xml-dtd-4.2 )"
-
-src_compile() {
-
-	econf $(use_enable X xlib) \
-		$(use_enable png) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable glitz) \
-		--enable-freetype || 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.2.4.ebuild b/x11-libs/cairo/cairo-1.2.4.ebuild
deleted file mode 100644
index 5d5bdf1d2e15..000000000000
--- a/x11-libs/cairo/cairo-1.2.4.ebuild
+++ /dev/null
@@ -1,66 +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.2.4.ebuild,v 1.12 2007/02/18 10:32:33 grobian Exp $
-
-inherit eutils flag-o-matic
-
-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 ~x86-fbsd"
-IUSE="directfb doc glitz png svg X"
-
-# 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/x11
-					)
-				virtual/xft
-			)
-		directfb? ( >=dev-libs/DirectFB-0.9.24 )
-		glitz? ( >=media-libs/glitz-0.5.1 )
-		svg? ( dev-libs/libxml2 )
-		!<x11-libs/cairo-0.2"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9
-		X? ( || ( x11-proto/renderproto virtual/x11 ) )
-		doc?	(
-					>=dev-util/gtk-doc-1.3
-					 ~app-text/docbook-xml-dtd-4.2
-				)"
-
-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) --enable-pdf \
-		  $(use_enable glitz) --enable-png --enable-freetype --enable-ps \
-		  || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	echo
-	ewarn "You will most likely need to run revdep-rebuild after emerging this"
-	echo
-}
diff --git a/x11-libs/cairo/cairo-1.4.0.ebuild b/x11-libs/cairo/cairo-1.4.0.ebuild
deleted file mode 100644
index 703599e9a1dd..000000000000
--- a/x11-libs/cairo/cairo-1.4.0.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.4.0.ebuild,v 1.1 2007/03/06 14:05:12 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/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="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.4.2.ebuild b/x11-libs/cairo/cairo-1.4.8.ebuild
index 58125ab2a6ef..e8fa52b4f78f 100644
--- a/x11-libs/cairo/cairo-1.4.2.ebuild
+++ b/x11-libs/cairo/cairo-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # 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.4.2.ebuild,v 1.1 2007/03/20 13:58:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.8.ebuild,v 1.1 2007/06/13 22:53:47 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
diff --git a/x11-libs/cairo/files/cairo-1.0.4-ssp-nonsense.patch b/x11-libs/cairo/files/cairo-1.0.4-ssp-nonsense.patch
deleted file mode 100644
index 9e8efe903847..000000000000
--- a/x11-libs/cairo/files/cairo-1.0.4-ssp-nonsense.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cairo-1.0.2.orig/src/cairo-path-stroke.c	2005-10-03 21:44:43.000000000 +0100
-+++ cairo-1.0.2/src/cairo-path-stroke.c	2006-01-27 01:50:06.000000000 +0000
-@@ -180,6 +180,7 @@
-     cairo_gstate_t	*gstate = stroker->gstate;
-     int		clockwise = _cairo_stroker_face_clockwise (out, in);
-     cairo_point_t	*inpt, *outpt;
-+    cairo_polygon_t     polygon;
- 
-     if (in->cw.x == out->cw.x
- 	&& in->cw.y == out->cw.y
-@@ -271,7 +272,6 @@
- 	    double		x1, y1, x2, y2;
- 	    double		mx, my;
- 	    double		dx1, dx2, dy1, dy2;
--	    cairo_polygon_t	polygon;
- 	    cairo_point_t	outer;
- 
- 	    /* 
diff --git a/x11-libs/cairo/files/digest-cairo-1.0.4 b/x11-libs/cairo/files/digest-cairo-1.0.4
deleted file mode 100644
index cb0dba37b278..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9002b0e69b3f94831a22d3f2a7735ce2 cairo-1.0.4.tar.gz 1475777
-RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb cairo-1.0.4.tar.gz 1475777
-SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5 cairo-1.0.4.tar.gz 1475777
diff --git a/x11-libs/cairo/files/digest-cairo-1.0.4-r1 b/x11-libs/cairo/files/digest-cairo-1.0.4-r1
deleted file mode 100644
index cb0dba37b278..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.0.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9002b0e69b3f94831a22d3f2a7735ce2 cairo-1.0.4.tar.gz 1475777
-RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb cairo-1.0.4.tar.gz 1475777
-SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5 cairo-1.0.4.tar.gz 1475777
diff --git a/x11-libs/cairo/files/digest-cairo-1.2.4 b/x11-libs/cairo/files/digest-cairo-1.2.4
deleted file mode 100644
index d6651579bded..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1222b2bfdf113e2c92f66b3389659f2d cairo-1.2.4.tar.gz 2882781
-RMD160 dee558b7489aa089de6963d909a8352725e10bdd cairo-1.2.4.tar.gz 2882781
-SHA256 c1580ca951b2f57c4f8b34549997854bc48dbaf036ca1ca6c017c03db3504ddb cairo-1.2.4.tar.gz 2882781
diff --git a/x11-libs/cairo/files/digest-cairo-1.4.0 b/x11-libs/cairo/files/digest-cairo-1.4.0
deleted file mode 100644
index 8fc65d3943c0..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b0882df4621bcf5b69f024b9475f8d4e cairo-1.4.0.tar.gz 3067230
-RMD160 3bb3fdf41d8452b5094708da3d03796564ed9be2 cairo-1.4.0.tar.gz 3067230
-SHA256 583f9ae2c9b7d2ef33cfbd194148e71a335dafc226e13e213f07ff2dc398bb47 cairo-1.4.0.tar.gz 3067230
diff --git a/x11-libs/cairo/files/digest-cairo-1.4.2 b/x11-libs/cairo/files/digest-cairo-1.4.2
deleted file mode 100644
index 093048125879..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/x11-libs/cairo/files/digest-cairo-1.4.8 b/x11-libs/cairo/files/digest-cairo-1.4.8
new file mode 100644
index 000000000000..4e5f324da55f
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.4.8
@@ -0,0 +1,3 @@
+MD5 5b9db574c9fbb94ce52047600190a1ba cairo-1.4.8.tar.gz 3210242
+RMD160 262e424ef8f63b8e0b85279dd0d4572cf4cede0e cairo-1.4.8.tar.gz 3210242
+SHA256 a3e9b0f07910ee325406118cf3e136fc78a5155c47fdb19e66e895a3c587bc51 cairo-1.4.8.tar.gz 3210242