removing old compiz snapshot ebuilds and no longer used patches

Package-Manager: portage-2.1.2_pre2-r2

10 files changed, 3 insertions, 408 deletions

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 7f050aef0f35..a4346ac5252a 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,22 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 03-composite-cube-logo.patch 1515 RMD160 4a260a03d1c60143f4ef395d7808d34ad713199e SHA1 1f59965528e060febb6a50997233f597038fae04 SHA256 91430c1f127609f111696356955cd18e908e6689187e7689604db91c6ae6b4c1
-MD5 39a51dfca89bde69a2a6333102e85308 files/03-composite-cube-logo.patch 1515
-RMD160 4a260a03d1c60143f4ef395d7808d34ad713199e files/03-composite-cube-logo.patch 1515
-SHA256 91430c1f127609f111696356955cd18e908e6689187e7689604db91c6ae6b4c1 files/03-composite-cube-logo.patch 1515
-AUX 04-fbconfig-depth-fix.patch 722 RMD160 035bef41021d3d7be1f769e443ff3a23d57a82f4 SHA1 d0dcef58317bffa490479b1fdfda929ed2bad030 SHA256 edd8e95c4ad40a05ba60740c6775a616b41c7910453a240b45984495fce86e5a
-MD5 f0d9fe04ca0f7f4129ed4fbeebfcdc29 files/04-fbconfig-depth-fix.patch 722
-RMD160 035bef41021d3d7be1f769e443ff3a23d57a82f4 files/04-fbconfig-depth-fix.patch 722
-SHA256 edd8e95c4ad40a05ba60740c6775a616b41c7910453a240b45984495fce86e5a files/04-fbconfig-depth-fix.patch 722
 AUX 06-glfinish.patch 492 RMD160 fed138881ec79179a3d5eb67be35b88e221808d0 SHA1 0416dda22d05c400ade46f9d1c633daf3aa3abea SHA256 4ff47e2d079045637ef5a5b27d577d0d16ce40e7e8fec79280d916233af67db3
 MD5 3a049b520d0557dc6d7644e909be00b3 files/06-glfinish.patch 492
 RMD160 fed138881ec79179a3d5eb67be35b88e221808d0 files/06-glfinish.patch 492
 SHA256 4ff47e2d079045637ef5a5b27d577d0d16ce40e7e8fec79280d916233af67db3 files/06-glfinish.patch 492
-AUX 07-cow.patch 3521 RMD160 d92415814b41d3fef570a2fbdf594270c7e3ccbb SHA1 c3c789542d9d7cfa5b9e4e4453d3dc095798366a SHA256 ae2a755f9260cf110029f00d85cc81a134a49a6b3439cb578c6012bafcb2d4b8
-MD5 6162c9336db7722556da7d265ec3fd06 files/07-cow.patch 3521
-RMD160 d92415814b41d3fef570a2fbdf594270c7e3ccbb files/07-cow.patch 3521
-SHA256 ae2a755f9260cf110029f00d85cc81a134a49a6b3439cb578c6012bafcb2d4b8 files/07-cow.patch 3521
 AUX compiz-aiglx 273 RMD160 3fb1590a4e67eaaed1b9c21362fd8546cac03864 SHA1 e8ae75f65fbadd8c3bcb96c7f5c2132d96201fcf SHA256 ebefa0181308343b9c2fc857728c81a681ab4a45cc9fcef9f4d0f5420f160d74
 MD5 7645393649f7a45b622869bbc47c8027 files/compiz-aiglx 273
 RMD160 3fb1590a4e67eaaed1b9c21362fd8546cac03864 files/compiz-aiglx 273
@@ -30,21 +18,6 @@ MD5 6f47d17281e98c559bc25532912a1dc5 files/compiz-xgl 244
 RMD160 d5975cc2ea3a346c063ef3dcebb190f57cce8406 files/compiz-xgl 244
 SHA256 7a93c7be6831b337165e2284e9f3340c0380fb3c5566ea73cc384f6e9489a680 files/compiz-xgl 244
 DIST compiz-0.2.0.tar.bz2 669279 RMD160 133876d3adb8cccd4bdaef1db73f815c7a7b69ef SHA1 7cf39256d3ad942f1fbb1c884eea64851c0e3ad2 SHA256 8078c51125e349d925366bc57aa2560bbccf5a5b3c8ce1b64a57e21d0e31c3a0
