Drop old compiz version

Package-Manager: portage-2.2.0_alpha129/cvs/Linux x86_64

5 files changed, 7 insertions, 298 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index aa475e55e34a..fba683140588 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.75 2012/09/12 19:43:28 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.76 2012/09/25 14:45:47 pinkbyte Exp $
+
+  25 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.8.6-r3.ebuild,
+  -files/compiz-0.8.6-gdk-display-deprecated.patch,
+  -files/compiz-0.8.6-r2-fontcorruption.patch:
+  Drop old compiz version
 
   12 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> files/compiz-gcc-4.7.patch:
   Updated version of gcc 4.7 compatibility patch
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 4ce03f91ce9c..9b767a15f7a2 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,14 +1,10 @@
-AUX compiz-0.8.6-gdk-display-deprecated.patch 3392 SHA256 a8038d6a80abe7f44f433f6ab0dd0cf39945850564b5da33244b88a099b4efb8 SHA512 49e1d8cda54cd698acfdebd38ac4d5edf10bf41202463ea836eb19b996205207c3000c64789baf8b6de6cd52f9cc9c5a74ac3603401af21b69c4228a141d07b1 WHIRLPOOL 3849521d85186190c88aa028b65c22e206a9eaf764482d1a35b3449b843d09d51368fca9a02b8d68f49bec7f664a8d3a38ab47dc1db10cb578f0331829234e7b
-AUX compiz-0.8.6-r2-fontcorruption.patch 676 SHA256 2c4c42a251c1583a8e7fe468c1868aa42b1318db5ee95189e23ae9be8061cd43 SHA512 b7ac11650ced25e9bb3b5c6a2e5d0d478a4235f5b8b009c7dc08ac314c714c01cbb7485e49f6bcfbdbd995223b25dc3f5d4f3f8b41af2a7772459f7e285e60d2 WHIRLPOOL 46e73c97bb6b6f01e907cf0016bee79da7b2899201e08d4d88d29e6f6a4e4bf983a107b32839a2e2049c893018e12db21380c9b59af449f04ad434763555324e
 AUX compiz-gcc-4.7.patch 999 SHA256 0824c0d32d32dfc8c57fa1afbfc81060e64bdcc4ec016f3ccb751a1956f6325a SHA512 e08563d928578ad74faa29168b3c3442cc0ab4e908ff4f430a7e23bcb2057e3da10f9742e8abbdaad9df6f56a039134e8a32f73ae214e240065d6d4ddd3a92bf WHIRLPOOL b79f08787a9f7d3dc46dc1f2c6645f40965c750122027e39679d783afb0c23bd300ee731bfb45858d6392c69a21b61eb326eb29315e0e4ac0d2655edb7d69f18
 AUX compiz-kde-4.8.patch 755 SHA256 4feb22c82d21c9d870d669498badf95c01f735a85f8a5f4d63b4877b6f74df65 SHA512 fccbe0afc6e7c651912dc0e271f3745e96f5562da210934d79f00820e3b94d8340ee62707a840e042d287eba920ff556c36a39032815549d86676cd53e1cbbcc WHIRLPOOL 0d0f015463dfccfec237ce97a781868c6a76a3ab96caa8c5ed656ea0504e425a7490c8289bf56a63c2c2f9cde6bf580c1b56a6a663b3086e9a25a85ff955b48b
 AUX compiz-kde-4.9.patch 4975 SHA256 0d984c6af504a9d3b532cc9e50534a329f914a5c949e10a54f39c56da856c09b SHA512 ef448bf43cba07ddd925405f8502af3d24692a911431696c9b454b97bc67523f39c1321a95dbf216bd5369a439dfc91e7b953be4a9340393254750515cf9097e WHIRLPOOL 15d6dd43de19a28f6428fcc1be080f922a087d5d0c50b57236bc555af199401e042a029526bf3f3b2c3b8d488cd16fd8704920875ef4fe5cd415266cf9bb2e44
 AUX compiz-manager 9835 SHA256 e387ff9f01b84c572f31643316ed2ce2eacd11a92488e745ebcfd659945c6f1d SHA512 5cf4c1023754128c456d48db257a308461de0cbd9ebd427a4c281ada0b77659013723362959ae39fa31f24de36929fdfe6ea96d9788cba568f35d2dc86bc263a WHIRLPOOL 0afb3b62a0e29b9608d2eaf640f7704ffa91a3ea7ea7fc0d7cba5761a04c4a1928007e285344e401030230de506b92cbbbdbe4436eda4ebd44848ebfcad95c97
 AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6
 AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb SHA512 60189c33d9190934195dace88a88571e79af2be06be0df9db96f7f332798cb8b3d7c0e4bacacb3413ea381c9418415932ae895e75547568eb38d12e3800cf427 WHIRLPOOL c8f068a5e254e74285ced96236a98cd4b5724c630342a19df1defb19f14755e83ce5e6d86688066dbbeee43e8c1d89640756d9427af996fa261f31630c6893af
