compiz minor fixes

Package-Manager: portage-2.1.2.5

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index f4bcc225c7533de29ef4f5a0cf895f32207ad2b2..eddc05783234e0c8d974317d3ce0de3c16aa41e2 100644 (file)
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,10 @@
 # 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.15 2007/04/24 01:51:02 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.16 2007/05/03 02:49:26 hanno Exp $
+
+  03 May 2007; Hanno Boeck <hanno@gentoo.org> files/compiz-start,
+  compiz-0.5.0.ebuild:
+  Fix some minor issues (gconf schema installation, more deps).
 
 *compiz-0.5.0 (24 Apr 2007)
 

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index fa56a6aa2085595377c40ee022d795abd187684a..6f3437ce42bc6c3641b4bf49d34f10c0f9cb9090 100644 (file)
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.3.6/compiz-start 1122 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 SHA1 f710dcfbd6274ff7bed3f264d284a4dcecb27254 SHA256 04a944e8e39ef1a6226b350027a5865bb56b45230aa59eae9574cd6c75529fa4
 MD5 68a063607644539218be79330a4e332f files/0.3.6/compiz-start 1122
 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 files/0.3.6/compiz-start 1122
@@ -14,10 +17,10 @@ AUX compiz-nvidia 232 RMD160 700811329f0145e5dd0c01f7dbe21fd5c7ec4e38 SHA1 a6ec2
 MD5 8cce4a808336400a802f62e5cc89027d files/compiz-nvidia 232
 RMD160 700811329f0145e5dd0c01f7dbe21fd5c7ec4e38 files/compiz-nvidia 232
 SHA256 71c7878ea80ec71626b0e3a328d31794b87d2840e96b9b608ee81fbb81835496 files/compiz-nvidia 232
-AUX compiz-start 910 RMD160 6c944925e0e9c597fa24c6ee71bbd2755ebae708 SHA1 85099a876084edd2f12b5566090a1424e5c43b3d SHA256 0bed0549a0bc87b3843c3afd5e8ff6f04973404cfcd4920b184da0aabf980e1e
-MD5 8693d46f7f2a29f37985c66fd7ef4a45 files/compiz-start 910
-RMD160 6c944925e0e9c597fa24c6ee71bbd2755ebae708 files/compiz-start 910
-SHA256 0bed0549a0bc87b3843c3afd5e8ff6f04973404cfcd4920b184da0aabf980e1e files/compiz-start 910
+AUX compiz-start 954 RMD160 86bcf70c5bbde688e23ec0fd179843e3360e22f6 SHA1 49a633788cbfd47e2793ee08c16724f48e57b285 SHA256 b2dd03f42ab8847c80597bba35e030f84f72e5c247248a3f59a951a267582710
+MD5 37e8e9496a68d907d40fc5b975e66c8a files/compiz-start 954
+RMD160 86bcf70c5bbde688e23ec0fd179843e3360e22f6 files/compiz-start 954
+SHA256 b2dd03f42ab8847c80597bba35e030f84f72e5c247248a3f59a951a267582710 files/compiz-start 954
 AUX compiz-xgl 244 RMD160 d5975cc2ea3a346c063ef3dcebb190f57cce8406 SHA1 a04d4be33ac9702a42a24d8c0cb5d604f14a50fc SHA256 7a93c7be6831b337165e2284e9f3340c0380fb3c5566ea73cc384f6e9489a680
 MD5 6f47d17281e98c559bc25532912a1dc5 files/compiz-xgl 244
 RMD160 d5975cc2ea3a346c063ef3dcebb190f57cce8406 files/compiz-xgl 244
@@ -33,14 +36,14 @@ EBUILD compiz-0.3.6.ebuild 1315 RMD160 5474fdd585b29c485381ff466e41bad0e0af9809
 MD5 6d2e436cf32198b6dc9683baca73865b compiz-0.3.6.ebuild 1315
 RMD160 5474fdd585b29c485381ff466e41bad0e0af9809 compiz-0.3.6.ebuild 1315
 SHA256 da35978e2f25f6f743569ceb809482ed7c74e29ff5450a438ee202a840a85b94 compiz-0.3.6.ebuild 1315
