Dropped the "bogus" glitz dep. Fixes bug 272968 - thanks to Christophe Saout <christophe@saout.de>.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 164 insertions, 2 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index f455bf8710da..082071db314c 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,13 @@
 # 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.42 2009/04/26 13:59:27 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.43 2009/06/12 03:09:39 jmbsvicetto Exp $
+
+*compiz-0.8.2-r2 (12 Jun 2009)
+
+  12 Jun 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +compiz-0.8.2-r2.ebuild:
+  Dropped the "bogus" glitz dep. Fixes bug 272968 - thanks to Christophe
+  Saout <christophe@saout.de>.
 
   26 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   compiz-0.8.2-r1:
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 9624272b2193..d0199a185a27 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -8,6 +8,7 @@ DIST compiz-0.6.2.tar.gz 1784471 RMD160 6cc235570c3ac15573050b27198648045a85a804
 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 3605 RMD160 ab5ddf1b575646d40ae21a1c7e68a26ec2cfd520 SHA1 3cdfbb576c0742cd501fc51682c4180d5d6b45d7 SHA256 92299a45c97239a3eb30d80236b3499b6fda12508179707979019ec9c397adc6
+EBUILD compiz-0.8.2-r2.ebuild 3579 RMD160 0cf38859f8beb436d41ef87683fdc7101e4b8b63 SHA1 536f7a766f9929c8559c4f9584d7c9d1e98df570 SHA256 6dd1b38b7f74186acd4e549faa7beaf17c2d7e6062d1915c326e326d291321bd
 EBUILD compiz-0.8.2.ebuild 3305 RMD160 5fe54351927982ab4084c27caae21b58b4422adf SHA1 4737728440532272db3e0d8497f9f227e79cda1d SHA256 8464478c1ac8b941bf163e7300abbd552b7e6d21f02d439ebd530473f0d2d345
-MISC ChangeLog 7217 RMD160 1ae685fd85017a1cc524109e23a624884b3610da SHA1 3e77c1666cbf2b9ecd1f87514d45ebb973f9cf67 SHA256 b17e00b00b618186ecfe4a5d36fc2ad21a7cd3444c5b4342694b1099e9340723
+MISC ChangeLog 7448 RMD160 ce7de4361edeb673a5e6df7a03a6f73bfffeb28b SHA1 8596cf15e4b0f16c86896759319071c9b695d91c SHA256 3e92feb2456ef07f5b7ed63de9590fdef2b2adcf8aea6bf5e66bd47e4358933a
 MISC metadata.xml 539 RMD160 c2053bf5659c7d3246bb95de2a2779ffb0813731 SHA1 6ce46505eae0455d6ff939e62fba02b295867ef1 SHA256 f6ec1e0c8e763af9b4b1f2daa066922e60df7369e1c5c8ea110328def5cb2b4c
diff --git a/x11-wm/compiz/compiz-0.8.2-r2.ebuild b/x11-wm/compiz/compiz-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..8f773e4c0b60
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.8.2-r2.ebuild
@@ -0,0 +1,154 @@
+# 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-r2.ebuild,v 1.1 2009/06/12 03:09:39 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/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_preinst() {
+	use gnome && gnome2_gconf_savelist
+}
+
+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
+}