Added compiz-0.7.8-r1 which includes a patch for compiz to build with KDE-4.2/live and

updated deps for compiz-0.7.8 as it only builds with KDE:4.1.
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64

5 files changed, 236 insertions, 11 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 1d0ec2745142..b64b95bfd35e 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.33 2008/11/27 18:09:04 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.34 2008/12/02 16:46:31 jmbsvicetto Exp $
+
+*compiz-0.7.8-r1 (02 Dec 2008)
+
+  02 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/compiz-0.7.8-framesvg.patch, compiz-0.7.8.ebuild,
+  +compiz-0.7.8-r1.ebuild:
+  Reviewed compiz-0.7.8 KDE4 deps as it only works with kwin:4.1 at the
+  moment. Added compiz-0.7.8-r1 with a dep on kwin:4.2 / kwin:live that
+  applies a patch for compiz to build.
 
   27 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   ChangeLog:
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 71650f4ae3dd..ec7ec312ee36 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,5 +1,6 @@
 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
 AUX compiz-manager 9831 RMD160 8ef4f9c669a085c76b391c1bef5788a1c3054bcb SHA1 f57f17a574db09ed602cfd87f4f452ca9de5e86f SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9
 AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
 DIST compiz-0.5.0.tar.bz2 926090 RMD160 c9b38ea1184e9b897d878c499c883dd388af17bd SHA1 453b4e8423b39d4ec3539817f2846d7ea485749e SHA256 4191745d86bec37de4cdc79bf0031afde1d28079eac2e3fc29aed18cd7a2a4e6
@@ -10,6 +11,7 @@ EBUILD compiz-0.5.0.ebuild 1439 RMD160 205c2af6ba1c2b71a132806984dd7537df3508ad
 EBUILD compiz-0.5.2.ebuild 1456 RMD160 01aec041dea85b7fdae0420ea322863f742941f6 SHA1 a999166c892bf92128ff499f504344ad6a199fe2 SHA256 d341674ed2455927038c49995dd6aedbfebefde12a84b96318967883dbb1dd5a
 EBUILD compiz-0.6.2-r1.ebuild 1719 RMD160 44f0ccbf283f44219e3d124b2a0df9d64dbba538 SHA1 61e009aef49f3121621a1f50decf3ead5b1c7657 SHA256 0e91b045deb0bb68a45be919c8f9aa366df57ead9f1e88a47c747dada39790b8
 EBUILD compiz-0.6.2.ebuild 1455 RMD160 fca32d8b51037dc1aaa01b89ce4ddf9d14e56a25 SHA1 e08804835caece20bc01363c1be8e2b28a5a5d5b SHA256 eba236f002449d04ae58ef2e0103cd30c6feb3d54eb6f8fc52adefe07a0bb102
-EBUILD compiz-0.7.8.ebuild 3249 RMD160 c8ee221c449192052212cd2e6f4530f3f2500090 SHA1 45b4e465d147d321ef92aab56522c8812fa44d6a SHA256 11127a796224730fee936c8e4404a8c2cad608e2449ef99b1b6d68e7c7945e98
-MISC ChangeLog 5225 RMD160 891fbcf8909adf659d78ba29c5cdb18da012654c SHA1 e46c40c3b8d7556e0217c08bff8c03c066827007 SHA256 eef6fd43de1a5836334b5faf0829f41a0bbca4fefb3517673d41289f7673e277
+EBUILD compiz-0.7.8-r1.ebuild 3285 RMD160 baf13aba0845f073a87e09f66a016c6c2290e026 SHA1 ac011533caa525dce1680aa5976ee514ded4544a SHA256 7cb2d928d5fda521c51953802f08a0ea06c9de9e41287ca88f3a1852b03b4859
+EBUILD compiz-0.7.8.ebuild 3190 RMD160 37389a225a8e5cd67136c64410846fead96b1ae1 SHA1 1f669e3ea51566a5fc52ff587f4e44fb0436f4ef SHA256 05de90edb293df365e72a3fa551dafb200f7599b1526966f23ed16502b72cd30
+MISC ChangeLog 5594 RMD160 afe0fe59cc7fbaa9b9182774046e08da618f1071 SHA1 4ff2fd5e2cfed96ccb441fbf4604b3755410c3bf SHA256 fdb5841a96f7fc83c7fcef794fefd4352e1243ff3f21fe652b1daa504d6ad826
 MISC metadata.xml 595 RMD160 e354511f8cf82c440781b7d2f2f48af495ac0ae2 SHA1 82abd21f65ca6e7275bc32aee890fe124ade7092 SHA256 977b829df1bda476da07f5be78d64cf40f86c5e3232e2f72554c3112d1621acb
