fix some compiz dep issues

Package-Manager: portage-2.1.2-r4

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 86e42fb5ba3034789f76080950b10b914e435735..6adc32a46518a27930e0e322002db36597aabd86 100644 (file)
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,9 @@
 # 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.12 2007/01/20 04:32:07 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.13 2007/01/28 15:06:14 hanno Exp $
+
+  28 Jan 2007; Hanno Boeck <hanno@gentoo.org> compiz-0.3.6.ebuild:
+  Fix dep issues, dbus is always required if kde-decorator is built.
 
   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

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index e3f06fd5bd52c005ef76d9319ebd0bd92043976a..37533405126efaf4682fb9fad684460e185fc36e 100644 (file)
--- 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 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
+EBUILD compiz-0.3.6.ebuild 1315 RMD160 5474fdd585b29c485381ff466e41bad0e0af9809 SHA1 95bb922e873656cccd80a561040a6ae2de4b54b2 SHA256 da35978e2f25f6f743569ceb809482ed7c74e29ff5450a438ee202a840a85b94
+MD5 6d2e436cf32198b6dc9683baca73865b compiz-0.3.6.ebuild 1315
+RMD160 5474fdd585b29c485381ff466e41bad0e0af9809 compiz-0.3.6.ebuild 1315
+SHA256 da35978e2f25f6f743569ceb809482ed7c74e29ff5450a438ee202a840a85b94 compiz-0.3.6.ebuild 1315
+MISC ChangeLog 2361 RMD160 9686ab05c0a453c4b0ed45accc500f3868b491df SHA1 ab402e26c67be189d55d4098c001223842c6915c SHA256 04712078b832648ff473350c2b0166e08a0509d3d5d3d0ee3f71ddb8398c2372
+MD5 feeec623c364aaf4e697c2f8ba00842c ChangeLog 2361
+RMD160 9686ab05c0a453c4b0ed45accc500f3868b491df ChangeLog 2361
+SHA256 04712078b832648ff473350c2b0166e08a0509d3d5d3d0ee3f71ddb8398c2372 ChangeLog 2361
 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)
 
-iD8DBQFFsZtQr2QksT29OyARAqE+AJ9DQxHfO7DtTwYj1l1EZmue0QUlxwCfVTIm
-QoXbLV939BtjE9xCaEq2uxA=
-=UnK0
+iD8DBQFFvLvMr2QksT29OyARAtlwAJ4pQek8cILs72fi9m83c2hRI6LcqQCcCj4b
+1jmP7dhiuY8lFSRum1JqBI0=
+=C9G1
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/compiz/compiz-0.3.6.ebuild b/x11-wm/compiz/compiz-0.3.6.ebuild
index 82a5ea43a8f178b0e675d8ac9b2a74794e63f8e9..56681e9556e3a378894a59672897cd47ba65850f 100644 (file)
--- 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.2 2007/01/20 04:32:07 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.3.6.ebuild,v 1.3 2007/01/28 15:06:14 hanno Exp $
 
 inherit eutils gnome2
 
@@ -26,11 +26,10 @@ DEPEND=">=media-libs/mesa-6.5.1-r1
                >=gnome-base/control-center-2.16.1 )
        svg? ( gnome-base/librsvg )
        dbus? ( >=sys-apps/dbus-1.0
-               >dev-libs/glib-2
-               kde? ( dev-libs/dbus-qt3-old ) )
+               >dev-libs/glib-2 )
        kde? (
-       || ( kde-base/kwin kde-base/kdebase )
-       )"
+               || ( kde-base/kwin kde-base/kdebase )
+               dev-libs/dbus-qt3-old )"
 
 src_compile() {
        econf --with-default-plugins \