[gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/files/, x11-wm/compiz/

["Sergey Popov" <pinkbyte@gentoo.org>]

commit:     33f435ce2a846492d30b37426e67654610f1c416
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 11 07:35:17 2013 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 07:36:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=33f435ce

x11-wm/compiz: add live ebuild for 0.9.9 branch

Package-Manager: portage-2.2.0_alpha149

---
 x11-wm/compiz/ChangeLog                        |    8 +-
 x11-wm/compiz/Manifest                         |    4 +-
 x11-wm/compiz/compiz-0.9.9.9999.ebuild         |  183 ++++++++++++++++++++++++
 x11-wm/compiz/files/compiz-0.9.9-sandbox.patch |   26 ++++
 4 files changed, 219 insertions(+), 2 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index be5ca14..3232211 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for x11-wm/compiz
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*compiz-0.9.9.9999 (11 Jan 2013)
+
+  11 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> +compiz-0.9.9.9999.ebuild,
+  +files/compiz-0.9.9-sandbox.patch:
+  Initial live ebuild for 0.9.9 branch
+
 *compiz-0.9.8.6 (31 Dec 2012)
 
   31 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> +compiz-0.9.8.6.ebuild:

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index a9a307f..84ab1fb 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,9 +1,11 @@
 AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b9668850ca8eca6c30b8be0460a138 SHA512 5b637165e8739e7e60314ee84db02da6d9f9834cfe28b6c0f97482204f19dcca678a3ea38be80d57ad2d42fcce38f32e9f8a3919c22f9c45cb6dc47cd69a382b WHIRLPOOL 229b0728affccaf83aaa99beaecd74cacd757c316126201f29f59b2f49cea8eb4d17c8dc20f4f217ec7505e4f02a201f7f91ebdb7739db1ddd0c8ab822410c4e
+AUX compiz-0.9.9-sandbox.patch 1453 SHA256 53fad440db22fab263919bf67a6356135fa7554a22411859da822c5e60c4c97a SHA512 98d7931c424bed699e16cb215859ca5546287ae9d9f15bfee2b338d6ca0fcee91fb0ae65cb115d08d641b5aa9e10be088ed8daa5d7a05f2a89cfc286255fdcd7 WHIRLPOOL a8f37408b57c5e5db0bd87fe40f46af3827c798c1f995efb7abcdd68b38ba6f20bf86a1278322d575c6f15609fe136085b80a607f70d8cc6e5c80704c3635eba
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
 DIST compiz-0.9.8.6.tar.bz2 4337444 SHA256 66dabe751a414ffed9a7dcb33f2c456198456be479fcadc78433731a822eff29 SHA512 f1aa7b2d3ece2622670c04036f8e5a9703c7cb241c96b68ecb4ae8aafcc06b7228484553f474cd496239858599e20e28f90d7358428ad876beda7f62e244a9fa WHIRLPOOL cb304b43d3ff4afbec463967006b0fa97c80ea95d577b6ffe210b1f4ac0f154543c3d88c21c7e9eac2c40cf4f072cc76bdf5404b8d2f3eb1e0d86e046f4c79b0
 EBUILD compiz-0.9.8.2.ebuild 4166 SHA256 23577874dc5cd113a2d1389b2a1b0077a4bf2600b384bcf5220c1f9844034490 SHA512 ff15426d78d0568a7c45e5901f66bc0fc35f1d581aab9484a692b0f03d5a43f350aabd6172ba11ff2157b57ffed48b2de3309d69b0266073f04e1c9b60e58126 WHIRLPOOL 2be035ec5697f68768eb4385617024fb422e15b1017058f5322c9d783e117a331c296e55173eaefd7a8fc5585bebe78361c1400d5f7b5df29c6c4add30f2b5f5
 EBUILD compiz-0.9.8.6.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f
 EBUILD compiz-0.9.8.9999.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f
-MISC ChangeLog 14314 SHA256 720d08127a1b04f706c3edf45a799dd19f295bd6a229de72027e0bd452456705 SHA512 f8aa49ecdb766ae26b05728d9713d48e169b92b59ebaf3aec5c399aa871bf24724657027297272cb05c1a32b3808d1fa2ab58b1b7dda3a274aaf86e48220c1a8 WHIRLPOOL c201f9173207a06d44ad1ad5655302f9aba0b5d87021f70be320bd2f03b5694b5865947fe9e5b179794f2409d682ff435da9d2f1757142ab1bf6bf314118c00f
+EBUILD compiz-0.9.9.9999.ebuild 4532 SHA256 7b1ec838aa684259d15f8b89613098c04122398a23291351e4df15cef94581f5 SHA512 70e1e16df311e7a5dc6570ba335ff02b489a3ae5c4cbf95eb2da52bf83fa948376912c3074a8d9e092d856b1c8cdfcb5a4d89e9906d6b3a38944314d47b02fa1 WHIRLPOOL 57c196169916ec5cf48bec06edbf410350eaf9af9be0ceb98902fbca2363247221a3c28fe95168a4987b34954a52c8736142bb9e31140376f7595f45bbbf9dbc
+MISC ChangeLog 14502 SHA256 031d643157064c131217058306a920b8d4148b1e7507830e5691ac2d7d225f5d SHA512 501910e4142b3749aa95fd3591d830faf8cbe3e68842bb6f9e2c099f43c8efeb3ff03b32cbc3a01ad0ab6a6cfe8b3c35f351429e873d20aca30b9190869021e6 WHIRLPOOL 41a2485887fe0d0e9cd47b207d267720b9e96a93164414b2cb0bac1856d529f75c8508a485832c76e0bd35a97976a06500b128a2a5429ec78537420361e2ac32
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.9.9999.ebuild b/x11-wm/compiz/compiz-0.9.9.9999.ebuild
new file mode 100644
index 0000000..4ce5edd
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.9.9.9999.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit versionator
+
+MINOR_VERSION=$(get_version_component_range 4)
+MAJOR_BRANCH=$(get_version_component_range 1-3)
+
+if [[ ${MINOR_VERSION} == 9999 ]]; then
+	EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MAJOR_BRANCH}"
+	inherit bzr
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://launchpad.net/${PN}/${MAJOR_BRANCH}/${PV}/+download/${P}.tar.bz2"
+fi
+
+inherit eutils cmake-utils gnome2-utils toolchain-funcs
+
+DESCRIPTION="OpenGL compositing window manager."
+HOMEPAGE="https://launchpad.net/compiz"
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0.9"
+IUSE="+cairo debug dbus fuse gnome gtk kde +svg test"
+
+COMMONDEPEND="
+	!x11-wm/compiz-fusion
+	!x11-libs/compiz-bcop
+	!x11-libs/libcompizconfig
+	!x11-libs/compizconfig-backend-gconf
+	!x11-libs/compizconfig-backend-kconfig4
+	!x11-plugins/compiz-plugins-main
+	!x11-plugins/compiz-plugins-extra
+	!x11-plugins/compiz-plugins-unsupported
+	!x11-apps/ccsm
+	!dev-python/compizconfig-python
+	!x11-apps/fusion-icon
+	dev-libs/boost
+	dev-libs/glib:2
+	dev-cpp/glibmm
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-python/pyrex
+	dev-libs/protobuf
+	media-libs/libpng
+	x11-base/xorg-server
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXinerama
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/startup-notification
+	virtual/opengl
+	virtual/glu
+	cairo? ( x11-libs/cairo[X] )
+	fuse? ( sys-fs/fuse )
+	gtk? (
+		>=x11-libs/gtk+-2.18.0
+		>=x11-libs/libwnck-2.19.4
+		x11-libs/pango
+		gnome? (
+			gnome-base/gnome-desktop
+			gnome-base/gconf
+			x11-wm/metacity
+		)
+	)
+	kde? ( kde-base/kwin:4 )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	dbus? ( sys-apps/dbus )"
+
+DEPEND="${COMMONDEPEND}
+	app-admin/chrpath
+	virtual/pkgconfig
+	x11-proto/damageproto
+	x11-proto/xineramaproto
+	test? (
+		dev-cpp/gtest
+		dev-cpp/gmock
+	)"
+
+RDEPEND="${COMMONDEPEND}
+	dev-python/pygtk
+	x11-apps/mesa-progs
+	x11-apps/xvinfo
+	x11-themes/hicolor-icon-theme"
+
+# TODO:
+# - Remove automagic dependency for coverage report generation tools
+# - Fix Xig-0 automagic resolving('CMake Warning at tests/integration/xig/CMakeLists.txt:30 (message): Xig not found, you will not be able to run X Server integration tests')
+# - Check proper compilation with missing gettext/intltool
+# - CFLAGS are NOT respected, this needs to be fixed
+# - Default decorator exec command in ccsm is bad
+# - Check all dependencies once more
+# - Check CMakeFiles.txt this subdirectories :
+# cmake - ?
+# src
+# compizconfig
+# plugins
+# tests - ?
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+			&& die "Sorry, but gcc 4.6 or higher is required."
+	fi
+}
+
+src_unpack() {
+	if [[ ${MINOR_VERSION} == 9999 ]]; then
+		bzr_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.9.9-sandbox.patch"
+
+	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
+	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+
+	# Fix wrong path for icons
+	sed -i 's:DataDir = "@prefix@/share":DataDir = "/usr/share":' compizconfig/ccsm/ccm/Constants.py.in
+
+	base_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use_use gnome GCONF)"
+		"$(cmake-utils_use_use gnome GNOME)"
+		"$(cmake-utils_use_use gnome GSETTINGS)"
+		"$(cmake-utils_use_use gtk GTK)"
+		"$(cmake-utils_use_use kde KDE4)"
+		"$(cmake-utils_use test COMPIZ_BUILD_TESTING)"
+		"-DCMAKE_INSTALL_PREFIX=/usr"
+		"-DCMAKE_C_FLAGS=$(usex debug '-DDEBUG -ggdb' '')"
+		"-DCMAKE_CXX_FLAGS=$(usex debug '-DDEBUG -ggdb' '')"
+		"-DCOMPIZ_DEFAULT_PLUGINS=ccp"
+		"-DCOMPIZ_DISABLE_SCHEMAS_INSTALL=ON"
+		"-DCOMPIZ_PACKAGING_ENABLED=ON"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd "${CMAKE_BUILD_DIR}"
+	# Fix paths to avoid sandbox access violation
+	# 'emake DESTDIR=${D} install' does not work with compiz cmake files!
+	for i in `find . -type f -name "cmake_install.cmake"`;do
+		sed -e "s|/usr|${D}/usr|g" -i "${i}"  || die "sed failed"
+	done
+	emake install
+	popd
+}
+
+pkg_preinst() {
+	use gnome && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+	if use dbus; then
+		ewarn "The dbus plugin is known to crash compiz in this version. Disable"
+		ewarn "it if you experience crashes when plugins are enabled/disabled."
+	fi
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}

diff --git a/x11-wm/compiz/files/compiz-0.9.9-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.9-sandbox.patch
new file mode 100644
index 0000000..60709be
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.9-sandbox.patch
@@ -0,0 +1,26 @@
+--- cmake/base.cmake.orig	2013-01-11 11:03:33.030754571 +0400
++++ cmake/base.cmake	2013-01-11 11:06:14.695764652 +0400
+@@ -53,11 +53,11 @@
+ 	     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCompiz.cmake
+ 	     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindOpenGLES2.cmake
+ 	     DESTINATION
+-	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
++	     ${D}/${CMAKE_INSTALL_PREFIX}/share/cmake/)
+     add_custom_target (findcompiz_install
+ 	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
+-	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules &&
+-	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
++	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${D}/${CMAKE_ROOT}/Modules &&
++	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${D}/${CMAKE_ROOT}/Modules
+     )
+     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
+     if (NOT _find_compizconfig)
+@@ -70,7 +70,7 @@
+     install (FILES
+ 	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake
+ 	     DESTINATION
+-	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
++	     ${D}/${CMAKE_INSTALL_PREFIX}/share/cmake/)
+     add_custom_target (
+ 	findcompizconfig_install
+ 	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&