diff --git a/x11-wm/compiz/compiz-0.7.8-r1.ebuild b/x11-wm/compiz/compiz-0.7.8-r1.ebuild
new file mode 100644
index 000000000000..bdd9fd42cce4
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.7.8-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.7.8-r1.ebuild,v 1.1 2008/12/02 16:46:31 jmbsvicetto Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2-utils multilib
+
+DESCRIPTION="3D composite and windowmanager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://xorg.freedesktop.org/archive/individual/app/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=media-libs/glitz-0.5.6
+	media-libs/libpng
+	>=media-libs/mesa-6.5.1-r1
+	>=x11-base/xorg-server-1.1.1-r1
+	x11-libs/libX11[xcb]
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/libXrender-0.8.4
+	>=x11-libs/startup-notification-0.7
+	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
+		gnome-base/gnome-desktop
+		gnome-base/gconf:2
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.8.0:2
+		>=x11-libs/libwnck-2.18.3
+		x11-libs/pango
+	)
+	kde? (
+		|| ( kde-base/kwin:3.5
+			kde-base/kdebase:3.5
+		)
+		dev-libs/dbus-qt3-old
+	)
+	kde4? (
+		|| (
+			kde-base/kwin:4.2
+			kde-base/kwin:live
+		)
+	)
+	svg? (
+		>=gnome-base/librsvg-2.14.0:2
+		>=x11-libs/cairo-1.0
+	)
+"
+
+RDEPEND="${DEPEND}
+	x11-apps/mesa-progs
+	x11-apps/xvinfo"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig
+	x11-proto/damageproto
+	x11-proto/xineramaproto"
+
+src_prepare() {
+
+	use kde4 &&	epatch "${FILESDIR}/${PN}-framesvg.patch"
+	use gnome || {
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+		ln -s "${ROOT}"/usr/share/aclocal/gconf-2.m4 acinclude.m4
+
+		# required to apply the above patch
+		intltoolize --copy --force || die "intltoolize failed"
+		eautoreconf || die "eautoreconf failed"
+	}
+}
+
+src_configure() {
+	econf \
+		--disable-gnome-keybindings \
+		--enable-librsvg \
+		--with-default-plugins \
+		$(use_enable cairo annotate) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-glib) \
+		$(use_enable fuse) \
+		$(use_enable gnome) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome metacity) \
+		$(use_enable gtk) \
+		$(use_enable kde) \
+		$(use_enable kde4) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install compiz-manager
+	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
+
+	# Add the full-path to lspci
+	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager"
+
+	# Create gentoo's config file
+	dodir /etc/xdg/compiz
+
+	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
+	COMPIZ_BIN_PATH="/usr/bin/"
+	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
+	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
+	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
+	KWIN="$(type -p kwin)"
+	METACITY="$(type -p metacity)"
+	SKIP_CHECKS="yes"
+	EOF
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+
+	ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
+	ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}
diff --git a/x11-wm/compiz/compiz-0.7.8.ebuild b/x11-wm/compiz/compiz-0.7.8.ebuild
index 194a7d1595a2..3c7361a232c7 100644
--- a/x11-wm/compiz/compiz-0.7.8.ebuild
+++ b/x11-wm/compiz/compiz-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild,v 1.3 2008/11/15 02:19:26 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild,v 1.4 2008/12/02 16:46:31 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -54,13 +54,7 @@ DEPEND="
 		)
 		dev-libs/dbus-qt3-old
 	)
