for some reason this didn't take before. version bump. cull old versions

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

8 files changed, 30 insertions, 439 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 1eafeaf92bad..443f19d5185b 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.218 2009/04/27 13:46:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.219 2009/06/24 13:45:12 cardoe Exp $
+
+  16 Jun 2009; Doug Goldstein <cardoe@gentoo.org> -cairo-1.4.12.ebuild,
+  -cairo-1.6.4.ebuild, -cairo-1.8.0.ebuild, -cairo-1.8.2.ebuild,
+  -cairo-1.8.4.ebuild, -cairo-1.8.6.ebuild, +cairo-1.8.8.ebuild:
+  cull old versions
+
+*cairo-1.8.8 (16 Jun 2009)
+
+  16 Jun 2009; Doug Goldstein <cardoe@gentoo.org> +cairo-1.8.8.ebuild:
+  version bump
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> cairo-1.8.6-r1:
   Stable for HPPA (bug #260063).
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 9241182867cc..30a14b71d65c 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,21 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a
 AUX cairo-1.6.4-libpng-api-change.patch 799 RMD160 407e2bdbaa1624c2b70c4837eb872b84d48086e6 SHA1 aac038b81fba395b68b27c64814e19bbc1e8826d SHA256 82cf3e542f46b6c07dc32b16c622c0b15bb356f5069b34a9d1cdbd4b4d7481f4
 AUX cairo-1.8.6-status-return-fix.patch 784 RMD160 cfa21d49438ad4493fd27f619c2ec3286dc4ce97 SHA1 448a1a5c188ac8543c410700dfefa7938c37fcb5 SHA256 9ac4c13454d7ba44a4e3998bf1e25ff3b6dc937885e2f5275de74b9a825bf056
-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.6.4.tar.gz 5042623 RMD160 ccae736a40d985b72bda7c2f0a98a0838020658e SHA1 9d990fe39a125ceb07221623c237cd7015855d5c SHA256 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
-DIST cairo-1.8.0.tar.gz 5662670 RMD160 1b1079ab73813ca6782c0d4cb3623575e08ee94e SHA1 8a689ca47c24216f37bb8cabae21ff08a7f47899 SHA256 827acee89ba3e8e762fbb23165cf8d455e7d95e1e50984e6882b2070a7f3abae
-DIST cairo-1.8.2.tar.gz 7147742 RMD160 602008860bf35672cf48c7c8f9e1a6b5a702f6aa SHA1 41e94d94e7f379551f556dd71979aca239a688c6 SHA256 7466958b84c29542c40c21ff3f89fa173aeaa44ec562451ad183a63f71b73e76
-DIST cairo-1.8.4.tar.gz 7070822 RMD160 16e0c6a0342c98219212dac1ff956c2cb839b4e5 SHA1 57fd2c7e0af16bee7cd53436d7c9dc526784f1da SHA256 a1364ef8b1d72b8a937e8e0559224fe47c9a6641373a04549a86d4dd1e537398
 DIST cairo-1.8.6.tar.gz 6616544 RMD160 2374236afabbe248a642bf1cac6a5996f64bed62 SHA1 d1e5479d4eeb7b1a3589672e3ef8f4899e7c5eba SHA256 93a347af0cecf258be8fb54265b16a0fb16317df4a32896141d2987c30773535
-EBUILD cairo-1.4.12.ebuild 1970 RMD160 1c25cb6ef5d310782664447ffdcaa8ae0233badc SHA1 74b9f969a9984c970464ca0222ca74cd017dfa38 SHA256 9485c613f1013cf65c234444db721cc017804214f413af808966283793298e1f
+DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750 SHA1 e4b8b219427d1ca3dc95f5f44914dce1ae0c3766 SHA256 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90
 EBUILD cairo-1.4.14.ebuild 1970 RMD160 0e4e5bd351fb6abd816b446e3556b628e88ef003 SHA1 032284f0d54252fe14d7eced9e4ebb5b87d4e727 SHA256 e69b9626809f4462dc9ba7d79b1494551e6675f062987436e51d0d72aba85876
 EBUILD cairo-1.6.4-r1.ebuild 2285 RMD160 2b1fee38aa461cfb7cc5cb0bc819735e154f2392 SHA1 7fe1d1697203fc44845aad8c3d8d157d8251f680 SHA256 1be22a3f9f761680e5421552ea04d949e7b6ce814ac87a0680c07509c4b3424e
-EBUILD cairo-1.6.4.ebuild 2117 RMD160 ecf135d2fcdc378764146bb77dc86881d3428769 SHA1 961729c7621db6b55c28a58dab51c66d4899d7e2 SHA256 8cfaad1dacb577cd4aaddb002557144b1fc36343f8d2cb491394ae0135829e88
-EBUILD cairo-1.8.0.ebuild 2401 RMD160 5a453e103ebbe1659bf0b8c74989781ee208ea00 SHA1 e96dfb15660841456fd9f9df5556f2fc742d9868 SHA256 535ea062a0af14a87a898169617ed64e2e3c6e0f4688315e4c8643dc8de17d61
-EBUILD cairo-1.8.2.ebuild 2401 RMD160 fc8359214cf380dd59b2931061844588e31d13ca SHA1 73d957eb29c0fe115f91662180b9e7f1c9d138ca SHA256 cae9d0cbb3bd364715e5d7c3afdb61d2e3a34cbc37b90f3c39401b86f620bdc0
-EBUILD cairo-1.8.4.ebuild 2401 RMD160 c0d7e276231eb8bfcadff3495e243e2619fa1a9c SHA1 1ae1901be5ddb75f1f5e543890be6f9a0850ad9d SHA256 0ce912726059204d794ff6bf871113c4799290d95806395848be4f09e5ba1247
 EBUILD cairo-1.8.6-r1.ebuild 3034 RMD160 9d6af9d05603e8425ab1e20fdc45ba06e868523c SHA1 c31f2b35f8cf3e888ad845029589a2139a8ac9eb SHA256 ce3b5862e8e0c8749d45adec8517b359b9f70cff565d5e7d390d2f77d08cd345
-EBUILD cairo-1.8.6.ebuild 2985 RMD160 1b7aa4884c1b705935baf5973c4bd5ab1f237dae SHA1 36ec5a92a693a5bbe12e5a3a40ccd9e374d01030 SHA256 5f1ca16bf071439e03fa34ea44ada12fad0b37d5c076e8df2e9874304d1ad451
-MISC ChangeLog 30436 RMD160 7c3027270264253fe3ffea2b461abef9dff3e25f SHA1 1470c4941e38cefdfdcbff1caec66100103a80c0 SHA256 417db838986acb457eab954732ee9ef9ad6d11d285da2c126a77e09500dd91ca
+EBUILD cairo-1.8.8.ebuild 2741 RMD160 6ff1038df713153a63858630219569e0bc9fb805 SHA1 c1022d497dcf84e2f50ae9fa76b7bcaa857327a8 SHA256 43f204bc1540f64ab3c6a7fe0a2b01a88b483465ab9808b84ec900c04b0826a0
+MISC ChangeLog 30777 RMD160 2ba557735aa9e9632d3ad381aef3b45d0b698d19 SHA1 1c3692f982ea3ca67c26754a3923e2af21124d2e SHA256 fd5ac8b70fb2c8da8bf6f72d7a62a995194b1bd15ec0db81618d693354fa5ebd
 MISC metadata.xml 628 RMD160 589b0a5e55683527204892191462856d90661d4e SHA1 b0f6e67dffc97e5c0ed9acea7448cd5f92e36c41 SHA256 802fcf2d639a4125475acd325ebfa874ef3e89055e02636968baa9fa6fc5e406
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpCLfIACgkQoeSe8B0zEfwUOQCfbgZj5vThciWnvZU0dj6fIij6
+LXEAn3/QHmbylU4ztHLbTrjG4fClswLC
+=C2vo
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.4.12.ebuild b/x11-libs/cairo/cairo-1.4.12.ebuild
deleted file mode 100644
index 6fa8ab946771..000000000000
--- a/x11-libs/cairo/cairo-1.4.12.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.12.ebuild,v 1.9 2009/01/05 13:26:13 remi 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 opengl 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
-				x11-libs/libXft
-				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
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=-lglitz-glx
-	fi
-
-	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.6.4.ebuild b/x11-libs/cairo/cairo-1.6.4.ebuild
deleted file mode 100644
index d1cf36aaa9ee..000000000000
--- a/x11-libs/cairo/cairo-1.6.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4.ebuild,v 1.14 2009/01/05 13:26:13 remi 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 opengl svg test 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.9
-		sys-libs/zlib
-		media-libs/libpng
-		>=x11-libs/pixman-0.10.0
-		X?	(
-				x11-libs/libXrender
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libXft
-				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.6
-					 ~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() {
-	local use_xcb
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=-lglitz-glx
-	fi
-
-	use_xcb="--disable-xcb"
-	use X && use xcb && use_xcb="--enable-xcb"
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) ${use_xcb} \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --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
-}
diff --git a/x11-libs/cairo/cairo-1.8.0.ebuild b/x11-libs/cairo/cairo-1.8.0.ebuild
deleted file mode 100644
index 2c4f231127a5..000000000000
--- a/x11-libs/cairo/cairo-1.8.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.0.ebuild,v 1.8 2009/01/05 13:26:13 remi 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 opengl 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.9
-	sys-libs/zlib
-	media-libs/libpng
-	>=x11-libs/pixman-0.12.0
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
-	svg? ( dev-libs/libxml2 )
-	X? ( 	>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft )
-	xcb? (	>=x11-libs/libxcb-0.92
-		x11-libs/xcb-util )"
-#	test? (
-#	pdf test
-#	x11-libs/pango
-#	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2
-#	ps test
-#	virtual/ghostscript
-#	svg test
-#	>=x11-libs/gtk+-2.0
-#	>=gnome-base/librsvg-2.15.0
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	doc? (	>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2 )
-	X? ( x11-proto/renderproto )
-	xcb? ( x11-proto/xcb-proto )"
-
-#pkg_setup() {
-#	if ! built_with_use app-text/poppler-bindings gtk ; then
-#		eerror 'poppler-bindings with gtk is required for the pdf backend'
-#		die 'poppler-bindings built without gtk support'
-#	fi
-#}
-
-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
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=-lglitz-glx
-	fi
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		--enable-ft --enable-ps \
-		|| die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/cairo/cairo-1.8.2.ebuild b/x11-libs/cairo/cairo-1.8.2.ebuild
deleted file mode 100644
index 5f182a1c55dd..000000000000
--- a/x11-libs/cairo/cairo-1.8.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.2.ebuild,v 1.4 2009/01/05 13:26:13 remi 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 opengl 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.9
-	sys-libs/zlib
-	media-libs/libpng
-	>=x11-libs/pixman-0.12.0
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
-	svg? ( dev-libs/libxml2 )
-	X? ( 	>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft )
-	xcb? (	>=x11-libs/libxcb-0.92
-		x11-libs/xcb-util )"
-#	test? (
-#	pdf test
-#	x11-libs/pango
-#	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2
-#	ps test
-#	virtual/ghostscript
-#	svg test
-#	>=x11-libs/gtk+-2.0
-#	>=gnome-base/librsvg-2.15.0
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	doc? (	>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2 )
-	X? ( x11-proto/renderproto )
-	xcb? ( x11-proto/xcb-proto )"
-
-#pkg_setup() {
-#	if ! built_with_use app-text/poppler-bindings gtk ; then
-#		eerror 'poppler-bindings with gtk is required for the pdf backend'
-#		die 'poppler-bindings built without gtk support'
-#	fi
-#}
-
-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
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=-lglitz-glx
-	fi
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		--enable-ft --enable-ps \
-		|| die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/cairo/cairo-1.8.4.ebuild b/x11-libs/cairo/cairo-1.8.4.ebuild
deleted file mode 100644
index 44abd9a5613d..000000000000
--- a/x11-libs/cairo/cairo-1.8.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.4.ebuild,v 1.4 2009/01/05 13:26:13 remi 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 opengl 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.9
-	sys-libs/zlib
-	media-libs/libpng
-	>=x11-libs/pixman-0.12.0
-	directfb? ( >=dev-libs/DirectFB-0.9.24 )
-	glitz? ( >=media-libs/glitz-0.5.1 )
-	svg? ( dev-libs/libxml2 )
-	X? ( 	>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft )
-	xcb? (	>=x11-libs/libxcb-0.92
-		x11-libs/xcb-util )"
-#	test? (
-#	pdf test
-#	x11-libs/pango
-#	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2
-#	ps test
-#	virtual/ghostscript
-#	svg test
-#	>=x11-libs/gtk+-2.0
-#	>=gnome-base/librsvg-2.15.0
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	doc? (	>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2 )
-	X? ( x11-proto/renderproto )
-	xcb? ( x11-proto/xcb-proto )"
-
-#pkg_setup() {
-#	if ! built_with_use app-text/poppler-bindings gtk ; then
-#		eerror 'poppler-bindings with gtk is required for the pdf backend'
-#		die 'poppler-bindings built without gtk support'
-#	fi
-#}
-
-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
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=-lglitz-glx
-	fi
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
-		$(use_enable directfb) $(use_enable xcb) \
-		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		--enable-ft --enable-ps \
-		|| die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/cairo/cairo-1.8.6.ebuild b/x11-libs/cairo/cairo-1.8.8.ebuild
index 44c5c5e67bf7..20340625307f 100644
--- a/x11-libs/cairo/cairo-1.8.6.ebuild
+++ b/x11-libs/cairo/cairo-1.8.8.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.6.ebuild,v 1.4 2009/01/05 13:26:13 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.8.ebuild,v 1.1 2009/06/24 13:45:12 cardoe Exp $
+
+EAPI=2
 
 inherit eutils flag-o-matic libtool
 
@@ -34,7 +36,7 @@ RDEPEND="media-libs/fontconfig
 #	pdf test
 #	x11-libs/pango
 #	>=x11-libs/gtk+-2.0
-#	>=app-text/poppler-bindings-0.9.2
+#	>=app-text/poppler-bindings-0.9.2[gtk]
 #	ps test
 #	virtual/ghostscript
 #	svg test
@@ -48,17 +50,7 @@ DEPEND="${RDEPEND}
 	X? ( x11-proto/renderproto )
 	xcb? ( x11-proto/xcb-proto )"
 
-#pkg_setup() {
-#	if ! built_with_use app-text/poppler-bindings gtk ; then
-#		eerror 'poppler-bindings with gtk is required for the pdf backend'
-#		die 'poppler-bindings built without gtk support'
-#	fi
-#}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# ClearType-like patches applied by ArchLinux
 	use cleartype && epatch "${FILESDIR}"/cairo-1.2.4-lcd-cleartype-like.diff
 
@@ -66,7 +58,7 @@ src_unpack() {
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	#gets rid of fbmmx.c inlining warnings
 	append-flags -finline-limit=1200
 
@@ -80,8 +72,6 @@ src_compile() {
 		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
 		--enable-ft --enable-ps \
 		|| die "configure failed"
-
-	emake || die "compile failed"
 }
 
 src_install() {