-DIST compiz-0.8.6.tar.bz2 1162334 SHA256 c4df69b59b5660a37462de9ff0212af024ccf9c8038651bfda3557c955ab4f8c
 DIST compiz-0.8.8.tar.bz2 1123892 SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3 SHA512 6e3bad018835fdbc1b0e5ecb51a46a77a6531d46d77ee3ae4169273632ea9a6839c78300b18e2198c41698517efa65ded75387785b0c5bbbb6da41498451b644 WHIRLPOOL fa1d9b5e443d45a4615201a85a74dd025066620339ebac58b4fd5c71c19db731009c013ceee93f0345b46c413211424bc4c813d48e07d6cea874024a2b562ba2
-EBUILD compiz-0.8.6-r3.ebuild 4030 SHA256 17331b2883d72fcce403c1485dbf408b5dbc8781202c4e285f11e0b8dfcb6d70 SHA512 2072736bce9dd3be5def0f5ab8bea12e027f86dc698aef2cafa9fbb7ce984a288ba9a0711bd8892c37e50b404a759ca90f9223aa5ea137490251302f6fa8c8ee WHIRLPOOL 9c7fb53527a44b0635a888899808071091bb3c1e409fef84440d23384cf6d7ee5d8946e7d3e09c382063bd89c20d23ea806968193a470234360ff777efd4c10c
 EBUILD compiz-0.8.8-r1.ebuild 4080 SHA256 49cbf0ca5311cdb4fd97eb33599f20a8d95c30fcec11068808f5e1e933395057 SHA512 b315fa0fa739db7de5e8cd66563dfbf8e3a7497621e071e76b0f1dcbbe0836b56c1b8efe74d273a4000bfa06d7e464500e9e676e8d96aa9f40f9a05d04e151b3 WHIRLPOOL 6a3f89ae3b47ac14b2f3ddcce7887dc4e683c24d38ed22fc66e02fc61c0e4be09c15355f4119a8a596494ec8c4e1154f86f4204967875a7fdbfa05fa07ff4cd2
-MISC ChangeLog 14558 SHA256 3750d757411d3c84404729dd40224609e21993b3d26e6d6b749c447b8377a2e2 SHA512 fa94e89f667a43624ae82f7c9170846c4c2505e71c891dbea52f3603ad505d26f64ec765e5af5cdab6455fe085e14ad9756e10f9fea58ebe254cf860add5dbb8 WHIRLPOOL b214209e9cfd4a0f1b0c1829e9e0b625f528b8c4bae38fa8aa2cd15e229d5865a28975f8914ed7b0ddba872e82add4b150be956f7039693c4ceeea728ef21ffb
+MISC ChangeLog 14759 SHA256 ec8fdc6baec99f3d233a33be467df22c35c1ee46e5d6b02e2de51691097ba2ee SHA512 2c72c0f674741956966d470e7b6dd55ca15f3d5d0480418421f122623fba7d0cde5251f64ed899406428601b84c35ce93e833abe716798120ea618519843fc4f WHIRLPOOL eb6279421292103c32ff681594bc23a6c03cebf3f8b36e4aa843c1120cc9dd88a865067939588d771015c6479026fb3ba8dd8ac38505de97e59e69cb5750af40
 MISC metadata.xml 632 SHA256 a0dce016c36d51c1fe13822ed59ba3aef9b8a22fecdb2d3f5360b824ee890bb1 SHA512 46e6acb05014ec6cb5b77b6ff5ae31adff93ded582ad7ca22e90ce16c00f6ce7009fe72e603af83d0e6d5604f177e8eb175cdac2703d715c065e5df2834740a7 WHIRLPOOL 9499ba8dba186cc869cbc34cb7c964655c870318eaa28ca0d7ddef8b473e199edeea48f90f3394ff39334af6b8924f46dae4fa1a43ff9a75d54b0358cea88a2e