-	kde4? (
-		|| (
-			kde-base/kwin:4.1
-			kde-base/kwin:4
-			kde-base/kwin:kde-svn
-		)
-	)
+	kde4? (	kde-base/kwin:4.1 )
 	svg? (
 		>=gnome-base/librsvg-2.14.0:2
 		>=x11-libs/cairo-1.0
diff --git a/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch b/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch
new file mode 100644
index 000000000000..a3eb30357f99
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch
@@ -0,0 +1,77 @@
+diff -p -up compiz-0.7.8/configure.ac.framesvg compiz-0.7.8/configure.ac
+--- compiz-0.7.8/configure.ac.framesvg	2008-11-20 15:58:43.000000000 +0100
++++ compiz-0.7.8/configure.ac	2008-11-20 16:34:25.000000000 +0100
+@@ -487,7 +487,7 @@ if test "x$use_kde4" = "xyes"; then
+   kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
+   kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
+ 
+-  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
++  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
+ 
+   dnl Check for KWin headers
+   AC_MSG_CHECKING([for KWin headers])
+diff -p -up compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp.framesvg compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp
+--- compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp.framesvg	2008-08-08 13:20:31.000000000 +0200
++++ compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp	2008-11-20 16:38:10.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ #include <fixx11h.h>
+ 
+-#include <KDE/Plasma/PanelSvg>
++#include <KDE/Plasma/FrameSvg>
+ #include <KDE/Plasma/Theme>
+ 
+ #include <kwindowsystem.h>
+@@ -46,9 +46,9 @@ mId (id)
+     QColor   color;
+     color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
+ 
+-    mBackground = new Plasma::PanelSvg();
++    mBackground = new Plasma::FrameSvg();
+     mBackground->setImagePath ("dialogs/background");
+-    mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
++    mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders);
+ 
+     mBorder.left   = mBackground->marginSize(Plasma::LeftMargin);
+     mBorder.right  = mBackground->marginSize(Plasma::RightMargin);
+@@ -131,8 +131,8 @@ KWD::Switcher::redrawPixmap ()
+     p.setCompositionMode (QPainter::CompositionMode_Source);
+     p.setRenderHint (QPainter::SmoothPixmapTransform);
+ 
+-    mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
+-    mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
++    mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
++    mBackground->paintFrame (&p, QRect (0, 0, contentWidth,
+ 			contentHeight));
+ 
+     mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
+@@ -168,7 +168,7 @@ KWD::Switcher::update ()
+     p.setCompositionMode (QPainter::CompositionMode_Source);
+ 
+ 
+-    mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top +
++    mBackground->paintFrame (&p, QRect (mBorder.left, mBorder.top +
+ 			mGeometry.height () + 5, mGeometry.width (),
+ 			fm.height ()));
+ 
+diff -p -up compiz-0.7.8/kde/window-decorator-kde4/switcher.h.framesvg compiz-0.7.8/kde/window-decorator-kde4/switcher.h
+--- compiz-0.7.8/kde/window-decorator-kde4/switcher.h.framesvg	2008-08-08 13:20:31.000000000 +0200
++++ compiz-0.7.8/kde/window-decorator-kde4/switcher.h	2008-11-20 16:36:22.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ namespace Plasma
+ {
+-class PanelSvg;
++class FrameSvg;
+ }
+ 
+ class QSpacerItem;
+@@ -70,7 +70,7 @@ class Switcher
+ 
+ 	QRect mGeometry;
+ 
+-	Plasma::PanelSvg *mBackground;
++	Plasma::FrameSvg *mBackground;
+ 	QPixmap mPixmap;
+ 	QPixmap mBackgroundPixmap;
+