compiz bump

(Portage version: 2.1.2_rc4-r6)

4 files changed, 102 insertions, 2 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 57c91a68ed80..6c06cd0c126c 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/compiz
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.10 2006/11/29 23:20:52 hanno Exp $
+# 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 $
+
+*compiz-0.3.6 (06 Jan 2007)
+
+  06 Jan 2007; Hanno Boeck <hanno@gentoo.org> +files/0.3.6/compiz-start,
+  +compiz-0.3.6.ebuild:
+  Version bump, now with kde-decorator.
 
   29 Nov 2006; Hanno Boeck <hanno@gentoo.org> +files/compiz-start,
   compiz-0.3.4.ebuild:
diff --git a/x11-wm/compiz/compiz-0.3.6.ebuild b/x11-wm/compiz/compiz-0.3.6.ebuild
new file mode 100644
index 000000000000..52d6b22d42b4
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.3.6.ebuild
@@ -0,0 +1,50 @@
+# 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 $
+
+inherit eutils gnome2
+
+DESCRIPTION="compiz 3D composite- and windowmanager"
+HOMEPAGE="http://www.go-compiz.org/"
+SRC_URI="http://xorg.freedesktop.org/archive/individual/app/${P}.tar.bz2"
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus gnome kde svg"
+
+DEPEND=">=media-libs/mesa-6.5.1-r1
+	>=media-libs/glitz-0.5.6
+	>=x11-base/xorg-server-1.1.1-r1
+	x11-libs/libXdamage
+	x11-libs/libXrandr
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	media-libs/libpng
+	>=x11-libs/gtk+-2.0
+	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 )"
+
+src_compile() {
+	econf --with-default-plugins \
+		--enable-gtk \
+		`use_enable gnome` \
+		`use_enable gnome metacity` \
+		`use_enable gnome gconf` \
+		`use_enable kde` \
+		`use_enable svg librsvg` \
+		`use_enable dbus` \
+		`use_enable dbus dbus-glib` || die
+
+	emake || die
+}
+
+src_install() {
+	dobin ${FILESDIR}/compiz-{aiglx,xgl,nvidia}
+	dobin ${FILESDIR}/${PV}/compiz-start
+
+	gnome2_src_install
+}
diff --git a/x11-wm/compiz/files/0.3.6/compiz-start b/x11-wm/compiz/files/0.3.6/compiz-start
new file mode 100755
index 000000000000..161068bdf537
--- /dev/null
+++ b/x11-wm/compiz/files/0.3.6/compiz-start
@@ -0,0 +1,41 @@
+# compiz-start script
+#
+# hacky autodetection of neccessary options for XGL/AIGLX/NVIDIA
+#
+# Hanno Boeck, http://www.hboeck.de/
+#
+# Licensed under the same conditions as compiz itself (MIT or GPL)
+
+if [ ! -x /usr/bin/glxinfo ]; then
+	echo "glxinfo not found, please install mesa-progs."
+	exit -1
+fi
+
+GLX_WITH_DIRECT=`glxinfo|grep -c GLX_EXT_texture_from_pixmap`
+GLX_WITH_INDIRECT=`LIBGL_ALWAYS_INDIRECT=1 glxinfo|grep -c GLX_EXT_texture_from_pixmap`
+GLX_RENDER=`glxinfo|grep -c "OpenGL renderer string: Mesa GLX Indirect"`
+
+
+COMPIZ_OPTIONS="--replace"
+
+if [ $GLX_WITH_DIRECT -eq 3 ]; then
+	if [ $GLX_RENDER -eq 0 ]; then
+		echo NVIDA detected
+		export __GL_YIELD="NOTHING" 
+	else
+		echo XGL detected
+	fi
+elif [ $GLX_WITH_INDIRECT -eq 3 ]; then
+	echo AIGLX detected
+	export LIBGL_ALWAYS_INDIRECT=1
+fi
+
+if [ ! -z $KDE_FULL_SESSION ] && [ -x /usr/bin/kde-window-decorator ]; then
+	echo Using KDE decorator
+	kde-window-decorator --replace &
+else
+	echo Using GTK decorator
+	gtk-window-decorator --replace &
+fi
+
+compiz $COMPIZ_OPTIONS gconf move resize minimize place decoration wobbly fade cube rotate scale switcher zoom dbus
diff --git a/x11-wm/compiz/files/digest-compiz-0.3.6 b/x11-wm/compiz/files/digest-compiz-0.3.6
new file mode 100644
index 000000000000..75dbdf0e6c9f
--- /dev/null
+++ b/x11-wm/compiz/files/digest-compiz-0.3.6
@@ -0,0 +1,3 @@
+MD5 260b03fc9ae62ff1ad4e8c5e92d56180 compiz-0.3.6.tar.bz2 722782
+RMD160 d379ae44b474cba8f179bb1ab2ecb0181228a0aa compiz-0.3.6.tar.bz2 722782
+SHA256 efe2f38908bb5f44d45924fd6319dcf8c08203150022a9bfd4a183505ebeec7c compiz-0.3.6.tar.bz2 722782