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

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

4 files changed, 213 insertions, 2 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/Manifest b/x11-wm/compiz/Manifest
index e86f7e9787a7..93772f952840 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,4 +1,5 @@
 AUX compiz-gcc-4.7.patch 999 SHA256 0824c0d32d32dfc8c57fa1afbfc81060e64bdcc4ec016f3ccb751a1956f6325a SHA512 e08563d928578ad74faa29168b3c3442cc0ab4e908ff4f430a7e23bcb2057e3da10f9742e8abbdaad9df6f56a039134e8a32f73ae214e240065d6d4ddd3a92bf WHIRLPOOL b79f08787a9f7d3dc46dc1f2c6645f40965c750122027e39679d783afb0c23bd300ee731bfb45858d6392c69a21b61eb326eb29315e0e4ac0d2655edb7d69f18
+AUX compiz-kde-4.10.patch 956 SHA256 b76acc7d3195f931aa11d7f8ea301a3c1cac738d383195b5355ae2bc155a77f2 SHA512 6ed694c33f5f12e3c29b75338b7c1610bf7f2925e6c464e35489244e8be1673d7df194ac6018f536276f29353c2dad3ec80f392bd47f40744bb0af517043bcf2 WHIRLPOOL 7d2d5709e00edb6cda6b6527acd4df360c3ac7f286302edf1880e243d711b114b6768c582dcd25f56bab6846cb470530d5ecdf139557d23bfd4d541c94d98976
 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
@@ -6,5 +7,6 @@ AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772
 AUX compiz.desktop 258 SHA256 6b3e76f62623ef4d533d25fb714467157827a4ba051d41e1730848266c573f8b SHA512 ab9084fe8d44a9a053e84483774d9db2b1b8def4fbb16ca9c74af18271ec0f7d3d7dbe607fa7e0687bbe6f6d9ef8ee17701e1a88c15adea822f45450f4ebb291 WHIRLPOOL b11117ece42467e06313a73f666c1e1ea2877313d5df1c9f3735a386da453f9d10bc83d4832ea491ac099aa94b1d757d2e8d1a733b9e22df56ce63c8cc48f02e
 DIST compiz-0.8.8.tar.bz2 1123892 SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3 SHA512 6e3bad018835fdbc1b0e5ecb51a46a77a6531d46d77ee3ae4169273632ea9a6839c78300b18e2198c41698517efa65ded75387785b0c5bbbb6da41498451b644 WHIRLPOOL fa1d9b5e443d45a4615201a85a74dd025066620339ebac58b4fd5c71c19db731009c013ceee93f0345b46c413211424bc4c813d48e07d6cea874024a2b562ba2
 EBUILD compiz-0.8.8-r1.ebuild 4093 SHA256 a1620d11f4003d4553be8626d3a028ee7e11178603d910d0155394576f6e2b30 SHA512 d226e93349ee15c969dc73c4c6e2c0a7a0737ec7f81fcaa9e0cdc3571f49325a8fc228890f689bb16abaadc3df375f9d35322cb3b65c05067d7e4df5144fe8fb WHIRLPOOL 479b6b0af5feef0b68c822632d7650223b8471f86fbb351920d70bd5ecce7bc06ec8494bd3eea3703f6ee8d7011957c724ad6b411736bdd14a356a81f605142f
-MISC ChangeLog 15002 SHA256 2d4464ff33f167c809efe9684f1b9f80f1dd807300ed54318fd0430dd1210489 SHA512 10000a0a03ea8e767187104d70abcc2b2ea06ce9f8ce6dc6b27a3383e2d8aa3086c0b4714b54b0f74ff24e7cb623ffdb072d6ef75b802038e655d631c6d8c4ac WHIRLPOOL 4334fe5872bff4199a94fa6695b2ec7456ea65947a5c3a979526d03f83d75df0fbd0bf4d854292561b7d61f457652b654829944fe0eb227118a5f0cb9aa5fc21
+EBUILD compiz-0.8.8-r2.ebuild 4131 SHA256 b6085eff04bc3232c1e556fe9ccb9166359930a24aea7391fdcb43863aa0dcff SHA512 04a873484cbc9ae353f93b3662a723db4e3f8d8a0cb2518be5991f69b4c399ecbc48dbce461916511b897e9241981fc196a4404c28fdb691f5c2ac902841251d WHIRLPOOL 9bbbfd6dd41aace512092fffb6a327018337c54e24e66ab617a4405ad4598c2d3246faadeb9ac52de41ee7251b2a477bc7d1a5ff74e71120791ce49a49a25047
+MISC ChangeLog 15214 SHA256 45ec9ea76e0311607ec386acdfc3e10ac2192be3965a888bec3c05097c06772c SHA512 fd7cc8ffbfe4fd0ce0480b2b6de8fafb31ae436728e7b802f829bb01e04bf7d47e691857928c7bf5483f5e66c9034c1740a5cce55f455c604716efe9a905b286 WHIRLPOOL bb7bb37d5abd828b1804352eda88236b8805744b74eae8b36c1cb86321904d05b60c3dc59b844e13d107bb72cb0b4c316e953a213f84baa3385ceda76183effe
 MISC metadata.xml 632 SHA256 a0dce016c36d51c1fe13822ed59ba3aef9b8a22fecdb2d3f5360b824ee890bb1 SHA512 46e6acb05014ec6cb5b77b6ff5ae31adff93ded582ad7ca22e90ce16c00f6ce7009fe72e603af83d0e6d5604f177e8eb175cdac2703d715c065e5df2834740a7 WHIRLPOOL 9499ba8dba186cc869cbc34cb7c964655c870318eaa28ca0d7ddef8b473e199edeea48f90f3394ff39334af6b8924f46dae4fa1a43ff9a75d54b0358cea88a2e
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;