-EBUILD compiz-0.5.0.ebuild 1402 RMD160 c29ef42055d5246432d2c1d0a7fe8f5dc085dc5a SHA1 77c4e29998d63ab3505488fa97ed24f03c88f1f9 SHA256 63c446346ac3a9512aaa4870608f24992f57776ed9b1abdbe9a7049e22a393b1
-MD5 123c4ebae8616bb7ac6f143de3ccd207 compiz-0.5.0.ebuild 1402
-RMD160 c29ef42055d5246432d2c1d0a7fe8f5dc085dc5a compiz-0.5.0.ebuild 1402
-SHA256 63c446346ac3a9512aaa4870608f24992f57776ed9b1abdbe9a7049e22a393b1 compiz-0.5.0.ebuild 1402
-MISC ChangeLog 2554 RMD160 384a263d35b7b5a7ac384c2d7704f00020f8c17f SHA1 4975802bcff087c393dd8ff57dc30558ef88c880 SHA256 91852bcf042db5104cdc1d715605b4d6f2c7b019a4d203efdc0b4f551e61da1f
-MD5 45c9a11f33aedda7f146212232a5563b ChangeLog 2554
-RMD160 384a263d35b7b5a7ac384c2d7704f00020f8c17f ChangeLog 2554
-SHA256 91852bcf042db5104cdc1d715605b4d6f2c7b019a4d203efdc0b4f551e61da1f ChangeLog 2554
+EBUILD compiz-0.5.0.ebuild 1434 RMD160 c3120059372264bda99e3d98281dd8168438113f SHA1 4403790b6102d6076823ff657041dc17e4571799 SHA256 40c33c206879112d34203a70bf5a4ff4f8362d492f6fe3f242fc63c59c6a61ab
+MD5 e8a3da265fdc30a7c9ccd4294cef536a compiz-0.5.0.ebuild 1434
+RMD160 c3120059372264bda99e3d98281dd8168438113f compiz-0.5.0.ebuild 1434
+SHA256 40c33c206879112d34203a70bf5a4ff4f8362d492f6fe3f242fc63c59c6a61ab compiz-0.5.0.ebuild 1434
+MISC ChangeLog 2708 RMD160 5874be5fc74a0389b0460e83968a54caa2a6f7db SHA1 c726764b51f3f1c903c024b8f1ec59a59c1776ac SHA256 cfe548cb2b3fff88175092eda9ef5aa3e357f3581a6cdf093fd81310bab8de34
+MD5 3f4f87edf35058797d4cd83c2b9cb56d ChangeLog 2708
+RMD160 5874be5fc74a0389b0460e83968a54caa2a6f7db ChangeLog 2708
+SHA256 cfe548cb2b3fff88175092eda9ef5aa3e357f3581a6cdf093fd81310bab8de34 ChangeLog 2708
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
@@ -54,3 +57,10 @@ SHA256 da82c2219df78a55dad99067c75d5ccd01fcee1a58187ec611d1ecade9c2e3f6 files/di
 MD5 796f9a8a5c0429ff46cbac3552c26866 files/digest-compiz-0.5.0 241
 RMD160 7ae4afff6094f26a201949943bdd0f875d53a7f5 files/digest-compiz-0.5.0 241
 SHA256 43b51289c923bc70cd483932143e9076e75a11982dc016e691a1537667f09e87 files/digest-compiz-0.5.0 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGOU27r2QksT29OyARAv3zAKCYp5DATaOQfCeRjWUZiaq8pjqI2ACdG/fj
+xjs3dkhWGtHOOtW1Jy1fnRc=
+=xQu1
+-----END PGP SIGNATURE-----

diff --git a/x11-wm/compiz/compiz-0.5.0.ebuild b/x11-wm/compiz/compiz-0.5.0.ebuild
index eca8d75500451317fbcadd88fa0a5233efbed325..a19ba1dd776fee3d1dd641891619e1e4235ecaaa 100644 (file)
--- a/x11-wm/compiz/compiz-0.5.0.ebuild
+++ b/x11-wm/compiz/compiz-0.5.0.ebuild
@@ -1,6 +1,8 @@
 # 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.5.0.ebuild,v 1.1 2007/04/24 01:51:02 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.5.0.ebuild,v 1.2 2007/05/03 02:49:26 hanno Exp $
+
+inherit gnome2
 
 DESCRIPTION="3D composite- and windowmanager"
 HOMEPAGE="http://www.compiz.org/"
@@ -19,6 +21,7 @@ DEPEND=">=media-libs/mesa-6.5.1-r1
        x11-libs/libXinerama
        media-libs/libpng
        >=x11-libs/gtk+-2.0
+       x11-libs/pango
        x11-libs/startup-notification
        gnome-base/gconf
        gnome? ( >=x11-libs/libwnck-2.16.1

diff --git a/x11-wm/compiz/files/compiz-start b/x11-wm/compiz/files/compiz-start
index 8eaf0161a7f1790ebd3d6cc9287be6ed0ee64c72..3edd7a9c298990a7d5e13ab634428f57038a9734 100755 (executable)
--- a/x11-wm/compiz/files/compiz-start
+++ b/x11-wm/compiz/files/compiz-start
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # compiz-start script
 #
 # hacky autodetection of neccessary options for XGL/AIGLX/NVIDIA
@@ -16,13 +18,13 @@ COMPIZ_OPTIONS="--replace --use-cow"
 if [ $GLX_WITH_DIRECT -eq 3 ]; then
        if [ $GLX_RENDER -eq 0 ]; then
                echo NVIDIA detected
-               export __GL_YIELD="NOTHING" 
+               __GL_YIELT="NOTHING; export __GL_YIELD
        else
                echo XGL detected
        fi
 elif [ $GLX_WITH_INDIRECT -eq 3 ]; then
        echo AIGLX detected
-       export LIBGL_ALWAYS_INDIRECT=1
+       LIBGL_ALWAYS_INDIRECT=1; export LIBGL_ALWAYS_INDIRECT
        COMPIZ_OPTIONS="$COMPIZ_OPTIONS --strict-binding"
 fi