Remove support for DBUS wrt #365121

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

3 files changed, 32 insertions, 10 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index ed1bfe59d360..9c4c19a120c5 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.61 2011/03/20 21:27:05 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.62 2011/11/11 22:54:51 ssuominen Exp $
+
+  11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> compiz-0.8.6-r3.ebuild:
+  Remove support for DBUS wrt #365121
 
   20 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -compiz-0.8.4.ebuild,
   -compiz-0.8.4-r1.ebuild, -compiz-0.8.4-r2.ebuild, -compiz-0.8.4-r3.ebuild,
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 8a301443586b..b6ddafa4406b 100644
--- 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
 AUX compiz-0.6.2-CVE-2007-3920.patch 1019 RMD160 024316c8213df5c68ceb39c404da4227cdfbf21f SHA1 adf6c10f0fa3de040704cd208d09d93b402667b8 SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee
 AUX compiz-0.7.8-framesvg.patch 3119 RMD160 315aeb6b97db26af1bc48a2fb66228b402a07823 SHA1 5706c35119691c7b466e4c3b6dc39dd5a463cddf SHA256 9d323dd2ff10848d3c2cac93b00b67cca878f77942443a96f16b82c649535a21
@@ -14,6 +17,17 @@ AUX compiz-manager 9835 RMD160 0c579ebd41c22b4f33edb2d2d5b1e41ac30720ac SHA1 ff3
 AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
 AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
 DIST compiz-0.8.6.tar.bz2 1162334 RMD160 7a5476a21143e29ac2e35465c49e8a52b629a864 SHA1 8d5998cb18418283cbd367f126a65dde4062ad00 SHA256 c4df69b59b5660a37462de9ff0212af024ccf9c8038651bfda3557c955ab4f8c
-EBUILD compiz-0.8.6-r3.ebuild 3983 RMD160 543e71d4ead065311d9074a76372356d41f5a50f SHA1 e2a920977ed52989c40b4f71065599feb4c8c96f SHA256 fa5a3bac3e48b2759b877773732985878f34f6d8ddb310cabca8450eb7e54707
-MISC ChangeLog 12004 RMD160 5ff3757952619f3e44ce868d947920dca4ee087c SHA1 21c14f05cc128d24e0c7f5666eb75d494129b1f4 SHA256 67d02a2a8736f0dc35f8c95764e0331bc3d136e12394868aa910b54c32a36d8a
+EBUILD compiz-0.8.6-r3.ebuild 4035 RMD160 794d59ba44892aca9d335e4c2d70184a8925b90a SHA1 1ab759f6767873cdee8bacddd483e59b9e8d1c8f SHA256 e5d7add1f1bff6a09baf3e68376dd9f59b5762b83241d439823cd0604db56dce
+MISC ChangeLog 12122 RMD160 22e21c3bf05d2b544e31c32f4aa9150ef1678ce5 SHA1 859960c2962126f65a60298115cd3a17038e909b SHA256 16878d1a58936221c5209712a2615cee979a9b536b1209487316a084f1ca6a8b
 MISC metadata.xml 633 RMD160 26a7c6887013f704c45bd0e6856e4c23fe14b0f8 SHA1 2552399215492619aa9d754e593c7c6b770a33a8 SHA256 d35fbc8d178e601ff147c3e38b963f9f6dd7acdd5f853bf5182ef29edf3240ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJOvad+AAoJEEdUh39IaPFN7UgH/ROXfzlz5RwWZuUZMBPToulG
+Hvyd6Ike+SyH7b+JO6dxiFDH9YsaZ+fhrnRWqIdrYszKh36RDJGZ2JYoBx3nFruP
+4YqXU8IBAiIHvXrklKFArVoFv+neNyhyeIv9R/p4NbK+0gXWUj6UwG9Wg1h9iwr+
+pdl7cELMbQR3rnB/ZHRQzDnjcrKOOhAEZX75hnieJkehbFSrwKsJRhlyBV/Hh//M
+cq53/Ut+oBfBffqKPTJI1b6I7UVUxIB/y47lCZAtAtRBBUDCypun79kRBEsDCFlF
+3/lVRU7oagtJ0GR7KmA+AF8Z/IZWJPZqt3wnePiESCJLTvID8Tx0HtC8yddDxIw=
+=KoVP
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/compiz/compiz-0.8.6-r3.ebuild b/x11-wm/compiz/compiz-0.8.6-r3.ebuild
index d83480c999b4..4b1d859f528b 100644
--- a/x11-wm/compiz/compiz-0.8.6-r3.ebuild
+++ b/x11-wm/compiz/compiz-0.8.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6-r3.ebuild,v 1.2 2011/03/20 21:27:05 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6-r3.ebuild,v 1.3 2011/11/11 22:54:51 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,7 +13,8 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gconf gtk kde +svg"
+# dbus has been disabled because of bug 365121
+IUSE="+cairo fuse gnome gconf gtk kde +svg" # dbus
 
 COMMONDEPEND="
 	dev-libs/glib:2
@@ -22,7 +23,7 @@ COMMONDEPEND="
 	media-libs/libpng
 	>=media-libs/mesa-6.5.1-r1
 	>=x11-base/xorg-server-1.1.1-r1
-	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
+	>=x11-libs/libX11-1.4
 	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
@@ -35,7 +36,6 @@ COMMONDEPEND="
 	cairo? (
 		x11-libs/cairo[X]
 	)
-	dbus? ( >=sys-apps/dbus-1.0 )
 	fuse? ( sys-fs/fuse )
 	gnome? (
 		>=gnome-base/gnome-control-center-2.16.1:2
@@ -58,6 +58,7 @@ COMMONDEPEND="
 		>=x11-libs/cairo-1.0
 	)
 "
+# dbus? ( >=sys-apps/dbus-1.0 )
 
 DEPEND="${COMMONDEPEND}
 	dev-util/pkgconfig
@@ -96,15 +97,16 @@ src_configure() {
 		myconf="${myconf} --disable-gconf"
 	fi
 
-	econf --disable-dependency-tracking \
+	econf \
+		--disable-dependency-tracking \
 		--enable-fast-install \
 		--disable-static \
 		--disable-gnome-keybindings \
 		--with-default-plugins \
 		$(use_enable svg librsvg) \
 		$(use_enable cairo annotate) \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-glib) \
+		--disable-dbus \
+		--disable-dbus-glib \
 		$(use_enable fuse) \
 		$(use_enable gnome) \
 		$(use_enable gnome metacity) \
@@ -112,6 +114,9 @@ src_configure() {
 		$(use_enable kde kde4) \
 		--disable-kde \
 		${myconf}
+
+		# $(use_enable dbus)
+		# $(use_enable dbus dbus-glib)
 }
 
 src_install() {