remove test release and fix depends in new release. allow xcb backend to be built without X

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 47 insertions, 117 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 22fc0ac277bd..fa48381dea72 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
 # 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.198 2008/09/27 07:47:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.199 2008/09/30 18:49:43 cardoe Exp $
+
+  30 Sep 2008; Doug Goldstein <cardoe@gentoo.org> -cairo-1.7.4.ebuild,
+  cairo-1.8.0.ebuild:
+  remove test release and fix depends in new release. allow xcb backend to
+  be built without X
 
 *cairo-1.8.0 (27 Sep 2008)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a39509fb173d..cd4284168d22 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,14 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cairo-1.6.4-libpng-api-change.patch 799 RMD160 407e2bdbaa1624c2b70c4837eb872b84d48086e6 SHA1 aac038b81fba395b68b27c64814e19bbc1e8826d SHA256 82cf3e542f46b6c07dc32b16c622c0b15bb356f5069b34a9d1cdbd4b4d7481f4
 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.7.4.tar.gz 5482111 RMD160 bb15dffa4429081d630736197a94fd1c53c9492d SHA1 c2b139a11336bf1c7a3423baff12ba949269a36b SHA256 65eb5e2120d5f765415796fa4cea80f2e4bf83d7665ff729790c1919df8fe3e2
 DIST cairo-1.8.0.tar.gz 5662670 RMD160 1b1079ab73813ca6782c0d4cb3623575e08ee94e SHA1 8a689ca47c24216f37bb8cabae21ff08a7f47899 SHA256 827acee89ba3e8e762fbb23165cf8d455e7d95e1e50984e6882b2070a7f3abae
 EBUILD cairo-1.4.12.ebuild 1968 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c SHA1 10cd93281e9af9858cd0f61a0708d53681c81afd SHA256 6f25e6e271d47c75deeee9121d25098eb0c6aa25cbdf60349e76d094a4f0d912
 EBUILD cairo-1.4.14.ebuild 1968 RMD160 02f89786e2cfaeb1fac9b075f3f73e79ea4169b0 SHA1 a4449ed556796354013542f11d75e2ab6a7dab69 SHA256 6d226a1a684e84f4958480105df60be0221fe24f62f64ed52c2beed817f6caa7
 EBUILD cairo-1.6.4-r1.ebuild 2282 RMD160 3654fda45e7f77366b67c846860711faf740907e SHA1 cf5bc6fe7868adefd64aeadf709e206ba08f7134 SHA256 09e27659f83db7d53d5e3164f014d8b974eff25b3129da5b5d4a103918db39ad
 EBUILD cairo-1.6.4.ebuild 2109 RMD160 898bd4a7f842d4945f00773697e0f312a58ec23e SHA1 34b214b0399466c4b59f37f505470ebd45bcd164 SHA256 2fca2991647b18efc2c2b1475a9ff7d751a05a75170a09088a0bf090481ceb21
-EBUILD cairo-1.7.4.ebuild 2122 RMD160 4a352b415e4de48a9b9a2841417ad8403cc74fd5 SHA1 77d444806ae8a479289d401496179369e1180387 SHA256 a2f8eacfb8d4b66a8829b727f7740a34b821248b9ebe3d25e0447ff912de53ab
-EBUILD cairo-1.8.0.ebuild 2487 RMD160 d25c17c8c58fcd11c768743027f46fbacf7f19c4 SHA1 2fab97687a36477caac7250bb286a98bcb03ca5c SHA256 4b217c823eccb4811e1f7a4e172b864e418988830391c661b48b850e80da8e7e
-MISC ChangeLog 27434 RMD160 e6de1fb27d3a66eaf26de146e97932caee4b9352 SHA1 5bbc83fc1976d52c33afd257ebc16a1a71d05715 SHA256 333b9dc0f5a5fbc0e9387615f07a60ffd85312f9cc34ba6dd9dadf93090ad20e
+EBUILD cairo-1.8.0.ebuild 2465 RMD160 5edff007417573264aac123ad1db441e7f58156c SHA1 7923f9f2cb2be4eb571024ed3b6635e5a81423e0 SHA256 b66d7aa29eb895f428c52116671354125a2079d2c9714fa750bebaa151d42ac1
+MISC ChangeLog 27623 RMD160 18b72fdbe561ddab31ece62a7393a9f23d13189c SHA1 00044fc9c0374b177d704f921deb973b1ec81668 SHA256 405876e1a483a6708567ba11b1dff5a953048f4e6b3e4561bdd5728d7ee96d9f
 MISC metadata.xml 579 RMD160 a8e2ab1e575154d20f372f4cef09cfee18c6e8c3 SHA1 3f2062d658c0d780083e366f7f3d63d95586d7e1 SHA256 484df9f3a5c0775495ad4022f142f8d1a324abe0377269b8b3696a8f733989e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjidNEACgkQoeSe8B0zEfy7RwCfYGRAS+eXk7JW7lEBfj0a5FSC
+OwsAmgIVxKVyer/qlxYsZtAXI4l+wipo
+=FC33
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.7.4.ebuild b/x11-libs/cairo/cairo-1.7.4.ebuild
deleted file mode 100644
index 9f7634ccefe8..000000000000
--- a/x11-libs/cairo/cairo-1.7.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.7.4.ebuild,v 1.2 2008/09/26 08:39:20 loki_val 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 ~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.11.2
-		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.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
index 79506f6494fa..0cf1fdf717b6 100644
--- a/x11-libs/cairo/cairo-1.8.0.ebuild
+++ b/x11-libs/cairo/cairo-1.8.0.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.8.0.ebuild,v 1.2 2008/09/29 05:03:35 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.0.ebuild,v 1.3 2008/09/30 18:49:43 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -20,40 +20,41 @@ RDEPEND="media-libs/fontconfig
 		>=media-libs/freetype-2.1.9
 		sys-libs/zlib
 		media-libs/libpng
-		virtual/ghostscript
 		>=x11-libs/pixman-0.12.0
-		x11-libs/pango
-		>=x11-libs/gtk+-2.0
-		>=app-text/poppler-bindings-0.9.2
-		X?	(
-				>=x11-libs/libXrender-0.6
-				x11-libs/libXext
-				x11-libs/libX11
-				virtual/xft
-				xcb? ( >=x11-libs/libxcb-0.92
-						x11-libs/xcb-util )
-			)
 		directfb? ( >=dev-libs/DirectFB-0.9.24 )
 		glitz? ( >=media-libs/glitz-0.5.1 )
 		svg? (  dev-libs/libxml2
 				>=x11-libs/gtk+-2.0
-				>=gnome-base/librsvg-2.15.0 )"
+				>=gnome-base/librsvg-2.15.0 )
+		X? ( 	>=x11-libs/libXrender-0.6
+				x11-libs/libXext
+				x11-libs/libX11
+				virtual/xft )
+		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
 
 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
-				)"
-
-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
-}
+		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}
@@ -64,8 +65,6 @@ src_unpack() {
 }
 
 src_compile() {
-	local use_xcb
-
 	#gets rid of fbmmx.c inlining warnings
 	append-flags -finline-limit=1200
 
@@ -73,11 +72,8 @@ src_compile() {
 		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 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-freetype --enable-ps \