[gentoo-commits] gentoo-x86 commit in x11-libs/cairo: ChangeLog cairo-1.8.0.ebuild cairo-1.7.4.ebuild

[Doug Goldstein (cardoe)]

cardoe      08/09/30 18:49:44

  Modified:             ChangeLog cairo-1.8.0.ebuild
  Removed:              cairo-1.7.4.ebuild
  Log:
  remove test release and fix depends in new release. allow xcb backend to be built without X
  (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

Revision  Changes    Path
1.199                x11-libs/cairo/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.199&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.199&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.198&r2=1.199

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- ChangeLog	27 Sep 2008 07:47:47 -0000	1.198
+++ ChangeLog	30 Sep 2008 18:49:43 -0000	1.199
@@ -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@g.o> -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)
 



1.3                  x11-libs/cairo/cairo-1.8.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/cairo/cairo-1.8.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/cairo/cairo-1.8.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/cairo/cairo-1.8.0.ebuild?r1=1.2&r2=1.3

Index: cairo-1.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cairo-1.8.0.ebuild	29 Sep 2008 05:03:35 -0000	1.2
+++ cairo-1.8.0.ebuild	30 Sep 2008 18:49:43 -0000	1.3
@@ -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 @@
 		>=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_compile() {
-	local use_xcb
-
 	#gets rid of fbmmx.c inlining warnings
 	append-flags -finline-limit=1200
 
@@ -73,11 +72,8 @@
 		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 \