-DIST compiz-20060916.tar.bz2 336009 RMD160 bee7ff7083dd752257b7a9cf6f7d9f06f257a79c SHA1 0e0c18ef6858c7b1dbcd4c148908a420de24f71f SHA256 afd6d930cb739e7fe2e9246ba3c522d90d626991c8bf9dee2753c80543527ba7
-DIST compiz-20060921.tar.bz2 345378 RMD160 73186a7ddcd74163b63602e298290f915d539898 SHA1 139eb9ef4501641ffa2424f08766fb9fc1eb2a8c SHA256 925d29aae3405fdf8dece645367c2c8c3328f082cad38085af37dc4a5128210b
-DIST compiz-20060928.tar.bz2 347383 RMD160 76486a79bd295f173daa057b231fd3adf850b7e7 SHA1 722d8570b32476f8e03454f29ecbd2e3ec63006b SHA256 e40e82622eae6111c734d49668d74ef79156703cf56bb6836a06b2442d83db37
-EBUILD compiz-0.0.13_pre20060916.ebuild 1407 RMD160 c1816db6177d14e1811617d05e505ebd9d91b609 SHA1 90c0bf994bbaa53eef5e04c0a17c29c0c2e1e562 SHA256 aff05de59438bfa61d417fb37ad3beeabed3da6c7116c4b6ee5e2ed46e9d05ee
-MD5 a36b6e59cf4ca3bd031a9e8138679ab1 compiz-0.0.13_pre20060916.ebuild 1407
-RMD160 c1816db6177d14e1811617d05e505ebd9d91b609 compiz-0.0.13_pre20060916.ebuild 1407
-SHA256 aff05de59438bfa61d417fb37ad3beeabed3da6c7116c4b6ee5e2ed46e9d05ee compiz-0.0.13_pre20060916.ebuild 1407
-EBUILD compiz-0.0.13_pre20060921.ebuild 1244 RMD160 e6f486dfc69a1d7f9da9f10a49aef5bf6851969e SHA1 ae17b6c010374d9a9bb5c63fdbb4f7e52e70474c SHA256 3f8bd28a7a2ebbca2a158406962e7e7936032cedd06fefe424b5b22dfe2fe325
-MD5 63583a6c0abe1aaf9c1bf06b8fcfa2a6 compiz-0.0.13_pre20060921.ebuild 1244
-RMD160 e6f486dfc69a1d7f9da9f10a49aef5bf6851969e compiz-0.0.13_pre20060921.ebuild 1244
-SHA256 3f8bd28a7a2ebbca2a158406962e7e7936032cedd06fefe424b5b22dfe2fe325 compiz-0.0.13_pre20060921.ebuild 1244
-EBUILD compiz-0.0.13_pre20060928.ebuild 1199 RMD160 39235ffe50ad252044941620c73d258ed6c34e21 SHA1 88eb98743eb4a7211e8a503b9dd9888cbb6cc060 SHA256 04ee5de0e19489434a9689ec8f50238510aafb9fb44a27f0aa8635eea7016af7
-MD5 99bf7e85618ef83e2e375420055dc340 compiz-0.0.13_pre20060928.ebuild 1199
-RMD160 39235ffe50ad252044941620c73d258ed6c34e21 compiz-0.0.13_pre20060928.ebuild 1199
-SHA256 04ee5de0e19489434a9689ec8f50238510aafb9fb44a27f0aa8635eea7016af7 compiz-0.0.13_pre20060928.ebuild 1199
 EBUILD compiz-0.2.0.ebuild 1089 RMD160 008dff45d9c0cc103aa17542cfdbbd797ee56308 SHA1 2009b84e7187526ea0bec45853ec7a9f8e2fe03f SHA256 2bd94005b49d4c566210a09e833038a07b99f046dc1b37ff4cfe96d2a7902714
 MD5 086d98d9baa94b49fc315c4813e8fb2f compiz-0.2.0.ebuild 1089
 RMD160 008dff45d9c0cc103aa17542cfdbbd797ee56308 compiz-0.2.0.ebuild 1089