diff --git a/x11-wm/compiz/compiz-0.8.6-r3.ebuild b/x11-wm/compiz/compiz-0.8.6-r3.ebuild
deleted file mode 100644
index 9e5ed96a0599..000000000000
--- a/x11-wm/compiz/compiz-0.8.6-r3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6-r3.ebuild,v 1.6 2012/07/31 22:36:58 naota Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="OpenGL window and compositing manager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# dbus has been disabled because of bug 365121
-IUSE="+cairo fuse gnome gconf gtk kde +svg" # dbus
-
-COMMONDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/libpng
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
-	>=x11-libs/libX11-1.4
-	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]
-	)
-	fuse? ( sys-fs/fuse )
-	gnome? (
-		>=gnome-base/gnome-control-center-2.16.1:2
-		gnome-base/gnome-desktop:2
-		gconf? ( gnome-base/gconf:2 )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.8.0:2
-		>=x11-libs/libwnck-2.18.3:1
-		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
-	)
-"
-# dbus? ( >=sys-apps/dbus-1.0 )
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	x11-proto/damageproto
-	x11-proto/xineramaproto
-"
-
-RDEPEND="${COMMONDEPEND}
-	x11-apps/mesa-progs
-	x11-apps/xvinfo
-"
-
-src_prepare() {
-
-	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
-
-	# fix cont corruption, bug #343861
-	epatch "${FILESDIR}"/${P}-r2-fontcorruption.patch
-	epatch "${FILESDIR}"/${P}-gdk-display-deprecated.patch
-
-	if ! use gnome || ! use gconf; then
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# We make gconf optional by itself, but only if gnome is also
-	# enabled, otherwise we simply disable it.
-	if use gnome; then
-		myconf="${myconf} $(use_enable gconf)"
-	else
-		myconf="${myconf} --disable-gconf"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-gnome-keybindings \
-		--with-default-plugins \
-		$(use_enable svg librsvg) \
-		$(use_enable cairo annotate) \
-		--disable-dbus \
-		--disable-dbus-glib \
-		$(use_enable fuse) \
-		$(use_enable gnome) \
-		$(use_enable gnome metacity) \
-		$(use_enable gtk) \
-		$(use_enable kde kde4) \
-		--disable-kde \
-		${myconf}
-
-		# $(use_enable dbus)
-		# $(use_enable dbus dbus-glib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	# 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 && use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && use gconf && 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-0.8.6-gdk-display-deprecated.patch b/x11-wm/compiz/files/compiz-0.8.6-gdk-display-deprecated.patch
deleted file mode 100644
index 440b37a456c0..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.6-gdk-display-deprecated.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
-index 18b907e..566da0f 100644
---- a/gtk/window-decorator/gtk-window-decorator.c
-+++ b/gtk/window-decorator/gtk-window-decorator.c
-@@ -31,6 +31,11 @@
- #include <X11/extensions/Xrender.h>
- #include <X11/Xregion.h>
- 
-+/* This must be included before the GDK_DISABLE_DEPRECATED definition 
-+ * in order to avoid QA issues on amd64 arch (see Gentoo bug 344293).
-+ */
-+#include <gdk/gdkgc.h>
-+
- #ifndef GDK_DISABLE_DEPRECATED
- #define GDK_DISABLE_DEPRECATED
- #endif
-@@ -2659,6 +2664,7 @@ get_window_prop (Window xwindow,
- 		 Atom   atom,
- 		 Window *val)
- {
-+    Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-     Atom   type;
-     int	   format;
-     gulong nitems;
-@@ -2671,7 +2677,7 @@ get_window_prop (Window xwindow,
-     gdk_error_trap_push ();
- 
-     type = None;
--    result = XGetWindowProperty (gdk_display,
-+    result = XGetWindowProperty (dpy,
- 				 xwindow,
- 				 atom,
- 				 0, G_MAXLONG,
-@@ -4966,7 +4972,7 @@ force_quit_dialog_realize (GtkWidget *dialog,
-     WnckWindow *win = data;
- 
-     gdk_error_trap_push ();
--    XSetTransientForHint (gdk_display,
-+    XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 			  GDK_WINDOW_XID (dialog->window),
- 			  wnck_window_get_xid (win));
-     gdk_display_sync (gdk_display_get_default ());
-@@ -4976,17 +4982,18 @@ force_quit_dialog_realize (GtkWidget *dialog,
- static char *
- get_client_machine (Window xwindow)
- {
--    Atom   atom, type;
--    gulong nitems, bytes_after;
--    guchar *str = NULL;
--    int    format, result;
--    char   *retval;
-+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-+    Atom    atom, type;
-+    gulong  nitems, bytes_after;
-+    guchar  *str = NULL;
-+    int     format, result;
-+    char    *retval;
- 
--    atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+    atom = XInternAtom (xdisplay, "WM_CLIENT_MACHINE", FALSE);
- 
-     gdk_error_trap_push ();
- 
--    result = XGetWindowProperty (gdk_display,
-+    result = XGetWindowProperty (xdisplay,
- 				 xwindow, atom,
- 				 0, G_MAXLONG,
- 				 FALSE, XA_STRING, &type, &format, &nitems,
-@@ -5013,6 +5020,8 @@ get_client_machine (Window xwindow)
- static void
- kill_window (WnckWindow *win)
- {
-+    GdkDisplay      *gdk_display = gdk_display_get_default ();
-+    Display         *xdisplay    = GDK_DISPLAY_XDISPLAY (gdk_display);
-     WnckApplication *app;
- 
-     app = wnck_window_get_application (win);
-@@ -5038,8 +5047,8 @@ kill_window (WnckWindow *win)
-     }
- 
-     gdk_error_trap_push ();
--    XKillClient (gdk_display, wnck_window_get_xid (win));
--    gdk_display_sync (gdk_display_get_default ());
-+    XKillClient (xdisplay, wnck_window_get_xid (win));
-+    gdk_display_sync (gdk_display);
-     gdk_error_trap_pop ();
- }
- 
-@@ -5623,9 +5632,9 @@ static int
- update_shadow (void)
- {
-     decor_shadow_options_t opt;
--    Display		   *xdisplay = gdk_display;
--    GdkDisplay		   *display = gdk_display_get_default ();
--    GdkScreen		   *screen = gdk_display_get_default_screen (display);
-+    GdkDisplay		   *display  = gdk_display_get_default ();
-+    Display		   *xdisplay = GDK_DISPLAY_XDISPLAY (display);
-+    GdkScreen		   *screen   = gdk_display_get_default_screen (display);
- 
-     opt.shadow_radius  = shadow_radius;
-     opt.shadow_opacity = shadow_opacity;
diff --git a/x11-wm/compiz/files/compiz-0.8.6-r2-fontcorruption.patch b/x11-wm/compiz/files/compiz-0.8.6-r2-fontcorruption.patch
deleted file mode 100644
index 1ef84a17ced7..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.6-r2-fontcorruption.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0f95c41a0aa175ddf7947ba18b01f746c95594a9 Mon Sep 17 00:00:00 2001
-From: Paul Donohue <compiz@paulsd.com>
-Date: Sun, 17 Oct 2010 16:24:14 +0000
-Subject: Fix pixmap size calculation, server drawn borders are also included in 
-the pixmap.
----
-diff --git a/src/window.c b/src/window.c
-index a925288..6674643 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -1446,8 +1446,8 @@ bindWindow (CompWindow *w)
- 	}
- 
- 	w->pixmap = XCompositeNameWindowPixmap (dpy, w->id);
--	w->width  = attr.width;
--	w->height = attr.height;
-+	w->width  = attr.width + attr.border_width * 2;
-+	w->height = attr.height + attr.border_width * 2;
- 
- 	XUngrabServer (dpy);
-     }
---
-cgit v0.8.3.1-30-gff3a