Added fix for tests. Thanks to Pacho Ramos <pacho@condmat1.ciencias.uniovi.es> for initial report and Brent Baude <ranger@gentoo.org> for recalling me about it again - fixes bug 265226.

Added gtk/gnome/compiz-wm.desktop.in and metadata/core.xml.in files to po/POTFILES.skip.
Install compiz.desktop file. Thanks to Philip Allison <sane@not.co.uk> for the file and Nirbheek Chauhan <nirbheek@gentoo.org> for the check from the gnome team - fixes bug 254166.
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 178 insertions, 2 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index d3501796d719..31283397e221 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.40 2009/04/25 16:06:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.41 2009/04/26 11:46:25 jmbsvicetto Exp $
+
+*compiz-0.8.2-r1 (26 Apr 2009)
+
+  26 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/compiz.desktop, +compiz-0.8.2-r1.ebuild:
+  Added fix for tests. Thanks to Pacho Ramos
+  <pacho@condmat1.ciencias.uniovi.es> for initial report and Brent Baude
+  <ranger@gentoo.org> for recalling me about it again - fixes bug 265226.
+  Install compiz.desktop file. Thanks to Philip Allison <sane@not.co.uk> for
+  the file and Nirbheek Chauhan <nirbheek@gentoo.org> for the check from the
+  gnome team - fixes bug 254166.
 
   25 Apr 2009; Brent Baude <ranger@gentoo.org> compiz-0.8.2.ebuild:
   Marking compiz-0.8.2 ~ppc for bug 246804
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 3da33cdbacb9..7c1107e73496 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -3,9 +3,11 @@ AUX compiz-0.6.2-CVE-2007-3920.patch 1019 RMD160 024316c8213df5c68ceb39c404da422
 AUX compiz-0.7.8-framesvg.patch 3119 RMD160 315aeb6b97db26af1bc48a2fb66228b402a07823 SHA1 5706c35119691c7b466e4c3b6dc39dd5a463cddf SHA256 9d323dd2ff10848d3c2cac93b00b67cca878f77942443a96f16b82c649535a21
 AUX compiz-manager 9821 RMD160 c8329ddd31435e449780a01d8cc6b53ee90cdabb SHA1 40c0ef6ef65e8d5103bed9efbac2cbe96c7ca1de SHA256 3f03d39880bd3802370369f84614f7e48b2687c56c4d99d445a964b98c7fd811
 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.6.2.tar.gz 1784471 RMD160 6cc235570c3ac15573050b27198648045a85a804 SHA1 ab5ecad856049a12a803fe6c94c3e55cdfcb5f68 SHA256 89efc2daefd79d28e2421902a6d890145df29e804bf8508773ea5a6eedb53224
 DIST compiz-0.8.2.tar.gz 1751448 RMD160 e8bd6e6acd61d585451f1ecfc9fb9658e3faccec SHA1 e3e8022f488ab039d7a0d42400b67ebad063c1b9 SHA256 8ef19e2282c4df048f80a4c0cf61dcd2e92b17b2e2436f77372ccc13745dd5c7
 EBUILD compiz-0.6.2-r1.ebuild 1719 RMD160 44f0ccbf283f44219e3d124b2a0df9d64dbba538 SHA1 61e009aef49f3121621a1f50decf3ead5b1c7657 SHA256 0e91b045deb0bb68a45be919c8f9aa366df57ead9f1e88a47c747dada39790b8
+EBUILD compiz-0.8.2-r1.ebuild 3550 RMD160 8d2321e872e1fc0ad90c09f940bc05baf9d4a44c SHA1 e071c86ead4027d466b9da0b1ac034c4863d7af1 SHA256 c5d5cb74707aa96160fcbdd7e633f81a4d8cb3e190fac8769545a98f7917d135
 EBUILD compiz-0.8.2.ebuild 3305 RMD160 5fe54351927982ab4084c27caae21b58b4422adf SHA1 4737728440532272db3e0d8497f9f227e79cda1d SHA256 8464478c1ac8b941bf163e7300abbd552b7e6d21f02d439ebd530473f0d2d345
-MISC ChangeLog 6469 RMD160 9f0c734a5ffef9914226e34aa1b55735abec2425 SHA1 048088e92311b2512f6e1c10ca5a0de1a49520b2 SHA256 98ce78a9ef2f387890f8d9d73840c4c2ea0eb6ca102091e0d6a475b12ef0e9ee
+MISC ChangeLog 7003 RMD160 8b60e9e7625b0ed88a8249bfb9e0cb967664b59a SHA1 e69aca1157bd13b35453af6909fc3809d29de953 SHA256 728819177d82e3fb93745203efc87d46e3dcb5ec876f32ab357ee79240f27c0f
 MISC metadata.xml 539 RMD160 c2053bf5659c7d3246bb95de2a2779ffb0813731 SHA1 6ce46505eae0455d6ff939e62fba02b295867ef1 SHA256 f6ec1e0c8e763af9b4b1f2daa066922e60df7369e1c5c8ea110328def5cb2b4c
diff --git a/x11-wm/compiz/compiz-0.8.2-r1.ebuild b/x11-wm/compiz/compiz-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..e16a431ed147
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.8.2-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2-r1.ebuild,v 1.1 2009/04/26 11:46:25 jmbsvicetto Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2-utils multilib
+
+DESCRIPTION="3D composite and windowmanager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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() {
+
+	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
+	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+
+	use gnome || {
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+		ln -s /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"
+
+	# Fix the hardcoded lib paths
+	sed -i "s#/lib/#/$(get_libdir)/#g" "${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"
+
+	insinto "/usr/share/applications"
+	doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop"
+}
+
+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/files/compiz.desktop b/x11-wm/compiz/files/compiz.desktop
new file mode 100644
index 000000000000..6400ce3a0959
--- /dev/null
+++ b/x11-wm/compiz/files/compiz.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Compiz
+Name[en_GB]=Compiz
+Exec=compiz ccp
+NoDisplay=true
+# name we put on the WM spec check window
+X-GNOME-WMName=Compiz
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true