@@ -57,22 +30,13 @@ MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e3047
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 metadata.xml 217
-MD5 69b1f0729f4f6b9ccef7b2686f4754c5 files/digest-compiz-0.0.13_pre20060916 250
-RMD160 2584745ce23559d170db51a0c694888d46e15230 files/digest-compiz-0.0.13_pre20060916 250
-SHA256 dee6344540521c7180173a2662a2816341de22256bbee8023bd27da077f31c7d files/digest-compiz-0.0.13_pre20060916 250
-MD5 5b1704438fd759fd9f50a3392c07f7c5 files/digest-compiz-0.0.13_pre20060921 250
-RMD160 ae3100309c6838c20e04b861f721e1a1d51024d3 files/digest-compiz-0.0.13_pre20060921 250
-SHA256 2dd01f110799a07afcbe4066b2368a509962874463fee15d030f446bb0f30e2e files/digest-compiz-0.0.13_pre20060921 250
-MD5 c23b00f62ac7700d1f69d1b0b59ebc7b files/digest-compiz-0.0.13_pre20060928 250
-RMD160 172aa03545efa115aa1a1c7494e951caea463041 files/digest-compiz-0.0.13_pre20060928 250
-SHA256 f943f6392c8b3e610b1581bc7b44d4ed8836693250b96a309078044d3d92cdfd files/digest-compiz-0.0.13_pre20060928 250
 MD5 6bd74b56b84175f70a6b365cae92fd1b files/digest-compiz-0.2.0 241
 RMD160 19007f7f07e562fefde57c06c98bd7fcad33d4b3 files/digest-compiz-0.2.0 241
 SHA256 c158ca7532af8e4d3a01a99465546caac426bd72109799209b77169fe042be82 files/digest-compiz-0.2.0 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFIfm6r2QksT29OyARAuj5AJ4nHHcio//VBj5BzSPNgiUzxdOKKACdFdiC
