Revert wrongly removed ebuild

Package-Manager: portage-2.2_rc58/cvs/Linux i686

3 files changed, 152 insertions, 2 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 21cf7a0c8c2a..a2a410f268be 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,9 @@
 # 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.47 2009/12/11 17:31:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.48 2009/12/12 12:10:32 scarabeus Exp $
+
+  12 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> +compiz-0.8.2.ebuild:
+  Revert wrongly removed ebuild
 
   11 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -compiz-0.8.2-r3.ebuild:
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index d25a1c6e7494..7051dcfd3c51 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -5,7 +5,9 @@ AUX compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch 1118 RMD160 cc6920723b29f89
 AUX compiz-manager 9835 RMD160 0c579ebd41c22b4f33edb2d2d5b1e41ac30720ac SHA1 ff39aa8abf43e42895aec6696c3659773f927fd2 SHA256 e387ff9f01b84c572f31643316ed2ce2eacd11a92488e745ebcfd659945c6f1d
 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.2.tar.gz 1751448 RMD160 e8bd6e6acd61d585451f1ecfc9fb9658e3faccec SHA1 e3e8022f488ab039d7a0d42400b67ebad063c1b9 SHA256 8ef19e2282c4df048f80a4c0cf61dcd2e92b17b2e2436f77372ccc13745dd5c7
 DIST compiz-0.8.4.tar.gz 1755741 RMD160 176bfa04b8ee3ee3c5b7e6f3c27c88d16c54ac63 SHA1 244ac823818209e44944d74df42d8986ec31d9dd SHA256 22b1f06a458f8eefc9ef511f78a55887fcd456e0fe5bb7574eefcf624146ecf6
+EBUILD compiz-0.8.2.ebuild 3454 RMD160 9ba09c7aa303e027cf654e73dba7d377824d4da5 SHA1 26068f6f143862e126850d09aa591cf3858abaa3 SHA256 f36f8c32131e04e228f600b912c55857c736ff96a5444d316edfebef6809e429
 EBUILD compiz-0.8.4.ebuild 3495 RMD160 fc23273fc67cf19f91659f6d67f0c30d59d58b00 SHA1 ed4bbdb48f8852bf88ddf80d83e1b6bb9356ec1c SHA256 550e26f937b73a00564fe25426bab76fee43ef184a6305c8d917eb9f1eb1f8d0
-MISC ChangeLog 8449 RMD160 f1ae2fde349d30bde9790ec4ab956e5fc8adca3b SHA1 6fbe691a1f0e5b165cb630b464c996d4d15741ec SHA256 afaaca9b7a52091941f8b5c83151fa85551d39a96bab5aba9487ae4f64d8f3fd
+MISC ChangeLog 8559 RMD160 95f8c8016d25e5b06363de89b19d65727af6d974 SHA1 400e43e06cf170c4b6e76b4f6b86b51c4b7b0c52 SHA256 21b6fc4d941b82c66f77ed441489c67cd9357bc938f8e7690bece32bd92bfdc6
 MISC metadata.xml 417 RMD160 321a21e2a068ad32b4a745d8e7fa7cc5b66b7c97 SHA1 47c7d29e48ccc0b9a4df2e33a1daad25dd7b20ad SHA256 2b61799ce14880f39c0f4ef065a412c02f760c67e2f831f18990f34bdcf731e6
diff --git a/x11-wm/compiz/compiz-0.8.2.ebuild b/x11-wm/compiz/compiz-0.8.2.ebuild
new file mode 100644
index 000000000000..25b9644e2c0a
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.8.2.ebuild
@@ -0,0 +1,145 @@
+# 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.ebuild,v 1.5 2009/12/12 12:10:32 scarabeus Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2-utils
+
+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 +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-4.2.0
+			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"
+
+	# Missing gconf flags, fix bug #282807
+	epatch "${FILESDIR}"/${P}-gtk-gnome-missing-gconf-flags.patch
+
+	if ! use gnome; then
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+	fi
+	eautoreconf
+}
+
+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 kde4) \
+		--disable-kde
+}
+
+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" || die "sed 1 failed"
+
+	# Fix the hardcoded lib paths
+	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
+
+	# Create gentoo's config file
+	dodir /etc/xdg/compiz || die "dodir failed"
+
+	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/lib/libGL.so.1.2"
+	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/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
+}