From: Hanno Boeck <hanno@gentoo.org>
Date: Sat, 20 Jan 2007 04:32:07 +0000 (+0000)
Subject: fix some compiz issues
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c67bf3e14e71273f84a0d27d4ecfc25903ea5a05;p=gentoo.git

fix some compiz issues
Package-Manager: portage-2.1.2-r1
---

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 6c06cd0c126c..86e42fb5ba30 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.11 2007/01/06 21:56:19 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.12 2007/01/20 04:32:07 hanno Exp $
+
+  20 Jan 2007; Hanno Boeck <hanno@gentoo.org> compiz-0.3.6.ebuild:
+  Fix a bunch of smaller issues, mostly depend-related, don't install
+  old/broken compiz-aiglx/xgl/nvidia-scripts any more, please use and test
+  compiz-start instead.
 
 *compiz-0.3.6 (06 Jan 2007)
 
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 235f4c6aa556..e3f06fd5bd52 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -31,14 +31,14 @@ EBUILD compiz-0.3.4.ebuild 1125 RMD160 671155e17ce2abeb619ab8f1e319d155690532d3
 MD5 cbbf81d9b8bba4a4513312e394fe5f1b compiz-0.3.4.ebuild 1125
 RMD160 671155e17ce2abeb619ab8f1e319d155690532d3 compiz-0.3.4.ebuild 1125
 SHA256 374ca71c6223b108347fb5814eebc17f20c20217a334ac658d23b88cbacf39ef compiz-0.3.4.ebuild 1125
-EBUILD compiz-0.3.6.ebuild 1276 RMD160 a8d40fbf4a5b160a745998b1545ec356afff5a6f SHA1 91dc404e78aa6f7834d8792bd26cfc72990d537e SHA256 74b7e6fe27be3a7cdea6c49c348fea503713d749f234203b05c40c7fd8c02065
-MD5 d8add376899c082e9159be93fec7cdb8 compiz-0.3.6.ebuild 1276
-RMD160 a8d40fbf4a5b160a745998b1545ec356afff5a6f compiz-0.3.6.ebuild 1276
-SHA256 74b7e6fe27be3a7cdea6c49c348fea503713d749f234203b05c40c7fd8c02065 compiz-0.3.6.ebuild 1276
-MISC ChangeLog 1987 RMD160 c97a6543ac0e4bd0045d436eeeb3e06187defe1a SHA1 2bf83710298b065f21cb14e741495626537b2706 SHA256 a8520a2d9dd6841370f468cc3325583cbe4c13a0a8088c0e4ef2dba0fc411fdc
-MD5 521ddcb7f13ef1726108003cf247709d ChangeLog 1987
-RMD160 c97a6543ac0e4bd0045d436eeeb3e06187defe1a ChangeLog 1987
-SHA256 a8520a2d9dd6841370f468cc3325583cbe4c13a0a8088c0e4ef2dba0fc411fdc ChangeLog 1987
+EBUILD compiz-0.3.6.ebuild 1324 RMD160 af26bec21ed177aedd230100431af3553da11135 SHA1 8edff208086ad2c737cb80c63bfcf6e7885b7d62 SHA256 e5bf363d39c443e6ea771a371af997df2de9b46a531f02452b11a3080629fc27
+MD5 6ae29565002b46ec84f93705b52bf450 compiz-0.3.6.ebuild 1324
+RMD160 af26bec21ed177aedd230100431af3553da11135 compiz-0.3.6.ebuild 1324
+SHA256 e5bf363d39c443e6ea771a371af997df2de9b46a531f02452b11a3080629fc27 compiz-0.3.6.ebuild 1324
+MISC ChangeLog 2224 RMD160 6b8a24626a7e924e99baf138172b2e9e1afa90d0 SHA1 02dabb44b20c0457dd061b370fd18eff35a6f370 SHA256 0c348be379530d2e58f585e6e9e3ca3595d010f8f3d57f905c73a7967ad8a4b8
+MD5 c06fb86c7993e4a1b9d25817f27e93b3 ChangeLog 2224
+RMD160 6b8a24626a7e924e99baf138172b2e9e1afa90d0 ChangeLog 2224
+SHA256 0c348be379530d2e58f585e6e9e3ca3595d010f8f3d57f905c73a7967ad8a4b8 ChangeLog 2224
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
@@ -52,7 +52,7 @@ SHA256 da82c2219df78a55dad99067c75d5ccd01fcee1a58187ec611d1ecade9c2e3f6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFoBrxr2QksT29OyARAg1SAJ0c0h8s6iADYWchoXii30Ey4ZvMcgCdHICH
-WLqCzYxyvjxFze1mJVpToFs=
-=hyuz
+iD8DBQFFsZtQr2QksT29OyARAqE+AJ9DQxHfO7DtTwYj1l1EZmue0QUlxwCfVTIm
+QoXbLV939BtjE9xCaEq2uxA=
+=UnK0
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/compiz/compiz-0.3.6.ebuild b/x11-wm/compiz/compiz-0.3.6.ebuild
index 52d6b22d42b4..82a5ea43a8f1 100644
--- a/x11-wm/compiz/compiz-0.3.6.ebuild
+++ b/x11-wm/compiz/compiz-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.3.6.ebuild,v 1.1 2007/01/06 21:56:19 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.3.6.ebuild,v 1.2 2007/01/20 04:32:07 hanno Exp $
 
 inherit eutils gnome2
 
@@ -21,12 +21,16 @@ DEPEND=">=media-libs/mesa-6.5.1-r1
 	x11-libs/libXinerama
 	media-libs/libpng
 	>=x11-libs/gtk+-2.0
+	x11-libs/startup-notification
 	gnome? ( >=x11-libs/libwnck-2.16.1
 		>=gnome-base/control-center-2.16.1 )
 	svg? ( gnome-base/librsvg )
-	dbus? ( sys-apps/dbus
-		>dev-libs/glib-2 )
-	kde? ( kde-base/kdelibs )"
+	dbus? ( >=sys-apps/dbus-1.0
+		>dev-libs/glib-2
+		kde? ( dev-libs/dbus-qt3-old ) )
+	kde? (
+	|| ( kde-base/kwin kde-base/kdebase )
+	)"
 
 src_compile() {
 	econf --with-default-plugins \
@@ -43,7 +47,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${FILESDIR}/compiz-{aiglx,xgl,nvidia}
 	dobin ${FILESDIR}/${PV}/compiz-start
 
 	gnome2_src_install