-24hyLYdA+cdefmcW8k2nhLg=
-=dI9T
+iD8DBQFFIzZjr2QksT29OyARAqGlAJ92KJAQupIRbaqHI1rd/TRJaPf8hACgjhTr
+DQm+Z8UTquyxJOkS4TWiR0Y=
+=ACS1
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/compiz/compiz-0.0.13_pre20060916.ebuild b/x11-wm/compiz/compiz-0.0.13_pre20060916.ebuild
deleted file mode 100644
index ef00d1bed827..000000000000
--- a/x11-wm/compiz/compiz-0.0.13_pre20060916.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.0.13_pre20060916.ebuild,v 1.1 2006/09/16 14:21:20 hanno Exp $
-
-inherit eutils autotools
-
-SRC_URI="http://www.schokokeks.org/~hanno/snapshots/${PN}-${PV##*_pre}.tar.bz2"
-
-PATCHES="${FILESDIR}/03-composite-cube-logo.patch
-	${FILESDIR}/04-fbconfig-depth-fix.patch
-	${FILESDIR}/06-glfinish.patch
-	${FILESDIR}/07-cow.patch"
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="compiz 3D composite- and windowmanager"
-HOMEPAGE="http://en.opensuse.org/Compiz"
-LICENSE="X11"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus svg"
-
-DEPEND=">=media-libs/mesa-6.5.1
-	>=media-libs/glitz-0.5.6
-	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/startup-notification
-	media-libs/libpng
-	x11-libs/libXdamage
-	x11-libs/libXrandr
-	x11-libs/libXcomposite
-	x11-libs/libwnck
-	gnome-base/gnome-desktop
-	gnome-base/control-center
-	svg? ( gnome-base/librsvg )
-	dbus? ( sys-apps/dbus )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${PATCHES}
-}
-
-src_compile() {
-	eautoreconf || die
-	glib-gettextize --copy --force || die
-
-	econf --with-gl-libs="-Wl,-R/usr/$(get_libdir)/opengl/xorg-x11/lib/ -lGL" \
-		--disable-kde \
-		--enable-gnome \
-		`use_enable svg librsvg` \
-		`use_enable dbus` || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dobin ${FILESDIR}/compiz-aiglx
-}
diff --git a/x11-wm/compiz/compiz-0.0.13_pre20060921.ebuild b/x11-wm/compiz/compiz-0.0.13_pre20060921.ebuild
deleted file mode 100644
index 15ce5fdd191d..000000000000
--- a/x11-wm/compiz/compiz-0.0.13_pre20060921.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.0.13_pre20060921.ebuild,v 1.2 2006/09/21 14:22:13 hanno Exp $
-
-inherit eutils autotools
-
-SRC_URI="http://www.schokokeks.org/~hanno/snapshots/${PN}-${PV##*_pre}.tar.bz2"
-
-PATCHES="${FILESDIR}/06-glfinish.patch"
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="compiz 3D composite- and windowmanager"
-HOMEPAGE="http://en.opensuse.org/Compiz"
-LICENSE="X11"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus svg"
-
-DEPEND=">=media-libs/mesa-6.5.1-r1
-	>=media-libs/glitz-0.5.6
-	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libXdamage
-	x11-libs/libXrandr
-	x11-libs/libXcomposite
-	media-libs/libpng
-	x11-libs/libwnck
-	gnome-base/control-center
-	svg? ( gnome-base/librsvg )
-	dbus? ( sys-apps/dbus )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${PATCHES}
-}
-
-src_compile() {
-	eautoreconf || die
-	glib-gettextize --copy --force || die
-
-	econf --with-gl-libs="-Wl,-R/usr/$(get_libdir)/opengl/xorg-x11/lib/ -lGL" \
-		--disable-kde \
-		--enable-gnome \
-		`use_enable svg librsvg` \
-		`use_enable dbus` || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dobin ${FILESDIR}/compiz-aiglx
-}
diff --git a/x11-wm/compiz/compiz-0.0.13_pre20060928.ebuild b/x11-wm/compiz/compiz-0.0.13_pre20060928.ebuild
deleted file mode 100644
index 0c76e517a1bb..000000000000
--- a/x11-wm/compiz/compiz-0.0.13_pre20060928.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.0.13_pre20060928.ebuild,v 1.1 2006/09/28 01:48:12 hanno Exp $
-
-inherit eutils autotools
-
-SRC_URI="http://www.schokokeks.org/~hanno/snapshots/${PN}-${PV##*_pre}.tar.bz2"
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="compiz 3D composite- and windowmanager"
-HOMEPAGE="http://en.opensuse.org/Compiz"
-LICENSE="X11"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus svg"
-
-DEPEND=">=media-libs/mesa-6.5.1-r1
-	>=media-libs/glitz-0.5.6
-	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libXdamage
-	x11-libs/libXrandr
-	x11-libs/libXcomposite
-	media-libs/libpng
-	x11-libs/libwnck
-	gnome-base/control-center
-	svg? ( gnome-base/librsvg )
-	dbus? ( sys-apps/dbus )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/06-glfinish.patch
-}
-
-src_compile() {
-	eautoreconf || die
-	glib-gettextize --copy --force || die
-
-	econf --enable-gtk \
-		--enable-gnome \
-		--enable-gconf \
-		--disable-kde \
-		`use_enable svg librsvg` \
-		`use_enable dbus` || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dobin ${FILESDIR}/compiz-{aiglx,xgl,nvidia}
-}
diff --git a/x11-wm/compiz/files/03-composite-cube-logo.patch b/x11-wm/compiz/files/03-composite-cube-logo.patch
deleted file mode 100644
index c777257a52d1..000000000000
--- a/x11-wm/compiz/files/03-composite-cube-logo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Composite cube logo against background color.
-
-From: Kristian Høgsberg <krh@redhat.com>
-
-
----
-
- plugins/cube.c |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/cube.c b/plugins/cube.c
-index 31edd5c..339d843 100644
---- a/plugins/cube.c
-+++ b/plugins/cube.c
-@@ -1162,11 +1162,28 @@ cubePaintTransformedScreen (CompScreen		
- 
- 	if (cs->invert == 1 && s->size == 4 && cs->texture.name)
- 	{
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-+
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PRIMARY_COLOR);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE0);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-+
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-+
- 	    enableTexture (s, &cs->texture, COMP_TEXTURE_FILTER_GOOD);
-+
- 	    glTexCoordPointer (2, GL_FLOAT, 0, cs->tc);
- 	    glDrawArrays (GL_TRIANGLE_FAN, 0, cs->nvertices >> 1);
- 	    disableTexture (s, &cs->texture);
- 	    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-+
-+	    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- 	}
- 	else
- 	{
diff --git a/x11-wm/compiz/files/04-fbconfig-depth-fix.patch b/x11-wm/compiz/files/04-fbconfig-depth-fix.patch
deleted file mode 100644
index 29dbdc96de34..000000000000
--- a/x11-wm/compiz/files/04-fbconfig-depth-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Make sure the depth of the corresponding match for the fbconfig we pick.
-
-From: Kristian Høgsberg <krh@redhat.com>
-
-
----
-
- src/screen.c |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/src/screen.c b/src/screen.c
-index 9ec30d5..75c6abc 100644
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -1309,6 +1309,16 @@ addScreen (CompDisplay *display,
- 
- 	for (j = 0; j < nElements; j++)
- 	{
-+	    {
-+	      XVisualInfo *vi;
-+	      int visual_depth;
-+	      vi = glXGetVisualFromFBConfig(dpy, fbConfigs[j]);
-+	      visual_depth = vi->depth;
-+	      XFree(vi);
-+	      if (visual_depth != i)
-+		continue;
-+	    }
-+
- 	    (*s->getFBConfigAttrib) (dpy,
- 				     fbConfigs[j],
- 				     GLX_ALPHA_SIZE,
diff --git a/x11-wm/compiz/files/07-cow.patch b/x11-wm/compiz/files/07-cow.patch
deleted file mode 100644
index aa0550b13003..000000000000
--- a/x11-wm/compiz/files/07-cow.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- ./src/display.c.cow	2006-08-29 19:48:53.000000000 -0400
-+++ ./src/display.c	2006-08-29 18:11:46.000000000 -0400
-@@ -1998,7 +1998,7 @@
- 					   PAINT_SCREEN_REGION_MASK |
- 					   PAINT_SCREEN_FULL_MASK);
- 
--			glXSwapBuffers (s->display->display, s->root);
-+			glXSwapBuffers (s->display->display, s->output);
- 		    }
- 		    else if (s->damageMask & COMP_SCREEN_DAMAGE_REGION_MASK)
- 		    {
-@@ -2022,7 +2022,7 @@
- 				    y = s->height - pBox->y2;
- 
- 				    (*s->copySubBuffer) (s->display->display,
--							 s->root,
-+							 s->output,
- 							 pBox->x1, y,
- 							 pBox->x2 - pBox->x1,
- 							 pBox->y2 - pBox->y1);
-@@ -2071,7 +2071,7 @@
- 					       &s->region,
- 					       PAINT_SCREEN_FULL_MASK);
- 
--			    glXSwapBuffers (s->display->display, s->root);
-+			    glXSwapBuffers (s->display->display, s->output);
- 			}
- 		    }
- 
---- ./src/screen.c.cow	2006-08-29 14:11:48.000000000 -0400
-+++ ./src/screen.c	2006-08-29 18:19:32.000000000 -0400
-@@ -40,6 +40,8 @@
- #include <X11/Xatom.h>
- #include <X11/Xproto.h>
- #include <X11/extensions/Xrandr.h>
-+#include <X11/extensions/Xcomposite.h>
-+#include <X11/extensions/shape.h>
- #include <X11/cursorfont.h>
- 
- #include <compiz.h>
-@@ -878,6 +880,25 @@
- 		     (unsigned char *) data, 1);
- }
- 
-+static void
-+makeOutputWindow (CompScreen *s)
-+{
-+    Display       *dpy = s->display->display;
-+    XserverRegion region;
-+
-+    s->overlay   = XCompositeGetOverlayWindow (dpy, s->root);
-+    s->output    = s->overlay;
-+
-+    region = XFixesCreateRegion (dpy, NULL, 0);
-+
-+    XFixesSetWindowShapeRegion (dpy,
-+				s->output,
-+				ShapeInput,
-+				0, 0, region);
-+
-+    XFixesDestroyRegion (dpy, region);
-+}
-+
- Bool
- addScreen (CompDisplay *display,
- 	   int	       screenNum,
-@@ -1045,6 +1066,8 @@
- 
-     s->grabWindow = None;
- 
-+    makeOutputWindow (s);
-+
-     templ.visualid = XVisualIDFromVisual (s->attrib.visual);
- 
-     visinfo = XGetVisualInfo (dpy, VisualIDMask, &templ, &nvisinfo);
-@@ -1174,7 +1197,7 @@
- 	s->copySubBuffer = (GLXCopySubBufferProc)
- 	    getProcAddress (s, "glXCopySubBufferMESA");
- 
--    glXMakeCurrent (dpy, s->root, s->ctx);
-+    glXMakeCurrent (dpy, s->output, s->ctx);
-     currentRoot = s->root;
- 
-     glExtensions = (const char *) glGetString (GL_EXTENSIONS);
-@@ -2844,7 +2867,7 @@
- {
-     if (currentRoot != s->root)
-     {
--	glXMakeCurrent (s->display->display, s->root, s->ctx);
-+	glXMakeCurrent (s->display->display, s->output, s->ctx);
- 	currentRoot = s->root;
- 
- 	s->pendingCommands = TRUE;
---- ./include/compiz.h.cow	2006-08-29 19:36:02.000000000 -0400
-+++ ./include/compiz.h	2006-08-29 15:46:43.000000000 -0400
-@@ -1288,6 +1288,8 @@
-     Region	      damage;
-     unsigned long     damageMask;
-     Window	      root;
-+    Window	      overlay;
-+    Window	      output;
-     XWindowAttributes attrib;
-     Window	      grabWindow;
-     CompFBConfig      glxPixmapFBConfigs[MAX_DEPTH + 1];
---- ./src/event.c.cow	2006-08-29 21:37:29.000000000 -0400
-+++ ./src/event.c	2006-08-29 21:39:03.000000000 -0400
-@@ -1145,7 +1145,12 @@
- 	s = findScreenAtDisplay (d, event->xcreatewindow.parent);
- 	if (s)
- 	{
--	    addWindow (s, event->xcreatewindow.window, getTopWindow (s));
-+	    /* The first time some client asks for the composite
-+	     * overlay window, the X server creates it, which causes
-+	     * an errorneous CreateNotify event.  We catch it and
-+	     * ignore it. */
-+	    if (s->overlay != event->xcreatewindow.window)
-+		addWindow (s, event->xcreatewindow.window, getTopWindow (s));
- 	}
- 	break;
-     case DestroyNotify:
diff --git a/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060916 b/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060916
deleted file mode 100644
index e70008a76fef..000000000000
--- a/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060916
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 89a0078ac97dc08972ed347850a9c09c compiz-20060916.tar.bz2 336009
-RMD160 bee7ff7083dd752257b7a9cf6f7d9f06f257a79c compiz-20060916.tar.bz2 336009
-SHA256 afd6d930cb739e7fe2e9246ba3c522d90d626991c8bf9dee2753c80543527ba7 compiz-20060916.tar.bz2 336009
diff --git a/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060921 b/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060921
deleted file mode 100644
index 3978b20baadf..000000000000
--- a/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060921
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 04212d45b42cad7e6864ea9907313267 compiz-20060921.tar.bz2 345378
-RMD160 73186a7ddcd74163b63602e298290f915d539898 compiz-20060921.tar.bz2 345378
-SHA256 925d29aae3405fdf8dece645367c2c8c3328f082cad38085af37dc4a5128210b compiz-20060921.tar.bz2 345378
diff --git a/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060928 b/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060928
deleted file mode 100644
index 614d8a7c7f14..000000000000
--- a/x11-wm/compiz/files/digest-compiz-0.0.13_pre20060928
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e9ffbcd82627b920c3c76f5808f5d7d compiz-20060928.tar.bz2 347383
-RMD160 76486a79bd295f173daa057b231fd3adf850b7e7 compiz-20060928.tar.bz2 347383
-SHA256 e40e82622eae6111c734d49668d74ef79156703cf56bb6836a06b2442d83db37 compiz-20060928.tar.bz2 347383