Revision bump: EAPI 5, add KDE 4.10 support, patch from stuff overlay

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 210 insertions, 1 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index d4cbf181a7ad..a3599afd53e5 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.78 2013/02/10 21:47:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.79 2013/02/10 21:55:07 pinkbyte Exp $
+
+*compiz-0.8.8-r2 (10 Feb 2013)
+
+  10 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +compiz-0.8.8-r2.ebuild,
+  +files/compiz-kde-4.10.patch:
+  Revision bump: EAPI 5, add KDE 4.10 support, patch from stuff overlay
 
   10 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> files/compiz.desktop:
   Remove deprecated key from desktop file
diff --git a/x11-wm/compiz/compiz-0.8.8-r2.ebuild b/x11-wm/compiz/compiz-0.8.8-r2.ebuild
new file mode 100644
index 000000000000..7778d8621de8
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.8.8-r2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.8-r2.ebuild,v 1.1 2013/02/10 21:55:07 pinkbyte Exp $
+
+EAPI=5
+
+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"
+IUSE="+cairo dbus fuse gnome gconf gtk kde +svg"
+
+COMMONDEPEND="
+	>=dev-libs/glib-2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/libpng:0
+	>=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
+	virtual/glu
+	cairo? (
+		x11-libs/cairo[X]
+	)
+	dbus? (
+		>=sys-apps/dbus-1.0
+		dev-libs/dbus-glib
+	)
+	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
+	)
+"
+
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	x11-proto/damageproto
+	x11-proto/xineramaproto
+"
+
+RDEPEND="${COMMONDEPEND}
+	x11-apps/mesa-progs
+	x11-apps/xdpyinfo
+	x11-apps/xset
+	x11-apps/xvinfo
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	echo gtk/gnome/compiz-wm.desktop.in >> po/POTFILES.skip
+	echo metadata/core.xml.in >> po/POTFILES.skip
+
+	# Patch for compatibility with gcc 4.7
+	epatch "${FILESDIR}"/${PN}-gcc-4.7.patch
+
+	if ! use gnome || ! use gconf; then
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+	fi
+	if use kde; then
+		# patch for KDE 4.8 compatibility. Picked up from stuff overlay
+		has_version ">=kde-base/kwin-4.8" && epatch "${FILESDIR}"/${PN}-kde-4.8.patch
+		# patch for KDE 4.9 compatibility. Picked up from http://cgit.compiz.org
+		has_version ">=kde-base/kwin-4.9" && epatch "${FILESDIR}"/${PN}-kde-4.9.patch
+		# patch for KDE 4.10 compatibility. Picked up from stuff overlay
+		has_version ">=kde-base/kwin-4.10" && epatch "${FILESDIR}"/${PN}-kde-4.10.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 \
+		--enable-fast-install \
+		--disable-static \
+		--disable-gnome-keybindings \
+		--with-default-plugins \
+		$(use_enable svg librsvg) \
+		$(use_enable cairo annotate) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-glib) \
+		$(use_enable fuse) \
+		$(use_enable gnome) \
+		$(use_enable gnome metacity) \
+		$(use_enable gtk) \
+		$(use_enable kde kde4) \
+		--disable-kde \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+
+	# Install compiz-manager
+	dobin "${FILESDIR}"/compiz-manager
+
+	# Add the full-path to lspci
+	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die
+
+	# Fix the hardcoded lib paths
+	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die
+
+	# 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/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
+
+	domenu "${FILESDIR}"/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-kde-4.10.patch b/x11-wm/compiz/files/compiz-kde-4.10.patch
new file mode 100644
index 000000000000..a30d54b90fa4
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-kde-4.10.patch
@@ -0,0 +1,30 @@
+--- kde/window-decorator-kde4/window.cpp	2012-11-14 10:17:09 +0000
++++ kde/window-decorator-kde4/window.cpp	2012-11-23 06:43:18 +0000
+@@ -554,6 +554,15 @@
+     showWindowMenu (pos.bottomLeft ());
+ }
+ 
++void KWD::Window::showApplicationMenu (const QPoint &p)
++{
++}
++
++bool KWD::Window::menuAvailable () const
++{
++    return false;
++}
++
+ KWD::Options::MouseCommand
+ KWD::Window::buttonToCommand (Qt::MouseButtons button)
+ {
+
+--- kde/window-decorator-kde4/window.h	2012-09-03 07:19:30 +0000
++++ kde/window-decorator-kde4/window.h	2012-11-23 06:43:18 +0000
+@@ -92,6 +92,8 @@
+ 	virtual void processMousePressEvent (QMouseEvent *);
+ 	virtual void showWindowMenu (const QRect &);
+ 	virtual void showWindowMenu (const QPoint &);
++	virtual void showApplicationMenu (const QPoint &);
++	virtual bool menuAvailable () const;
+ 	virtual void performWindowOperation (WindowOperation);
+ 	virtual void setMask (const QRegion &, int);
+ 	virtual bool isPreview (void) const;