x11-wm/cairo-compmgr: Version bump. glitz stripped out by upstream so no patching necessary, thanks to ruthenium for the notice

svn path=/sunrise/; revision=10332

5 files changed, 14 insertions, 61 deletions

diff --git a/x11-wm/cairo-compmgr/ChangeLog b/x11-wm/cairo-compmgr/ChangeLog
index c14907ee1..d68fa3804 100644
--- a/x11-wm/cairo-compmgr/ChangeLog
+++ b/x11-wm/cairo-compmgr/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for x11-wm/cairo-compmgr
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Mar 2010; Ian Stakenvicius (_AxS_) <ian@aerobiology.ca>
+  -cairo-compmgr-0.2.93.ebuild,
+  -files/cairo-compmgr-0.2.93-glitz-code.patch,
+  -files/cairo-compmgr-0.2.93-glitz-tfp-undef.patch,
+  +cairo-compmgr-0.3.0.ebuild:
+  Version bump. glitz stripped out by upstream so no patching necessary,
+  thanks to ruthenium for the notice
+
   12 Jun 2009; Christian Ruppert <idl0r@gentoo.org>
   cairo-compmgr-9999.ebuild:
   Simplify.
diff --git a/x11-wm/cairo-compmgr/Manifest b/x11-wm/cairo-compmgr/Manifest
index 96c625ed0..785dbf2cf 100644
--- a/x11-wm/cairo-compmgr/Manifest
+++ b/x11-wm/cairo-compmgr/Manifest
@@ -1,8 +1,6 @@
-AUX cairo-compmgr-0.2.93-glitz-code.patch 1132 RMD160 f9c12302bb56c10f4700b89a53fac1eb12868638 SHA1 74344a64d8df56bb22539a3376a4ac0867d8fa2a SHA256 84419ebab9f672089cfa205a766083003a2d923f6c650e0e37e7c50b9fea4c36
-AUX cairo-compmgr-0.2.93-glitz-tfp-undef.patch 397 RMD160 c24e9b49e7ce46fdf04181df5d3d16f93dec578e SHA1 d5a0cdc5234dc901c1a44cdcd18477eb1eb7d640 SHA256 0874b67a8b156fc073ff19bee06e825cc694f3f172e77c9c5b2ff8083475cc0c
 AUX cairo-compmgr-9999-glitz-tfp-undef.patch 397 RMD160 c24e9b49e7ce46fdf04181df5d3d16f93dec578e SHA1 d5a0cdc5234dc901c1a44cdcd18477eb1eb7d640 SHA256 0874b67a8b156fc073ff19bee06e825cc694f3f172e77c9c5b2ff8083475cc0c
-DIST cairo-compmgr-0.2.93.tar.gz 832806 RMD160 77e84c4996cabad70b729c1dfbbb94848669cf19 SHA1 0d4c3b8c98487c4c1ad63c10f5658578ec0bd723 SHA256 6cd4552cfa572ca1db593e0cbcd4b4089e613e6409e23e28d93bdd2e6243b05c
-EBUILD cairo-compmgr-0.2.93.ebuild 733 RMD160 6db8274431237ad221a840d4233323c5cf7bde11 SHA1 8da1229848863f0ad3055fdc39ed1379958e36ef SHA256 5ceb07d2f5b72d44e1e8116690115d0fc9bbbddbc189d970ddc9d1f6da0ef490
+DIST cairo-compmgr-0.3.0.tar.gz 1034748 RMD160 3a77a46ed39933400f3f9b67e9ddeddac825ee9a SHA1 583a0e240883dfcdeb431f1eef22db8339e7fcfa SHA256 72c2528e0a2716076587b8851c083c858fb699a0169748ec2894307b0d968afa
+EBUILD cairo-compmgr-0.3.0.ebuild 541 RMD160 b4e75efc5814cb668f8b36b20ed025cc2c4d0413 SHA1 a6998cf8285ba9fc131cb5a015fd904184a53e3b SHA256 0e4cb70a82a29f3154f71f26adf0f58e8ea2f628d977f1238f5b8501aff4dfa5
 EBUILD cairo-compmgr-9999.ebuild 696 RMD160 974ceebad76653ee69a5be58f2895920b5aeea01 SHA1 b6062261e07734057dd270ebd87a501c8ad817f8 SHA256 c54f4aa768b595a7d83618fc3b2b7d13d5aac3c8b8b590d11f0ef6ca54b39431
