Clean up old version

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 7 insertions, 86 deletions

diff --git a/x11-plugins/compiz-plugins-main/ChangeLog b/x11-plugins/compiz-plugins-main/ChangeLog
index 3d10ba68006d..720d3772a96b 100644
--- a/x11-plugins/compiz-plugins-main/ChangeLog
+++ b/x11-plugins/compiz-plugins-main/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/compiz-plugins-main
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.7 2009/10/15 17:12:06 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.8 2009/12/20 15:23:12 mrpouet Exp $
+
+  20 Dec 2009; Romain Perier <mrpouet@gentoo.org>
+  -compiz-plugins-main-0.8.2-r1.ebuild,
+  -files/compiz-plugins-main-0.8.2-xdamage-race.patch:
+  Clean up old version
 
 *compiz-plugins-main-0.8.4 (15 Oct 2009)
 
diff --git a/x11-plugins/compiz-plugins-main/Manifest b/x11-plugins/compiz-plugins-main/Manifest
index 3085d406fbab..987c8c35234b 100644
--- a/x11-plugins/compiz-plugins-main/Manifest
+++ b/x11-plugins/compiz-plugins-main/Manifest
@@ -1,8 +1,5 @@
-AUX compiz-plugins-main-0.8.2-xdamage-race.patch 1346 RMD160 b5ae8613aec891ef25f400007c4a3ab65343dfda SHA1 27611c3372831413571f1c821d114cd02563f3a0 SHA256 44d36e8a6113432bc93cf674ad96509dfc94a4fd804dbfc00c75625f49d1d500
 AUX compiz-plugins-main-no-gconf.patch 586 RMD160 1222325cbec30e35030c930cd3a9358a3b975047 SHA1 95ef3484e60b4f3c4d0bced6b0fb654e7cbcff89 SHA256 bc13b648e2198dd3611ba4f4734540903a740570a2c181dc666dd1e66f13e1da
-DIST compiz-plugins-main-0.8.2.tar.bz2 1169127 RMD160 36e0a258ff8287df2d517607c37f4df2b5e62725 SHA1 d733604cda891a95f8cb451bf70cb1ff8fd3f7c2 SHA256 d1c71500d4b84ac3a3767f0eb498bbfe22b8abcac8bc71dac6c7696de493ff1e
 DIST compiz-plugins-main-0.8.4.tar.bz2 1221256 RMD160 ea438b5b608dc084e50bac94a07ce66487f3a865 SHA1 9dcc1018537f69eb9fd470b1c49e7b4888c2c3ce SHA256 1ea757880a3793e9a01603839b4a2efe5fab4efee0a96101d772dc25422f8aee
-EBUILD compiz-plugins-main-0.8.2-r1.ebuild 1170 RMD160 00f235a2c4c154b4d6c77a72c765ce56c1f0a4ed SHA1 11fc34530a84fa5188dd99d48b31917ca4f23311 SHA256 7b30c1619feb3dfa1d639f8aef6abaceb1a5f8508cb1320cb1fcb8b5dc0e579b
 EBUILD compiz-plugins-main-0.8.4.ebuild 1121 RMD160 7ee90dfd151ab36b200c5fa522c5ef084ae6ba65 SHA1 9b8f33736a8da40e2de3f4c540422f5775851b3b SHA256 a270d5ade78fdeba79a0ed82584083d3dffaab4177eff3e0cf38dd33c6cb143f
-MISC ChangeLog 1600 RMD160 eaab22c371994a8fb70a1359b7d091454b44c60d SHA1 6ebf41458d7f5222abb9c97a6dfe375d74ac6656 SHA256 9be8d82ff9d113982d659bde586d2ed2228b6b63399c75cc2b46d71e1925383f
+MISC ChangeLog 1769 RMD160 79d0cdd383731319c0fe88e604840ac3f2db1c58 SHA1 17366f37f2ceabb1573037d043725646db3bfcdc SHA256 ad353bad1082fa0b4831f819981721fa933a5d57c816c9e47007bb0d59eefcd7
 MISC metadata.xml 423 RMD160 ed3e1c4f2fcef78faf6d8b85b337f60b69c582f1 SHA1 554188b456adfdd2be58a825b83f5a2f75a1070e SHA256 63a22d1439257bac17c3a4e5a045bc2e07fbd13bde371f72cecdd0bd5cbe8742
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2-r1.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2-r1.ebuild
deleted file mode 100644
index e6837ebe0674..000000000000
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2-r1.ebuild,v 1.1 2009/08/28 20:16:01 mrpouet Exp $
-
-EAPI="2"
-
-inherit eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	!x11-plugins/compiz-fusion-plugins-main
-	>=gnome-base/librsvg-2.14.0
-	media-libs/jpeg
-	x11-libs/cairo
-	~x11-libs/compiz-bcop-${PV}
-	~x11-wm/compiz-${PV}[gnome?]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.15
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-xdamage-race.patch
-	use gnome || epatch "${FILESDIR}"/${PN}-no-gconf.patch
-}
-
-src_configure() {
-	econf $(use_enable gnome schemas) || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-}
diff --git a/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-0.8.2-xdamage-race.patch b/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-0.8.2-xdamage-race.patch
deleted file mode 100644
index ee167b8319c9..000000000000
--- a/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-0.8.2-xdamage-race.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/workarounds/workarounds.c b/src/workarounds/workarounds.c
-index 5e0c221..f987fa0 100644
---- a/src/workarounds/workarounds.c
-+++ b/src/workarounds/workarounds.c
-@@ -198,6 +198,9 @@ workaroundsPaintScreen (CompScreen   *s,
- 
-     currentScreen = s;
- 
-+    if (workaroundsGetForceGlxSync (s->display))
-+	glXWaitX ();
-+
-     UNWRAP (ws, s, paintScreen);
-     (*s->paintScreen) (s, outputs, numOutputs, mask);
-     WRAP (ws, s, paintScreen, workaroundsPaintScreen);
-diff --git a/metadata/workarounds.xml.in b/metadata/workarounds.xml.in
-index 5eb072d..1648e88 100644
---- a/metadata/workarounds.xml.in
-+++ b/metadata/workarounds.xml.in
-@@ -53,6 +53,11 @@
-                 <_long>Fix for broken GLX_MESA_copy_sub_buffer on XGL in fglrx.</_long>
-                 <default>false</default>
-             </option>
-+            <option type="bool" name="force_glx_sync">
-+                <_short>Force synchronization between X and GLX</_short>
-+                <_long>Force synchronization between X and GLX, which may help for window parts not redrawing correctly when using Nvidia drivers, but also may decrease performance.</_long>
-+                <default>false</default>
-+            </option>
-             <subgroup>
-                 <_short>Window stickyness</_short>
-                 <option type="bool" name="sticky_alldesktops">