-MISC ChangeLog 798 RMD160 518533f65cc841815c067c597fab995cebc6041f SHA1 0a7d780e02038eb054fa89d38d14faabf2926f1e SHA256 0ae4c58d38c483231e8355941ab965dc2cae1173641f512b55f2fae5af567161
+MISC ChangeLog 1134 RMD160 0927a02fe846fd3f10cc4ea4da390d91cee17567 SHA1 0696b51d84ba1f09b281b0feda4f09b49af938ca SHA256 7fab54d4dcccfe06516ce7b8ad2a8c095c918faa3d967ce111ec81e17742958a
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-wm/cairo-compmgr/cairo-compmgr-0.2.93.ebuild b/x11-wm/cairo-compmgr/cairo-compmgr-0.3.0.ebuild
index 168cdcbf9..23ec2ec22 100644
--- a/x11-wm/cairo-compmgr/cairo-compmgr-0.2.93.ebuild
+++ b/x11-wm/cairo-compmgr/cairo-compmgr-0.3.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="A versatile and extensible compositing manager which uses cairo for rendering"
 HOMEPAGE="http://cairo-compmgr.tuxfamily.org/"
@@ -17,14 +17,7 @@ IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/cairo
+	>=dev-lang/vala-0.7.10
 	x11-libs/pixman"
 DEPEND="${RDEPEND}
 	>=x11-proto/glproto-1.4.9"
-
-G2CONF="--disable-glitz --disable-glitz-tfp --enable-shave"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-glitz-tfp-undef.patch"
-	epatch "${FILESDIR}/${P}-glitz-code.patch"
-	AT_M4DIR="." eautoreconf
-}
diff --git a/x11-wm/cairo-compmgr/files/cairo-compmgr-0.2.93-glitz-code.patch b/x11-wm/cairo-compmgr/files/cairo-compmgr-0.2.93-glitz-code.patch
deleted file mode 100644
index f9ff7abbf..000000000
--- a/x11-wm/cairo-compmgr/files/cairo-compmgr-0.2.93-glitz-code.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cairo-compmgr-0.2.93/src/ccm-window-glitz.c	2009-03-04 16:31:26.000000000 -0500
-+++ cairo-compmgr-0.2.93.new/src/ccm-window-glitz.c	2009-05-29 13:53:37.000000000 -0400
-@@ -278,13 +278,13 @@
- 						 GLITZ_FORMAT_RED_SIZE_MASK |
- 						 GLITZ_FORMAT_GREEN_SIZE_MASK |
- 						 GLITZ_FORMAT_BLUE_SIZE_MASK |
--						 GLITZ_FORMAT_DEPTH_MASK;
-+						 GLITZ_FORMAT_DEPTH_SIZE_MASK;
- 	
- 	templ.doublebuffer = 0;
- 	templ.color.red_size = 8;
- 	templ.color.green_size = 8;
- 	templ.color.blue_size = 8;
--	templ.depth = depth;
-+	templ.depth_size = depth;
- 	
- 	g_object_get(G_OBJECT(screen), "indirect_rendering", &indirect, NULL);
- #ifdef ENABLE_GLITZ_TFP_BACKEND
---- cairo-compmgr-0.2.93/src/ccm-pixmap-glitz.c	2009-03-05 03:36:51.000000000 -0500
-+++ cairo-compmgr-0.2.93.new/src/ccm-pixmap-glitz.c	2009-05-29 13:52:22.000000000 -0400
-@@ -126,8 +126,8 @@
- 		tmp.color.alpha_size = 8;
- 		if (ccm_drawable_get_format(CCM_DRAWABLE(self)) == CAIRO_FORMAT_ARGB32)
- 		{
--			tmp.depth = 32;
--			mask |= GLITZ_FORMAT_DEPTH_MASK;
-+			tmp.depth_size = 32;
-+			mask |= GLITZ_FORMAT_DEPTH_SIZE_MASK;
- 		}
- 		
- 		format = glitz_glx_find_window_format (
diff --git a/x11-wm/cairo-compmgr/files/cairo-compmgr-0.2.93-glitz-tfp-undef.patch b/x11-wm/cairo-compmgr/files/cairo-compmgr-0.2.93-glitz-tfp-undef.patch
deleted file mode 100644
index c4ad90fff..000000000
--- a/x11-wm/cairo-compmgr/files/cairo-compmgr-0.2.93-glitz-tfp-undef.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- cairo-compmgr/src/Makefile.am	2009-03-15 18:03:42.000000000 -0400
-+++ cairo-compmgr.new/src/Makefile.am	2009-05-29 13:19:26.000000000 -0400
-@@ -30,10 +30,8 @@
- 
- if HAVE_GLITZ_TFP_BACKEND
- INCLUDES += -DENABLE_GLITZ_TFP_BACKEND
--endif
--
--if HAVE_GLITZ_TFP_BACKEND
--INCLUDES += -DENABLE_GLITZ_TFP_BACKEND
-+else
-+INCLUDES += -DDISABLE_GLITZ_TFP_BACKEND
- endif
- 
- if ENABLE_GOBJECT_INTROSPECTION