public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-04  8:25 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-04  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     5428143fbe545ef1c9c2cbd73cbab01c8af15a59
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 08:17:29 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 08:17:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=5428143f

Add missing sandbox patch for compiz 0.9.8

(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |    4 ++
 x11-wm/compiz/Manifest                             |    3 +-
 .../compiz/files/compiz-0.9.8_rc3275-sandbox.patch |   42 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 626aedc..c9625cd 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org>
+  +files/compiz-0.9.8_rc3275-sandbox.patch:
+  Add missing sandbox patch for compiz 0.9.8
+
   04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3275.ebuild:
   Fix QA issues about whitespaces and replace dev-util/pkgconfig to
   virtual/pkgconfig in compiz 0.9.8 ebuild

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 08d265e..5295bb0 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,4 @@
+AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a
 AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6
@@ -6,5 +7,5 @@ DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
 EBUILD compiz-0.9.8_rc3275.ebuild 3174 SHA256 34da3540dc8a701f9a07b3b8e4e38265f63ea96c374285cb9186bcd61159a64e SHA512 0e11da0cf0440999a423a71e5369180a52bfd8fb10c24e1d4b72a5dd0c4e41a20a15c2ca28e0e875cc4ac028c0779230b7de5603002a587d146359f97aad2893 WHIRLPOOL cccf91a67f4eeac16a5327fdaee4ed91da4a78b888c2ddaa42ac88007d207b7d7cf26bd2441e3688308d1d5bdf0ec5d41bab3b500670c21957e99b9303f2f230
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 13440 SHA256 282646d4d613db79af811dfa44ce8a9b3e0176e66d5c8225362b7157614fbbda SHA512 0208bfad901aa35df42f2a5ec58340fd83e4711212b5b3f22b2a64cab7f0c595254e0c802c6ab19bbb79e4868e82efe70d01529fd38c851628a97fee4ef07190 WHIRLPOOL 7d9176f7d71760fd271f091391fb565f8978f07d41d208fead29c59c4e03b94a23694add76dabca9b9954aa116927902ac9ad7bc6f7e0df028be25cde09d1640
+MISC ChangeLog 13580 SHA256 22645880b4cd259f75835c1f29041c76c32519d7401e632335ccd4c2af47445a SHA512 7dfeaffd4d5ac93c58a390b762504a3b5ab02998826f56b6600e73e0c5f3c7a3e52e669ff095872024a430b35d810ca064a3b6404ab9fe2c492067cd7e5d894a WHIRLPOOL 54c0651e72de6cf748749306b2690ae8021cdf1c5ad422157320448dbe643cb8aa4088fa8198305ebec4574cb301f92c624694c696b9bbe0b88bfca9baba1cf3
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3275-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3275-sandbox.patch
new file mode 100644
index 0000000..55bde3e
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3275-sandbox.patch
@@ -0,0 +1,42 @@
+diff -urN a/cmake/base.cmake b/cmake/base.cmake
+--- a/cmake/base.cmake	2012-06-29 02:33:47.076801000 -0500
++++ b/cmake/base.cmake	2012-06-29 22:47:06.868740002 -0500
+@@ -53,8 +53,8 @@
+ 	     DESTINATION
+ 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
+     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 make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
+     )
+     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
+     if (NOT _find_compizconfig)
+@@ -70,8 +70,8 @@
+ 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
+     add_custom_target (
+ 	findcompizconfig_install
+-	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
+-	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
++	${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
+     )
+ endfunction ()
+ 
+diff -urN a/compizconfig/libcompizconfig/config/CMakeLists.txt b/compizconfig/libcompizconfig/config/CMakeLists.txt
+--- a/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 02:33:51.195800999 -0500
++++ b/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 22:48:56.602740000 -0500
+@@ -1,10 +1,10 @@
+ set (_config_file
+      config)
+ 
+-compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
++compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
+ 
+ add_custom_target (
+     config_install
+-    ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
+-    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
++    ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
+     )


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-04  8:25 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-04  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     c4687e246867c9b471b66fa6a52169d9998d6ef4
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 08:24:35 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 08:24:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=c4687e24

Add patch to remove coverage automagic support

(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |    4 ++
 x11-wm/compiz/Manifest                             |    5 +-
 x11-wm/compiz/compiz-0.9.8_rc3275.ebuild           |    2 +
 ...mpiz-0.9.8_rc3275-remove-coverage-support.patch |   43 ++++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index c9625cd..149d013 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3275.ebuild,
+  +files/compiz-0.9.8_rc3275-remove-coverage-support.patch:
+  Add patch to remove coverage automagic support
+
   04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org>
   +files/compiz-0.9.8_rc3275-sandbox.patch:
   Add missing sandbox patch for compiz 0.9.8

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 5295bb0..cd46c76 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,4 @@
+AUX compiz-0.9.8_rc3275-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4
 AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a
@@ -5,7 +6,7 @@ AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772
 AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb SHA512 60189c33d9190934195dace88a88571e79af2be06be0df9db96f7f332798cb8b3d7c0e4bacacb3413ea381c9418415932ae895e75547568eb38d12e3800cf427 WHIRLPOOL c8f068a5e254e74285ced96236a98cd4b5724c630342a19df1defb19f14755e83ce5e6d86688066dbbeee43e8c1d89640756d9427af996fa261f31630c6893af
 DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
-EBUILD compiz-0.9.8_rc3275.ebuild 3174 SHA256 34da3540dc8a701f9a07b3b8e4e38265f63ea96c374285cb9186bcd61159a64e SHA512 0e11da0cf0440999a423a71e5369180a52bfd8fb10c24e1d4b72a5dd0c4e41a20a15c2ca28e0e875cc4ac028c0779230b7de5603002a587d146359f97aad2893 WHIRLPOOL cccf91a67f4eeac16a5327fdaee4ed91da4a78b888c2ddaa42ac88007d207b7d7cf26bd2441e3688308d1d5bdf0ec5d41bab3b500670c21957e99b9303f2f230
+EBUILD compiz-0.9.8_rc3275.ebuild 3247 SHA256 818e9c55171606662ceeba6206e6ce4cfe2727af120ce3ce09caa4be4a1ef7d9 SHA512 7262dc5c98b1cdebadfd38b28586235a7046ea6e77ede293b8d864f0c3e9ccb20a248508362dca70a425baed1236415af822d9ee4d701e906c82636bd329a0d8 WHIRLPOOL 7412300c23c23901a5dd14fad9307b2ed0238dd659c0710c8726afb944398c80d1edf74774325ab934a25b92ec138f91041a02fee9e6615efcdf6479d412688e
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 13580 SHA256 22645880b4cd259f75835c1f29041c76c32519d7401e632335ccd4c2af47445a SHA512 7dfeaffd4d5ac93c58a390b762504a3b5ab02998826f56b6600e73e0c5f3c7a3e52e669ff095872024a430b35d810ca064a3b6404ab9fe2c492067cd7e5d894a WHIRLPOOL 54c0651e72de6cf748749306b2690ae8021cdf1c5ad422157320448dbe643cb8aa4088fa8198305ebec4574cb301f92c624694c696b9bbe0b88bfca9baba1cf3
+MISC ChangeLog 13768 SHA256 744faeeec4004e7f32f7732b66d7290f1b101176711c34dd55df95c66803ea50 SHA512 36e9ee8de258c247d15f21350c66a65a9f677f0ed5d1603c7ad9b169ba06c2bb843ff406c0f81fd248cec1ddd50c1bd141a320426433496458f24ebf04aea6af WHIRLPOOL 7ebc745bc8f0ac2eb4de8c23e89eb79931484b4482de1b46f5e59f9e5261b99974ad474d65b7598a3a5e9c6257100a8ca41917ee65232ee0ef9bd0088b32d6df
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
index 003f138..4c53130 100644
--- a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
@@ -34,6 +34,7 @@ COMMONDEPEND="
 	!x11-apps/fusion-icon
 	>=dev-libs/boost-1.34.0
 	>=dev-libs/glib-2.30.0
+	dev-cpp/glibmm
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-python/pyrex
@@ -96,6 +97,7 @@ src_prepare() {
 	bzr_src_prepare
 
 	epatch "${FILESDIR}/${P}-sandbox.patch"
+	epatch "${FILESDIR}"/${P}-remove-coverage-support.patch
 
 	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
 	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch
new file mode 100644
index 0000000..9859ad3
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch
@@ -0,0 +1,43 @@
+--- CMakeLists.txt.orig	2012-09-04 12:12:58.603375058 +0400
++++ CMakeLists.txt	2012-09-04 12:13:12.550374932 +0400
+@@ -21,24 +21,6 @@
+ 
+ enable_testing()
+ 
+-# Import macro for doing coverage reporting
+-include(EnableCoverageReport)
+-
+-#####################################################################
+-# Enable code coverage calculation with gcov/gcovr/lcov
+-# Usage:
+-#  * Switch build type to coverage (use ccmake or cmake-gui)
+-#  * Invoke make, make test, make coverage
+-#  * Find html report in subdir coveragereport
+-#  * Find xml report feasible for jenkins in coverage.xml
+-#####################################################################
+-IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
+-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
+-  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+-ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+-
+ #set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRe" CACHE INTERNAL "" FORCE)
+ #if (NOT CMAKE_BUILD_TYPE)
+ #    set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE)
+@@ -196,7 +178,3 @@
+ 
+ _check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG})
+ 
+-# Enable coverage reporting for compiz
+-enable_coverage_report()
+-
+-
+--- src/CMakeLists.txt.orig	2012-09-04 12:22:06.860370828 +0400
++++ src/CMakeLists.txt	2012-09-04 12:22:12.375370782 +0400
+@@ -193,5 +193,3 @@
+     TARGETS compiz
+     RUNTIME DESTINATION ${exec_prefix}
+ )
+-
+-enable_coverage_report( TARGETS compiz )


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-04 12:01 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-04 12:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c46d19810c770e9cec615b8aaa2f069f0b2c5668
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 11:16:35 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 11:16:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=c46d1981

Add patch for optional building of gconf/gsettings backends for compiz 0.9.8

(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |    4 ++++
 x11-wm/compiz/Manifest                             |    5 +++--
 x11-wm/compiz/compiz-0.9.8_rc3275.ebuild           |    1 +
 ...rc3275-conditional-gnome-backend-building.patch |   13 +++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 6c31828..0104287 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3275.ebuild,
+  +files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch:
+  Add patch for optional building of gconf/gsettings backends for compiz 0.9.8
+
   04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3275.ebuild:
   ccsm in compiz 0.9.8 needs dev-python/pygtk to run
 

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 7ff845d..a0c1d85 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,4 @@
+AUX compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
 AUX compiz-0.9.8_rc3275-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4
 AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
@@ -6,7 +7,7 @@ AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772
 AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb SHA512 60189c33d9190934195dace88a88571e79af2be06be0df9db96f7f332798cb8b3d7c0e4bacacb3413ea381c9418415932ae895e75547568eb38d12e3800cf427 WHIRLPOOL c8f068a5e254e74285ced96236a98cd4b5724c630342a19df1defb19f14755e83ce5e6d86688066dbbeee43e8c1d89640756d9427af996fa261f31630c6893af
 DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
-EBUILD compiz-0.9.8_rc3275.ebuild 3320 SHA256 0c238b8968773968a3c8c3ce1988fd1d73a8601e43d42ba73980859af1aa645a SHA512 42440f9614263caa429db9c175386a3279426cb260c2c3c4754621ce46c4c49d6f10ca51b8788343489a0f42752605fa662c5f683c588c5e683d31058db934f0 WHIRLPOOL e68e664b3f1d423b8cc3cb131b26c9f0a2cc2b95540fbca12035bf4994104e688f0d2f4d611e17cbf10f1fd77b19e757a4d1de50133f7165c250335403bd47d2
+EBUILD compiz-0.9.8_rc3275.ebuild 3388 SHA256 ad90f16e6d7e51114b0287089e6baccddd2caf7609bb5e409014f12d369fd393 SHA512 ad08592af0a73f0d8626fd3e1958f51d2782e3fe116483a00d5c774f70d5383eee01b055888e9d9f1436040f2cb9c86a8eb24692b617b4032dd6eddd798f5abd WHIRLPOOL 755b0e6fb57a7cccdf1567525265b9ecd8a1c5549d5aa066094f60e1db7b554c520bd3aaf0024da04dab56a57ae56f5e1b153e3056c286a25e889fcc1543d32d
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 14334 SHA256 f2b78e975e0e9f0151873912cc35bf71fd00c2e4c78432c5b2ca53f98f7496e0 SHA512 8f7321dd939c78cec537af846a3c4a302872cf25bcfc5108826386e4b39b110904ff4dd2b3ad6d36131d17c8af96b3d8d223cc8fdf09285d8d0b62eda10ce18f WHIRLPOOL 3694ec9fddda5a7d04085958dbaa1c9d71eca039d740ba5ca8181b9933e38f9d7c4a3f06389d5a8c32551e2d114077e0375e64f30ae6e593d278f658fd74c951
+MISC ChangeLog 14563 SHA256 472ad54acfc57bb725e9edb24f3c726d809e906731129d84f84ed204d1c2bd51 SHA512 bc15cdabbb3e2770446b773bbbe85ba007d76e18e1ac81f534347f4614f3327d0cfd8092d0d5455aa5a4abb8b016f8caf2e8f45d7e08502d53f61112b4766aa2 WHIRLPOOL a3218014f6fb9df3b6350605927221b882f48796e4d45643cc880c62d363b1908ceea92537a7f8aebfb8cf986a2461a6ce84beb92e8e07e73cfe5c0735e47798
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
index ddad0ea..7f1895d 100644
--- a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
@@ -99,6 +99,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-sandbox.patch"
 	epatch "${FILESDIR}"/${P}-remove-coverage-support.patch
+	epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch
 
 	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
 	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch
new file mode 100644
index 0000000..a2c5925
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch
@@ -0,0 +1,13 @@
+--- compizconfig/CMakeLists.txt.orig	2012-09-04 14:56:20.082299507 +0400
++++ compizconfig/CMakeLists.txt	2012-09-04 14:56:31.109299403 +0400
+@@ -7,8 +7,10 @@
+ add_subdirectory (libcompizconfig)
+ add_subdirectory (compizconfig-python)
+ add_subdirectory (ccsm)
++if (USE_GNOME)
+ add_subdirectory (gconf)
+ add_subdirectory (gsettings)
++endif (USE_GNOME)
+ 
+ add_custom_target (pyclean)
+ 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-04 12:21 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-04 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     825113e12e61e07e6b04c0249a0599d1ba8acdf7
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 12:22:43 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 12:22:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=825113e1

Bump new snapshot of compiz 0.9.8

(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |    8 +
 x11-wm/compiz/Manifest                             |    6 +-
 x11-wm/compiz/compiz-0.9.8_rc3282.ebuild           |  152 ++++++++++++++++++++
 ...rc3282-conditional-gnome-backend-building.patch |   13 ++
 ...mpiz-0.9.8_rc3282-remove-coverage-support.patch |   43 ++++++
 .../compiz/files/compiz-0.9.8_rc3282-sandbox.patch |   42 ++++++
 6 files changed, 263 insertions(+), 1 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 0104287..2bae528 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*compiz-0.9.8_rc3282 (04 Sep 2012)
+
+  04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> +compiz-0.9.8_rc3282.ebuild,
+  +files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch,
+  +files/compiz-0.9.8_rc3282-remove-coverage-support.patch,
+  +files/compiz-0.9.8_rc3282-sandbox.patch:
+  Bump new snapshot of compiz 0.9.8
+
   04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3275.ebuild,
   +files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch:
   Add patch for optional building of gconf/gsettings backends for compiz 0.9.8

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index a0c1d85..92a342d 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,6 +1,9 @@
 AUX compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
 AUX compiz-0.9.8_rc3275-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4
 AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
+AUX compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
+AUX compiz-0.9.8_rc3282-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4
+AUX compiz-0.9.8_rc3282-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a
 AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6
@@ -8,6 +11,7 @@ AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf710
 DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
 EBUILD compiz-0.9.8_rc3275.ebuild 3388 SHA256 ad90f16e6d7e51114b0287089e6baccddd2caf7609bb5e409014f12d369fd393 SHA512 ad08592af0a73f0d8626fd3e1958f51d2782e3fe116483a00d5c774f70d5383eee01b055888e9d9f1436040f2cb9c86a8eb24692b617b4032dd6eddd798f5abd WHIRLPOOL 755b0e6fb57a7cccdf1567525265b9ecd8a1c5549d5aa066094f60e1db7b554c520bd3aaf0024da04dab56a57ae56f5e1b153e3056c286a25e889fcc1543d32d
+EBUILD compiz-0.9.8_rc3282.ebuild 3388 SHA256 ad90f16e6d7e51114b0287089e6baccddd2caf7609bb5e409014f12d369fd393 SHA512 ad08592af0a73f0d8626fd3e1958f51d2782e3fe116483a00d5c774f70d5383eee01b055888e9d9f1436040f2cb9c86a8eb24692b617b4032dd6eddd798f5abd WHIRLPOOL 755b0e6fb57a7cccdf1567525265b9ecd8a1c5549d5aa066094f60e1db7b554c520bd3aaf0024da04dab56a57ae56f5e1b153e3056c286a25e889fcc1543d32d
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 14563 SHA256 472ad54acfc57bb725e9edb24f3c726d809e906731129d84f84ed204d1c2bd51 SHA512 bc15cdabbb3e2770446b773bbbe85ba007d76e18e1ac81f534347f4614f3327d0cfd8092d0d5455aa5a4abb8b016f8caf2e8f45d7e08502d53f61112b4766aa2 WHIRLPOOL a3218014f6fb9df3b6350605927221b882f48796e4d45643cc880c62d363b1908ceea92537a7f8aebfb8cf986a2461a6ce84beb92e8e07e73cfe5c0735e47798
+MISC ChangeLog 14890 SHA256 4b769a66e0ee5c95b798d38ef31560584cb7ca0a5df8fa571560ed85a09d5242 SHA512 4fdc5c06c9072faf1e5d3faa37d9f986e9ae0488fdc733a4923eff48602671baad6e63a46c77a13c0ecb7504e7830687935ca434800fb58e28fa66e0a93a1616 WHIRLPOOL d5cce2b462cb262f39aacd424abd6fd71e88b0c10bb5975955a0f42bd513186da3b696af931141d322508be049813b29192b0ff3180b1648799230aad356713c
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild
new file mode 100644
index 0000000..7f1895d
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+MY_PV="${PV%_*}"
+
+SRC_URI=""
+EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MY_PV}"
+EBZR_REVISION="${PV#*_rc}"
+
+inherit eutils bzr cmake-utils gnome2-utils flag-o-matic
+
+DESCRIPTION="OpenGL compositing window manager."
+HOMEPAGE="https://launchpad.net/compiz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0.9.8"
+KEYWORDS="~amd64 ~x86"
+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-1.34.0
+	>=dev-libs/glib-2.30.0
+	dev-cpp/glibmm
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-python/pyrex
+	dev-libs/protobuf
+	media-libs/libpng
+	>=media-libs/mesa-6.5.1-r1
+	>=x11-base/xorg-server-1.1.1-r1
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXrandr
+	>=x11-libs/libXrender-0.9.3
+	x11-libs/libXinerama
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/startup-notification-0.7
+	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-2.23.2
+		)
+	)
+	kde? (
+		>=kde-base/kwin-4.3.0:4
+	)
+	svg? (
+		>=gnome-base/librsvg-2.14.0:2
+		>=x11-libs/cairo-1.0
+	)
+	dbus? ( >=sys-apps/dbus-1.0 )"
+
+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"
+
+src_unpack() {
+	bzr_src_unpack
+}
+
+src_prepare() {
+	bzr_src_prepare
+
+	epatch "${FILESDIR}/${P}-sandbox.patch"
+	epatch "${FILESDIR}"/${P}-remove-coverage-support.patch
+	epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch
+
+	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
+	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use_use gnome GCONF)"
+		"$(cmake-utils_use_use gnome GNOME)"
+		"$(cmake-utils_use_use gtk GTK)"
+		"$(cmake-utils_use_use kde KDE4)"
+		"${cmake-utils_use test COMPIZ_BUILD_TESTING}"
+		"-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"
+		"-DCOMPIZ_DESTDIR=${D}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	pushd ${CMAKE_BUILD_DIR}
+	dodir /usr/share/cmake/Modules
+	emake DESTDIR="${D}" findcompiz_install
+	emake DESTDIR="${D}" install
+	popd ${CMAKE_BUILD_DIR}
+	chrpath -d "${D}/usr/lib64/python2.7/site-packages/compizconfig.so"
+
+	ewarn "The dbus plugin is known to crash compiz in this version. Disable"
+	ewarn "it if you experience crashes when plugins are enabled/disabled."
+}
+
+pkg_preinst() {
+	use gnome && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch
new file mode 100644
index 0000000..a2c5925
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch
@@ -0,0 +1,13 @@
+--- compizconfig/CMakeLists.txt.orig	2012-09-04 14:56:20.082299507 +0400
++++ compizconfig/CMakeLists.txt	2012-09-04 14:56:31.109299403 +0400
+@@ -7,8 +7,10 @@
+ add_subdirectory (libcompizconfig)
+ add_subdirectory (compizconfig-python)
+ add_subdirectory (ccsm)
++if (USE_GNOME)
+ add_subdirectory (gconf)
+ add_subdirectory (gsettings)
++endif (USE_GNOME)
+ 
+ add_custom_target (pyclean)
+ 

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch
new file mode 100644
index 0000000..9859ad3
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch
@@ -0,0 +1,43 @@
+--- CMakeLists.txt.orig	2012-09-04 12:12:58.603375058 +0400
++++ CMakeLists.txt	2012-09-04 12:13:12.550374932 +0400
+@@ -21,24 +21,6 @@
+ 
+ enable_testing()
+ 
+-# Import macro for doing coverage reporting
+-include(EnableCoverageReport)
+-
+-#####################################################################
+-# Enable code coverage calculation with gcov/gcovr/lcov
+-# Usage:
+-#  * Switch build type to coverage (use ccmake or cmake-gui)
+-#  * Invoke make, make test, make coverage
+-#  * Find html report in subdir coveragereport
+-#  * Find xml report feasible for jenkins in coverage.xml
+-#####################################################################
+-IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
+-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
+-  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+-ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+-
+ #set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRe" CACHE INTERNAL "" FORCE)
+ #if (NOT CMAKE_BUILD_TYPE)
+ #    set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE)
+@@ -196,7 +178,3 @@
+ 
+ _check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG})
+ 
+-# Enable coverage reporting for compiz
+-enable_coverage_report()
+-
+-
+--- src/CMakeLists.txt.orig	2012-09-04 12:22:06.860370828 +0400
++++ src/CMakeLists.txt	2012-09-04 12:22:12.375370782 +0400
+@@ -193,5 +193,3 @@
+     TARGETS compiz
+     RUNTIME DESTINATION ${exec_prefix}
+ )
+-
+-enable_coverage_report( TARGETS compiz )

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch
new file mode 100644
index 0000000..55bde3e
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch
@@ -0,0 +1,42 @@
+diff -urN a/cmake/base.cmake b/cmake/base.cmake
+--- a/cmake/base.cmake	2012-06-29 02:33:47.076801000 -0500
++++ b/cmake/base.cmake	2012-06-29 22:47:06.868740002 -0500
+@@ -53,8 +53,8 @@
+ 	     DESTINATION
+ 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
+     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 make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
+     )
+     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
+     if (NOT _find_compizconfig)
+@@ -70,8 +70,8 @@
+ 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
+     add_custom_target (
+ 	findcompizconfig_install
+-	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
+-	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
++	${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
+     )
+ endfunction ()
+ 
+diff -urN a/compizconfig/libcompizconfig/config/CMakeLists.txt b/compizconfig/libcompizconfig/config/CMakeLists.txt
+--- a/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 02:33:51.195800999 -0500
++++ b/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 22:48:56.602740000 -0500
+@@ -1,10 +1,10 @@
+ set (_config_file
+      config)
+ 
+-compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
++compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
+ 
+ add_custom_target (
+     config_install
+-    ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
+-    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
++    ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
+     )


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-08  9:28 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-08  9:28 UTC (permalink / raw
  To: gentoo-commits

commit:     01678a73411f2032e5e0abb845159c9cdbaca78f
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  8 09:27:00 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 09:27:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=01678a73

Add ebuild for compiz 0.9.8, revision 3302

(Portage version: 2.2.0_alpha124/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |    7 +
 x11-wm/compiz/Manifest                             |    5 +-
 x11-wm/compiz/compiz-0.9.8_rc3302.ebuild           |  166 ++++++++++++++++++++
 ...rc3302-conditional-gnome-backend-building.patch |   13 ++
 .../compiz/files/compiz-0.9.8_rc3302-sandbox.patch |   42 +++++
 5 files changed, 232 insertions(+), 1 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index e0b5f69..32d0ee5 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*compiz-0.9.8_rc3302 (08 Sep 2012)
+
+  08 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> +compiz-0.9.8_rc3302.ebuild,
+  +files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch,
+  +files/compiz-0.9.8_rc3302-sandbox.patch:
+  Add ebuild for compiz 0.9.8, revision 3302
+
   04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3282.ebuild:
   Add TODO in last snapshot ebuild of compiz
 

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 3f919ae..92bf365 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -4,6 +4,8 @@ AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da
 AUX compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
 AUX compiz-0.9.8_rc3282-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4
 AUX compiz-0.9.8_rc3282-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
+AUX compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
+AUX compiz-0.9.8_rc3302-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a
 AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6
@@ -12,6 +14,7 @@ DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
 EBUILD compiz-0.9.8_rc3275.ebuild 3388 SHA256 58916fa39f53e154575faaa005e3cbf2f1d38d0402ed8cf583d788a29e27c2fa SHA512 fd2c4e6542f86c1d35818c028c5d7612e8219c040728fd36d9bbd5e37916315f1340be64048f4a968b3890ed9ca3e40bf30ebe22fe3ce2fe7be5950c92fc192b WHIRLPOOL 6cf42adf03929c5fee406c2a82836c035ad5c178661c065a157ddbd2c1e289969c9c9339f8267fceee8c31785e55764b1c1783f551460352abe25c931eea520e
 EBUILD compiz-0.9.8_rc3282.ebuild 3995 SHA256 4a71b119c25dce6a74a87c6ace0873212ac1ec21ab133948766d7713b22d54dc SHA512 383436ba772b56455f7cc806ec97b2eb289cc8cc6306051fa6cc7b0c3e138c55fa6c57f078ae784a8dd1c163644e015d9af30d2526c047f56505a5c2ca8c8e67 WHIRLPOOL 7d549fdc1be0d28264aff843dc5fc7c0ad29e379a1906aa6136fe43050f6bd237f762153274e7c4abff2de43ac443c523c43dad88e7b94bab9650bac7fb26b75
+EBUILD compiz-0.9.8_rc3302.ebuild 3974 SHA256 302417b7bb52916ef2b8e3a660d969eb9909cf342b0462155c225b7e3d08f936 SHA512 f96a105fde2e5afe6bd1575d5bf1597af78586263cea1fea8f67fb179355da291146c77117365e8f72add64e70234406360fddb56a8096fb83cf69cdb5696402 WHIRLPOOL 601aa8de439b184d0598fd3ad77c40958cd3c71608645be2c0c4053bab16c642d62b41e072b237f1a2da6f8d9e1275902d9afc951167075db9577c7cf14a8eee
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 15191 SHA256 d957c529fd7a60aea61006f81e7b94a4362a4bf05a82d13c1a15b15301f7aee9 SHA512 c3f25dc9a690f1f98ebbbdba2c185c6f37f3a781f9d9dbe22797574cefc41fb9f5d03bd14a63ccb772b4ca886cdf1a7444ab91ba7afa0c51766de2e1f3f98036 WHIRLPOOL dbda2aea9a0accd591fa2bb778aba5a39884d95fbcf7d7b35bf42ee1cd4bd4573431021a9cdca7cf8e2389b503c37dee007207376213e91feeabcd634141c80e
+MISC ChangeLog 15467 SHA256 2e8c92bfdf75442e99d82963faa999a9bb0157f545023be0c74030af7216b10a SHA512 71659f250bf34cb62916a10c0ae7639fde5546c2495ffc74387d8f5442ef1ddc50cbb6b526945d1a7fc9e862c55e7bf0397918f09ed314a2b5c7e78eee25514c WHIRLPOOL 5ce7f7fcf9d79e40ae9485788103f9ef3b345ca41484b4a008521fecf000474b397137f71d1ba18c91125822ca95c87fce4270e2be91599d34bd93cb5b2fbf15
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3302.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3302.ebuild
new file mode 100644
index 0000000..af7c262
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.9.8_rc3302.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+MY_PV="${PV%_*}"
+
+SRC_URI=""
+EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MY_PV}"
+EBZR_REVISION="${PV#*_rc}"
+
+inherit eutils bzr cmake-utils gnome2-utils flag-o-matic
+
+DESCRIPTION="OpenGL compositing window manager."
+HOMEPAGE="https://launchpad.net/compiz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0.9.8"
+KEYWORDS="~amd64 ~x86"
+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-1.34.0
+	>=dev-libs/glib-2.30.0
+	dev-cpp/glibmm
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-python/pyrex
+	dev-libs/protobuf
+	media-libs/libpng
+	>=media-libs/mesa-6.5.1-r1
+	>=x11-base/xorg-server-1.1.1-r1
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXrandr
+	>=x11-libs/libXrender-0.9.3
+	x11-libs/libXinerama
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/startup-notification-0.7
+	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-2.23.2
+		)
+	)
+	kde? (
+		>=kde-base/kwin-4.3.0:4
+	)
+	svg? (
+		>=gnome-base/librsvg-2.14.0:2
+		>=x11-libs/cairo-1.0
+	)
+	dbus? ( >=sys-apps/dbus-1.0 )"
+
+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"
+
+# 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
+# - 0.9.8.0 release does not build - need to walk through commits and find out why
+# - Check CMakeFiles.txt this subdirectories :
+# cmake - ?
+# src
+# compizconfig
+# plugins
+# tests - ?
+
+src_unpack() {
+	bzr_src_unpack
+}
+
+src_prepare() {
+	bzr_src_prepare
+
+	epatch "${FILESDIR}/${P}-sandbox.patch"
+	epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch
+
+	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
+	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+}
+
+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_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"
+		"-DCOMPIZ_DESTDIR=${D}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	pushd ${CMAKE_BUILD_DIR}
+	dodir /usr/share/cmake/Modules
+	emake DESTDIR="${D}" findcompiz_install
+	emake DESTDIR="${D}" install
+	popd ${CMAKE_BUILD_DIR}
+	chrpath -d "${D}/usr/lib64/python2.7/site-packages/compizconfig.so"
+
+	ewarn "The dbus plugin is known to crash compiz in this version. Disable"
+	ewarn "it if you experience crashes when plugins are enabled/disabled."
+}
+
+pkg_preinst() {
+	use gnome && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch
new file mode 100644
index 0000000..a2c5925
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch
@@ -0,0 +1,13 @@
+--- compizconfig/CMakeLists.txt.orig	2012-09-04 14:56:20.082299507 +0400
++++ compizconfig/CMakeLists.txt	2012-09-04 14:56:31.109299403 +0400
+@@ -7,8 +7,10 @@
+ add_subdirectory (libcompizconfig)
+ add_subdirectory (compizconfig-python)
+ add_subdirectory (ccsm)
++if (USE_GNOME)
+ add_subdirectory (gconf)
+ add_subdirectory (gsettings)
++endif (USE_GNOME)
+ 
+ add_custom_target (pyclean)
+ 

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3302-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3302-sandbox.patch
new file mode 100644
index 0000000..55bde3e
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3302-sandbox.patch
@@ -0,0 +1,42 @@
+diff -urN a/cmake/base.cmake b/cmake/base.cmake
+--- a/cmake/base.cmake	2012-06-29 02:33:47.076801000 -0500
++++ b/cmake/base.cmake	2012-06-29 22:47:06.868740002 -0500
+@@ -53,8 +53,8 @@
+ 	     DESTINATION
+ 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
+     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 make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
+     )
+     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
+     if (NOT _find_compizconfig)
+@@ -70,8 +70,8 @@
+ 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
+     add_custom_target (
+ 	findcompizconfig_install
+-	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
+-	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
++	${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
+     )
+ endfunction ()
+ 
+diff -urN a/compizconfig/libcompizconfig/config/CMakeLists.txt b/compizconfig/libcompizconfig/config/CMakeLists.txt
+--- a/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 02:33:51.195800999 -0500
++++ b/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 22:48:56.602740000 -0500
+@@ -1,10 +1,10 @@
+ set (_config_file
+      config)
+ 
+-compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
++compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
+ 
+ add_custom_target (
+     config_install
+-    ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
+-    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
++    ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
++    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
+     )


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-15  9:11 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-15  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b8bc3b60812ab76cce6ee20f16fc50486d63bfcb
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 09:09:24 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 09:09:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=b8bc3b60

Bump to new revision, drop old

Add patch that brings back inclusion of rsvg-cairo header file(otherwise compilation with USE="svg" is broken)

(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |   11 +++++++++++
 x11-wm/compiz/Manifest                             |    9 +++++----
 ....8_rc3302.ebuild => compiz-0.9.8_rc3312.ebuild} |    1 +
 ...c3312-conditional-gnome-backend-building.patch} |    0
 .../files/compiz-0.9.8_rc3312-rsvg-cairo.patch     |   12 ++++++++++++
 ...box.patch => compiz-0.9.8_rc3312-sandbox.patch} |    0
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index b5d1529..e18a247 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*compiz-0.9.8_rc3312 (15 Sep 2012)
+
+  15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.8_rc3302.ebuild,
+  +compiz-0.9.8_rc3312.ebuild,
+  -files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch,
+  -files/compiz-0.9.8_rc3302-sandbox.patch,
+  +files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch,
+  +files/compiz-0.9.8_rc3312-rsvg-cairo.patch,
+  +files/compiz-0.9.8_rc3312-sandbox.patch:
+  Bump to new revision, drop old
+
   08 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3302.ebuild:
   Add x11-themes/hicolor-icon-theme to runtime dependencies of compiz
 

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index b90e55c..78575bc 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -4,8 +4,9 @@ AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da
 AUX compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
 AUX compiz-0.9.8_rc3282-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4
 AUX compiz-0.9.8_rc3282-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
-AUX compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
-AUX compiz-0.9.8_rc3302-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
+AUX compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
+AUX compiz-0.9.8_rc3312-rsvg-cairo.patch 421 SHA256 9257e6eaa78c27d9a91d540eed7707390ca5b7f700d4762b24243ab63cfa79fa SHA512 30e01f7d77e55e5582163ca795eb1ab960beec8ea4a3dc1869d6eda15e8539e662d31d2557fa7f1a4ce5f0731e8eece0fee832a5f2c1c6a0a8237f0bbcd8fd9e WHIRLPOOL 14db5246ef9321fc99d07f6bd9945f35cec70b4a72d9d5ed2eee756b98d3e52e129a80290b43e2d5e943b562fe6b7984cb93adedd5aac1d27d7f963acf778f83
+AUX compiz-0.9.8_rc3312-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a
 AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6
@@ -14,7 +15,7 @@ DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
 EBUILD compiz-0.9.8_rc3275.ebuild 3388 SHA256 58916fa39f53e154575faaa005e3cbf2f1d38d0402ed8cf583d788a29e27c2fa SHA512 fd2c4e6542f86c1d35818c028c5d7612e8219c040728fd36d9bbd5e37916315f1340be64048f4a968b3890ed9ca3e40bf30ebe22fe3ce2fe7be5950c92fc192b WHIRLPOOL 6cf42adf03929c5fee406c2a82836c035ad5c178661c065a157ddbd2c1e289969c9c9339f8267fceee8c31785e55764b1c1783f551460352abe25c931eea520e
 EBUILD compiz-0.9.8_rc3282.ebuild 3995 SHA256 4a71b119c25dce6a74a87c6ace0873212ac1ec21ab133948766d7713b22d54dc SHA512 383436ba772b56455f7cc806ec97b2eb289cc8cc6306051fa6cc7b0c3e138c55fa6c57f078ae784a8dd1c163644e015d9af30d2526c047f56505a5c2ca8c8e67 WHIRLPOOL 7d549fdc1be0d28264aff843dc5fc7c0ad29e379a1906aa6136fe43050f6bd237f762153274e7c4abff2de43ac443c523c43dad88e7b94bab9650bac7fb26b75
-EBUILD compiz-0.9.8_rc3302.ebuild 4005 SHA256 fb9f3632c7d64d2805379dac2b2eb4a337ef0627cd313fd0abf284c123bae0d6 SHA512 4f3e70e92c495ec18f2fc97696da538080628cf7dfbdee8c0ec9af40bf3bd6e60bdaa5bf73ab2fc3ebf344cbc59f7afeff301de2bb8fbdd72a5415cb230ef972 WHIRLPOOL 0f3c9beb8e9907f8c4bc29d63c7401c7671ee7c9306b6023d68719c95ed3373ad600960dda6d942c066bd95a344b1faadfa2021c30f7039b329045572e13a1ad
+EBUILD compiz-0.9.8_rc3312.ebuild 4049 SHA256 4f70ddac1b1295ba99d4f8b31c0527528989f9181d090975024418792c4e9f6f SHA512 c60c4b4b862754944d2b2e65a4ee43ebdc36ebbdaa636b6dbfa333ee7acf0927dc72800e4a9063567e6391bf0587899a56fe74773090868b1bbaf5e1b5d5713f WHIRLPOOL e8828c28e0fa0a36d1f09ba849099e1fef2c68c495e4f3a68b51123be4273163390abf35068b0472905ce14ba40610711982cdc5a39cbbf28fa8f3624f27a1d7
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 15616 SHA256 ae9e4d109ab3e6f9ea8e20b2111087a638f6fed41b8f9807466f20d75f9da8d5 SHA512 60ad46d1c5a735c650834383299509e658981224325baa34b0dcaf8824445925cf64e6fc7fca21f4f91a8708f8fd6578cde86f58a9cafce2a5cac6f6831d8515 WHIRLPOOL fe3b7079d25cd74e28ead5abe75e09f4db521affd87bd92eeabb89990e7ef9c74401f7404c3cb44ecbfa8627145836a4211d3c7b5c1514d8b68d63dad028819b
+MISC ChangeLog 16073 SHA256 1c8bcf1f9dc335c1849e1df7a4b67ddd787dd179f1ca0f343f95ba60e99393d1 SHA512 988b1b3989b40690ab59e7c88857c4de305093b3710b30c5820d84d318f8809766d0596104eead5a15a49b7ef918a1f637da3f810154e43708b1831c52f14819 WHIRLPOOL a2f501e32ad1f94bc6a1c01e2ccedf33b4b1282afcecca2516e7f0f24dc107ddd0ac714623f8082cd8431397686c0c0ae092ea30db94c92cb0981c4ff1510510
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3302.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3312.ebuild
similarity index 98%
rename from x11-wm/compiz/compiz-0.9.8_rc3302.ebuild
rename to x11-wm/compiz/compiz-0.9.8_rc3312.ebuild
index c3d0ab0..6027908 100644
--- a/x11-wm/compiz/compiz-0.9.8_rc3302.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8_rc3312.ebuild
@@ -114,6 +114,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-sandbox.patch"
 	epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch
+	epatch "${FILESDIR}"/${P}-rsvg-cairo.patch
 
 	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
 	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch
similarity index 100%
rename from x11-wm/compiz/files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch
rename to x11-wm/compiz/files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3312-rsvg-cairo.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3312-rsvg-cairo.patch
new file mode 100644
index 0000000..ad484f5
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3312-rsvg-cairo.patch
@@ -0,0 +1,12 @@
+Revert back commit from revision 3309(http://bazaar.launchpad.net/~compiz-team/compiz/0.9.8/revision/3309)
+
+--- plugins/imgsvg/src/imgsvg.h.orig	2012-09-15 13:03:21.776447000 +0400
++++ plugins/imgsvg/src/imgsvg.h	2012-09-15 13:03:33.383185000 +0400
+@@ -35,6 +35,7 @@
+ 
+ #include <cairo/cairo-xlib.h>
+ #include <librsvg/rsvg.h>
++#include <librsvg/rsvg-cairo.h>
+ 
+ #include <X11/Xatom.h>
+ #include <X11/extensions/shape.h>

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3302-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3312-sandbox.patch
similarity index 100%
rename from x11-wm/compiz/files/compiz-0.9.8_rc3302-sandbox.patch
rename to x11-wm/compiz/files/compiz-0.9.8_rc3312-sandbox.patch


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-15  9:11 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-15  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     52ef473ed4acb168fc31dbc835645e38f3a858ef
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 09:11:33 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 09:11:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=52ef473e

Drop old

(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |   10 ++
 x11-wm/compiz/Manifest                             |   10 +-
 x11-wm/compiz/compiz-0.9.8_rc3275.ebuild           |  152 ------------------
 x11-wm/compiz/compiz-0.9.8_rc3282.ebuild           |  166 --------------------
 ...rc3275-conditional-gnome-backend-building.patch |   13 --
 ...mpiz-0.9.8_rc3275-remove-coverage-support.patch |   43 -----
 .../compiz/files/compiz-0.9.8_rc3275-sandbox.patch |   42 -----
 ...rc3282-conditional-gnome-backend-building.patch |   13 --
 ...mpiz-0.9.8_rc3282-remove-coverage-support.patch |   43 -----
 .../compiz/files/compiz-0.9.8_rc3282-sandbox.patch |   42 -----
 10 files changed, 11 insertions(+), 523 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index e18a247..5bcbef8 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.8_rc3275.ebuild,
+  -compiz-0.9.8_rc3282.ebuild,
+  -files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch,
+  -files/compiz-0.9.8_rc3275-remove-coverage-support.patch,
+  -files/compiz-0.9.8_rc3275-sandbox.patch,
+  -files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch,
+  -files/compiz-0.9.8_rc3282-remove-coverage-support.patch,
+  -files/compiz-0.9.8_rc3282-sandbox.patch:
+  Drop old
+
 *compiz-0.9.8_rc3312 (15 Sep 2012)
 
   15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.8_rc3302.ebuild,

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 78575bc..46c02dd 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,9 +1,3 @@
-AUX compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
-AUX compiz-0.9.8_rc3275-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4
-AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
-AUX compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
-AUX compiz-0.9.8_rc3282-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4
-AUX compiz-0.9.8_rc3282-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
 AUX compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
 AUX compiz-0.9.8_rc3312-rsvg-cairo.patch 421 SHA256 9257e6eaa78c27d9a91d540eed7707390ca5b7f700d4762b24243ab63cfa79fa SHA512 30e01f7d77e55e5582163ca795eb1ab960beec8ea4a3dc1869d6eda15e8539e662d31d2557fa7f1a4ce5f0731e8eece0fee832a5f2c1c6a0a8237f0bbcd8fd9e WHIRLPOOL 14db5246ef9321fc99d07f6bd9945f35cec70b4a72d9d5ed2eee756b98d3e52e129a80290b43e2d5e943b562fe6b7984cb93adedd5aac1d27d7f963acf778f83
 AUX compiz-0.9.8_rc3312-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
@@ -13,9 +7,7 @@ AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772
 AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb SHA512 60189c33d9190934195dace88a88571e79af2be06be0df9db96f7f332798cb8b3d7c0e4bacacb3413ea381c9418415932ae895e75547568eb38d12e3800cf427 WHIRLPOOL c8f068a5e254e74285ced96236a98cd4b5724c630342a19df1defb19f14755e83ce5e6d86688066dbbeee43e8c1d89640756d9427af996fa261f31630c6893af
 DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
-EBUILD compiz-0.9.8_rc3275.ebuild 3388 SHA256 58916fa39f53e154575faaa005e3cbf2f1d38d0402ed8cf583d788a29e27c2fa SHA512 fd2c4e6542f86c1d35818c028c5d7612e8219c040728fd36d9bbd5e37916315f1340be64048f4a968b3890ed9ca3e40bf30ebe22fe3ce2fe7be5950c92fc192b WHIRLPOOL 6cf42adf03929c5fee406c2a82836c035ad5c178661c065a157ddbd2c1e289969c9c9339f8267fceee8c31785e55764b1c1783f551460352abe25c931eea520e
-EBUILD compiz-0.9.8_rc3282.ebuild 3995 SHA256 4a71b119c25dce6a74a87c6ace0873212ac1ec21ab133948766d7713b22d54dc SHA512 383436ba772b56455f7cc806ec97b2eb289cc8cc6306051fa6cc7b0c3e138c55fa6c57f078ae784a8dd1c163644e015d9af30d2526c047f56505a5c2ca8c8e67 WHIRLPOOL 7d549fdc1be0d28264aff843dc5fc7c0ad29e379a1906aa6136fe43050f6bd237f762153274e7c4abff2de43ac443c523c43dad88e7b94bab9650bac7fb26b75
 EBUILD compiz-0.9.8_rc3312.ebuild 4049 SHA256 4f70ddac1b1295ba99d4f8b31c0527528989f9181d090975024418792c4e9f6f SHA512 c60c4b4b862754944d2b2e65a4ee43ebdc36ebbdaa636b6dbfa333ee7acf0927dc72800e4a9063567e6391bf0587899a56fe74773090868b1bbaf5e1b5d5713f WHIRLPOOL e8828c28e0fa0a36d1f09ba849099e1fef2c68c495e4f3a68b51123be4273163390abf35068b0472905ce14ba40610711982cdc5a39cbbf28fa8f3624f27a1d7
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 16073 SHA256 1c8bcf1f9dc335c1849e1df7a4b67ddd787dd179f1ca0f343f95ba60e99393d1 SHA512 988b1b3989b40690ab59e7c88857c4de305093b3710b30c5820d84d318f8809766d0596104eead5a15a49b7ef918a1f637da3f810154e43708b1831c52f14819 WHIRLPOOL a2f501e32ad1f94bc6a1c01e2ccedf33b4b1282afcecca2516e7f0f24dc107ddd0ac714623f8082cd8431397686c0c0ae092ea30db94c92cb0981c4ff1510510
+MISC ChangeLog 16545 SHA256 8c5a7a488eeabba5978579abbff5dbdbc6db50521a44af8a566438fb7da2e776 SHA512 503726a72d4e288b4de9ac74847587275f8ecb471cfecef93670e978897df0cfe38e12831cb3c78b40990eb181516bf104f3b2d36745c1649da5dcfa6470b69d WHIRLPOOL 1641547fcc6f35c9af2a93527c3e41486cf609e404f538a6307324843e72bc561105c6ba4aa7d1e52531f0ae823e01057c39a7214ad26f191d43a92b06f4f9f9
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
deleted file mode 100644
index 9d38d2d..0000000
--- a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-MY_PV="${PV%_*}"
-
-SRC_URI=""
-EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MY_PV}"
-EBZR_REVISION="${PV#*_rc}"
-
-inherit eutils bzr cmake-utils gnome2-utils flag-o-matic
-
-DESCRIPTION="OpenGL compositing window manager."
-HOMEPAGE="https://launchpad.net/compiz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0.9.8"
-KEYWORDS="~amd64 ~x86"
-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-1.34.0
-	>=dev-libs/glib-2.30.0
-	dev-cpp/glibmm
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-python/pyrex
-	dev-libs/protobuf
-	media-libs/libpng
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXrandr
-	>=x11-libs/libXrender-0.9.3
-	x11-libs/libXinerama
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/startup-notification-0.7
-	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-2.23.2
-		)
-	)
-	kde? (
-		>=kde-base/kwin-4.3.0:4
-	)
-	svg? (
-		>=gnome-base/librsvg-2.14.0:2
-		>=x11-libs/cairo-1.0
-	)
-	dbus? ( >=sys-apps/dbus-1.0 )"
-
-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"
-
-src_unpack() {
-	bzr_src_unpack
-}
-
-src_prepare() {
-	bzr_src_prepare
-
-	epatch "${FILESDIR}/${P}-sandbox.patch"
-	epatch "${FILESDIR}"/${P}-remove-coverage-support.patch
-	epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch
-
-	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_use gnome GCONF)"
-		"$(cmake-utils_use_use gnome GNOME)"
-		"$(cmake-utils_use_use gtk GTK)"
-		"$(cmake-utils_use_use kde KDE4)"
-		"$(cmake-utils_use test COMPIZ_BUILD_TESTING)"
-		"-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"
-		"-DCOMPIZ_DESTDIR=${D}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	pushd ${CMAKE_BUILD_DIR}
-	dodir /usr/share/cmake/Modules
-	emake DESTDIR="${D}" findcompiz_install
-	emake DESTDIR="${D}" install
-	popd ${CMAKE_BUILD_DIR}
-	chrpath -d "${D}/usr/lib64/python2.7/site-packages/compizconfig.so"
-
-	ewarn "The dbus plugin is known to crash compiz in this version. Disable"
-	ewarn "it if you experience crashes when plugins are enabled/disabled."
-}
-
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild
deleted file mode 100644
index b150466..0000000
--- a/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-MY_PV="${PV%_*}"
-
-SRC_URI=""
-EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MY_PV}"
-EBZR_REVISION="${PV#*_rc}"
-
-inherit eutils bzr cmake-utils gnome2-utils flag-o-matic
-
-DESCRIPTION="OpenGL compositing window manager."
-HOMEPAGE="https://launchpad.net/compiz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0.9.8"
-KEYWORDS="~amd64 ~x86"
-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-1.34.0
-	>=dev-libs/glib-2.30.0
-	dev-cpp/glibmm
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-python/pyrex
-	dev-libs/protobuf
-	media-libs/libpng
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXrandr
-	>=x11-libs/libXrender-0.9.3
-	x11-libs/libXinerama
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/startup-notification-0.7
-	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-2.23.2
-		)
-	)
-	kde? (
-		>=kde-base/kwin-4.3.0:4
-	)
-	svg? (
-		>=gnome-base/librsvg-2.14.0:2
-		>=x11-libs/cairo-1.0
-	)
-	dbus? ( >=sys-apps/dbus-1.0 )"
-
-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"
-
-# TODO:
-# - Bring back optional coverage support and apropriate dependencies for it
-# - 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
-# - 0.9.8.0 release does not build - need to walk through commits and find out why
-# - Check CMakeFiles.txt this subdirectories :
-# cmake - ?
-# src
-# compizconfig
-# plugins
-# tests - ?
-
-src_unpack() {
-	bzr_src_unpack
-}
-
-src_prepare() {
-	bzr_src_prepare
-
-	epatch "${FILESDIR}/${P}-sandbox.patch"
-	epatch "${FILESDIR}"/${P}-remove-coverage-support.patch
-	epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch
-
-	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_use gnome GCONF)"
-		"$(cmake-utils_use_use gnome GNOME)"
-		"$(cmake-utils_use_use gtk GTK)"
-		"$(cmake-utils_use_use kde KDE4)"
-		"$(cmake-utils_use test COMPIZ_BUILD_TESTING)"
-		"-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"
-		"-DCOMPIZ_DESTDIR=${D}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	pushd ${CMAKE_BUILD_DIR}
-	dodir /usr/share/cmake/Modules
-	emake DESTDIR="${D}" findcompiz_install
-	emake DESTDIR="${D}" install
-	popd ${CMAKE_BUILD_DIR}
-	chrpath -d "${D}/usr/lib64/python2.7/site-packages/compizconfig.so"
-
-	ewarn "The dbus plugin is known to crash compiz in this version. Disable"
-	ewarn "it if you experience crashes when plugins are enabled/disabled."
-}
-
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch
deleted file mode 100644
index a2c5925..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- compizconfig/CMakeLists.txt.orig	2012-09-04 14:56:20.082299507 +0400
-+++ compizconfig/CMakeLists.txt	2012-09-04 14:56:31.109299403 +0400
-@@ -7,8 +7,10 @@
- add_subdirectory (libcompizconfig)
- add_subdirectory (compizconfig-python)
- add_subdirectory (ccsm)
-+if (USE_GNOME)
- add_subdirectory (gconf)
- add_subdirectory (gsettings)
-+endif (USE_GNOME)
- 
- add_custom_target (pyclean)
- 

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch
deleted file mode 100644
index 9859ad3..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- CMakeLists.txt.orig	2012-09-04 12:12:58.603375058 +0400
-+++ CMakeLists.txt	2012-09-04 12:13:12.550374932 +0400
-@@ -21,24 +21,6 @@
- 
- enable_testing()
- 
--# Import macro for doing coverage reporting
--include(EnableCoverageReport)
--
--#####################################################################
--# Enable code coverage calculation with gcov/gcovr/lcov
--# Usage:
--#  * Switch build type to coverage (use ccmake or cmake-gui)
--#  * Invoke make, make test, make coverage
--#  * Find html report in subdir coveragereport
--#  * Find xml report feasible for jenkins in coverage.xml
--#####################################################################
--IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
--  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
--  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
--  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
--ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
--
- #set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRe" CACHE INTERNAL "" FORCE)
- #if (NOT CMAKE_BUILD_TYPE)
- #    set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE)
-@@ -196,7 +178,3 @@
- 
- _check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG})
- 
--# Enable coverage reporting for compiz
--enable_coverage_report()
--
--
---- src/CMakeLists.txt.orig	2012-09-04 12:22:06.860370828 +0400
-+++ src/CMakeLists.txt	2012-09-04 12:22:12.375370782 +0400
-@@ -193,5 +193,3 @@
-     TARGETS compiz
-     RUNTIME DESTINATION ${exec_prefix}
- )
--
--enable_coverage_report( TARGETS compiz )

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3275-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3275-sandbox.patch
deleted file mode 100644
index 55bde3e..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3275-sandbox.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN a/cmake/base.cmake b/cmake/base.cmake
---- a/cmake/base.cmake	2012-06-29 02:33:47.076801000 -0500
-+++ b/cmake/base.cmake	2012-06-29 22:47:06.868740002 -0500
-@@ -53,8 +53,8 @@
- 	     DESTINATION
- 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
-     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 make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
-     )
-     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
-     if (NOT _find_compizconfig)
-@@ -70,8 +70,8 @@
- 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
-     add_custom_target (
- 	findcompizconfig_install
--	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
--	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
-+	${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
-     )
- endfunction ()
- 
-diff -urN a/compizconfig/libcompizconfig/config/CMakeLists.txt b/compizconfig/libcompizconfig/config/CMakeLists.txt
---- a/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 02:33:51.195800999 -0500
-+++ b/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 22:48:56.602740000 -0500
-@@ -1,10 +1,10 @@
- set (_config_file
-      config)
- 
--compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
-+compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
- 
- add_custom_target (
-     config_install
--    ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
--    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
-+    ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
-     )

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch
deleted file mode 100644
index a2c5925..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- compizconfig/CMakeLists.txt.orig	2012-09-04 14:56:20.082299507 +0400
-+++ compizconfig/CMakeLists.txt	2012-09-04 14:56:31.109299403 +0400
-@@ -7,8 +7,10 @@
- add_subdirectory (libcompizconfig)
- add_subdirectory (compizconfig-python)
- add_subdirectory (ccsm)
-+if (USE_GNOME)
- add_subdirectory (gconf)
- add_subdirectory (gsettings)
-+endif (USE_GNOME)
- 
- add_custom_target (pyclean)
- 

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch
deleted file mode 100644
index 9859ad3..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- CMakeLists.txt.orig	2012-09-04 12:12:58.603375058 +0400
-+++ CMakeLists.txt	2012-09-04 12:13:12.550374932 +0400
-@@ -21,24 +21,6 @@
- 
- enable_testing()
- 
--# Import macro for doing coverage reporting
--include(EnableCoverageReport)
--
--#####################################################################
--# Enable code coverage calculation with gcov/gcovr/lcov
--# Usage:
--#  * Switch build type to coverage (use ccmake or cmake-gui)
--#  * Invoke make, make test, make coverage
--#  * Find html report in subdir coveragereport
--#  * Find xml report feasible for jenkins in coverage.xml
--#####################################################################
--IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
--  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
--  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
--  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
--ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
--
- #set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRe" CACHE INTERNAL "" FORCE)
- #if (NOT CMAKE_BUILD_TYPE)
- #    set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE)
-@@ -196,7 +178,3 @@
- 
- _check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG})
- 
--# Enable coverage reporting for compiz
--enable_coverage_report()
--
--
---- src/CMakeLists.txt.orig	2012-09-04 12:22:06.860370828 +0400
-+++ src/CMakeLists.txt	2012-09-04 12:22:12.375370782 +0400
-@@ -193,5 +193,3 @@
-     TARGETS compiz
-     RUNTIME DESTINATION ${exec_prefix}
- )
--
--enable_coverage_report( TARGETS compiz )

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch
deleted file mode 100644
index 55bde3e..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN a/cmake/base.cmake b/cmake/base.cmake
---- a/cmake/base.cmake	2012-06-29 02:33:47.076801000 -0500
-+++ b/cmake/base.cmake	2012-06-29 22:47:06.868740002 -0500
-@@ -53,8 +53,8 @@
- 	     DESTINATION
- 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
-     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 make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
-     )
-     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
-     if (NOT _find_compizconfig)
-@@ -70,8 +70,8 @@
- 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
-     add_custom_target (
- 	findcompizconfig_install
--	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
--	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
-+	${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
-     )
- endfunction ()
- 
-diff -urN a/compizconfig/libcompizconfig/config/CMakeLists.txt b/compizconfig/libcompizconfig/config/CMakeLists.txt
---- a/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 02:33:51.195800999 -0500
-+++ b/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 22:48:56.602740000 -0500
-@@ -1,10 +1,10 @@
- set (_config_file
-      config)
- 
--compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
-+compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
- 
- add_custom_target (
-     config_install
--    ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
--    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
-+    ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
-     )


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-15 11:31 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-15 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     6bf8d8a4bc31a0416df4692fc702e537c2cc4808
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 09:30:56 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 09:30:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=6bf8d8a4

Bump to revision 3316

(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |   12 ++++++++++++
 x11-wm/compiz/Manifest                             |   10 +++++-----
 ....8_rc3312.ebuild => compiz-0.9.8_rc3316.ebuild} |    0
 ...c3316-conditional-gnome-backend-building.patch} |    0
 ....patch => compiz-0.9.8_rc3316-rsvg-cairo.patch} |    0
 ...box.patch => compiz-0.9.8_rc3316-sandbox.patch} |    0
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 5bcbef8..d69380d 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*compiz-0.9.8_rc3316 (15 Sep 2012)
+
+  15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.8_rc3312.ebuild,
+  +compiz-0.9.8_rc3316.ebuild,
+  -files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch,
+  -files/compiz-0.9.8_rc3312-rsvg-cairo.patch,
+  -files/compiz-0.9.8_rc3312-sandbox.patch,
+  +files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch,
+  +files/compiz-0.9.8_rc3316-rsvg-cairo.patch,
+  +files/compiz-0.9.8_rc3316-sandbox.patch:
+  Bump to revision 3316
+
   15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.8_rc3275.ebuild,
   -compiz-0.9.8_rc3282.ebuild,
   -files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch,

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 46c02dd..15e8e53 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,13 +1,13 @@
-AUX compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
-AUX compiz-0.9.8_rc3312-rsvg-cairo.patch 421 SHA256 9257e6eaa78c27d9a91d540eed7707390ca5b7f700d4762b24243ab63cfa79fa SHA512 30e01f7d77e55e5582163ca795eb1ab960beec8ea4a3dc1869d6eda15e8539e662d31d2557fa7f1a4ce5f0731e8eece0fee832a5f2c1c6a0a8237f0bbcd8fd9e WHIRLPOOL 14db5246ef9321fc99d07f6bd9945f35cec70b4a72d9d5ed2eee756b98d3e52e129a80290b43e2d5e943b562fe6b7984cb93adedd5aac1d27d7f963acf778f83
-AUX compiz-0.9.8_rc3312-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
+AUX compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
+AUX compiz-0.9.8_rc3316-rsvg-cairo.patch 421 SHA256 9257e6eaa78c27d9a91d540eed7707390ca5b7f700d4762b24243ab63cfa79fa SHA512 30e01f7d77e55e5582163ca795eb1ab960beec8ea4a3dc1869d6eda15e8539e662d31d2557fa7f1a4ce5f0731e8eece0fee832a5f2c1c6a0a8237f0bbcd8fd9e WHIRLPOOL 14db5246ef9321fc99d07f6bd9945f35cec70b4a72d9d5ed2eee756b98d3e52e129a80290b43e2d5e943b562fe6b7984cb93adedd5aac1d27d7f963acf778f83
+AUX compiz-0.9.8_rc3316-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a
 AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6
 AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb SHA512 60189c33d9190934195dace88a88571e79af2be06be0df9db96f7f332798cb8b3d7c0e4bacacb3413ea381c9418415932ae895e75547568eb38d12e3800cf427 WHIRLPOOL c8f068a5e254e74285ced96236a98cd4b5724c630342a19df1defb19f14755e83ce5e6d86688066dbbeee43e8c1d89640756d9427af996fa261f31630c6893af
 DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
-EBUILD compiz-0.9.8_rc3312.ebuild 4049 SHA256 4f70ddac1b1295ba99d4f8b31c0527528989f9181d090975024418792c4e9f6f SHA512 c60c4b4b862754944d2b2e65a4ee43ebdc36ebbdaa636b6dbfa333ee7acf0927dc72800e4a9063567e6391bf0587899a56fe74773090868b1bbaf5e1b5d5713f WHIRLPOOL e8828c28e0fa0a36d1f09ba849099e1fef2c68c495e4f3a68b51123be4273163390abf35068b0472905ce14ba40610711982cdc5a39cbbf28fa8f3624f27a1d7
+EBUILD compiz-0.9.8_rc3316.ebuild 4049 SHA256 4f70ddac1b1295ba99d4f8b31c0527528989f9181d090975024418792c4e9f6f SHA512 c60c4b4b862754944d2b2e65a4ee43ebdc36ebbdaa636b6dbfa333ee7acf0927dc72800e4a9063567e6391bf0587899a56fe74773090868b1bbaf5e1b5d5713f WHIRLPOOL e8828c28e0fa0a36d1f09ba849099e1fef2c68c495e4f3a68b51123be4273163390abf35068b0472905ce14ba40610711982cdc5a39cbbf28fa8f3624f27a1d7
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 16545 SHA256 8c5a7a488eeabba5978579abbff5dbdbc6db50521a44af8a566438fb7da2e776 SHA512 503726a72d4e288b4de9ac74847587275f8ecb471cfecef93670e978897df0cfe38e12831cb3c78b40990eb181516bf104f3b2d36745c1649da5dcfa6470b69d WHIRLPOOL 1641547fcc6f35c9af2a93527c3e41486cf609e404f538a6307324843e72bc561105c6ba4aa7d1e52531f0ae823e01057c39a7214ad26f191d43a92b06f4f9f9
+MISC ChangeLog 17040 SHA256 04b47e3e7e487a371460c80ac651e8cba5780e86369a075f58e7c169e1377b2b SHA512 64789dcf894a6af543f0f0bf8994273028b834b745033bc5ad50487dd98fcb8f9261e18a19a7e35fadbbe8c517d9ee043fd4383ead8200794edbed3485c51111 WHIRLPOOL eeb36f9bd7a189252117b955380a3003284f152a4a41e1124fb7f67b598d5f48229f1217fbd8ddc1bc58805ce2e32893c32554a1e43543e1826ea3e21eeac3d3
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3312.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3316.ebuild
similarity index 100%
rename from x11-wm/compiz/compiz-0.9.8_rc3312.ebuild
rename to x11-wm/compiz/compiz-0.9.8_rc3316.ebuild

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch
similarity index 100%
rename from x11-wm/compiz/files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch
rename to x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3312-rsvg-cairo.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch
similarity index 100%
rename from x11-wm/compiz/files/compiz-0.9.8_rc3312-rsvg-cairo.patch
rename to x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3312-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch
similarity index 100%
rename from x11-wm/compiz/files/compiz-0.9.8_rc3312-sandbox.patch
rename to x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
@ 2012-09-15 11:31 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-15 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     cecf3d46f232c5406257e79bf4a12d8c3d906be6
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 11:30:53 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 11:30:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=cecf3d46

Compiz 0.9.8.2 release ebuild, drop snapshots

(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |    9 ++
 x11-wm/compiz/Manifest                             |    9 +-
 ...z-0.9.8_rc3316.ebuild => compiz-0.9.8.2.ebuild} |   80 ++++++++------------
 x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch   |   26 +++++++
 ...rc3316-conditional-gnome-backend-building.patch |   13 ---
 .../files/compiz-0.9.8_rc3316-rsvg-cairo.patch     |   12 ---
 .../compiz/files/compiz-0.9.8_rc3316-sandbox.patch |   42 ----------
 7 files changed, 70 insertions(+), 121 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index d69380d..b332c1f 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*compiz-0.9.8.2 (15 Sep 2012)
+
+  15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.8_rc3316.ebuild,
+  -files/compiz-0.9.8_rc3316-rsvg-cairo.patch, +compiz-0.9.8.2.ebuild,
+  -files/compiz-0.9.8_rc3316-sandbox.patch,
+  +files/compiz-0.9.8.2-sandbox.patch,
+  -files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch:
+  Compiz 0.9.8.2 release ebuild, drop snapshots
+
 *compiz-0.9.8_rc3316 (15 Sep 2012)
 
   15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.8_rc3312.ebuild,

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 15e8e53..8edc2bb 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,13 +1,12 @@
-AUX compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
-AUX compiz-0.9.8_rc3316-rsvg-cairo.patch 421 SHA256 9257e6eaa78c27d9a91d540eed7707390ca5b7f700d4762b24243ab63cfa79fa SHA512 30e01f7d77e55e5582163ca795eb1ab960beec8ea4a3dc1869d6eda15e8539e662d31d2557fa7f1a4ce5f0731e8eece0fee832a5f2c1c6a0a8237f0bbcd8fd9e WHIRLPOOL 14db5246ef9321fc99d07f6bd9945f35cec70b4a72d9d5ed2eee756b98d3e52e129a80290b43e2d5e943b562fe6b7984cb93adedd5aac1d27d7f963acf778f83
-AUX compiz-0.9.8_rc3316-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
+AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b9668850ca8eca6c30b8be0460a138 SHA512 5b637165e8739e7e60314ee84db02da6d9f9834cfe28b6c0f97482204f19dcca678a3ea38be80d57ad2d42fcce38f32e9f8a3919c22f9c45cb6dc47cd69a382b WHIRLPOOL 229b0728affccaf83aaa99beaecd74cacd757c316126201f29f59b2f49cea8eb4d17c8dc20f4f217ec7505e4f02a201f7f91ebdb7739db1ddd0c8ab822410c4e
 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a
 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.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
 DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
-EBUILD compiz-0.9.8_rc3316.ebuild 4049 SHA256 4f70ddac1b1295ba99d4f8b31c0527528989f9181d090975024418792c4e9f6f SHA512 c60c4b4b862754944d2b2e65a4ee43ebdc36ebbdaa636b6dbfa333ee7acf0927dc72800e4a9063567e6391bf0587899a56fe74773090868b1bbaf5e1b5d5713f WHIRLPOOL e8828c28e0fa0a36d1f09ba849099e1fef2c68c495e4f3a68b51123be4273163390abf35068b0472905ce14ba40610711982cdc5a39cbbf28fa8f3624f27a1d7
+EBUILD compiz-0.9.8.2.ebuild 3778 SHA256 b34e7abe511fcbc6009b44d991ec8bed02675d99744194a346df9ff0cc95354a SHA512 c4386989ec285510b8463f835dec8f3ed8e81362e08f5fe9d12e0dc14a1931544853856ad71dfd3ab51c93aa54d92dd37da42ae21a9eaf28d195072d6cc5e887 WHIRLPOOL 0985666763bd24c5d97222133f8ce86ba65fd3809118e8ba628153c370393f3cbaea56edca3560596ba0bdcf4c16f8bd7bb96b94135fccc718d16fd1a265a84c
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 17040 SHA256 04b47e3e7e487a371460c80ac651e8cba5780e86369a075f58e7c169e1377b2b SHA512 64789dcf894a6af543f0f0bf8994273028b834b745033bc5ad50487dd98fcb8f9261e18a19a7e35fadbbe8c517d9ee043fd4383ead8200794edbed3485c51111 WHIRLPOOL eeb36f9bd7a189252117b955380a3003284f152a4a41e1124fb7f67b598d5f48229f1217fbd8ddc1bc58805ce2e32893c32554a1e43543e1826ea3e21eeac3d3
+MISC ChangeLog 17424 SHA256 fd5e58bcb6fd4336ee7bba717124b577a123f79455a8a068a5c31d177e49b1ea SHA512 f54f7d4a66b60942941a637ceb420a5fa6f69ea0888a1afe754af9ef493d5f9db9653548c5651ec3c1a75a4cb372d15733ab9f621774afe44678cf340cfe6ecb WHIRLPOOL 1c56588c7a3fe26c78d253d16fa5678e9a301c7a9b2a3e1e33643520035f7884627408fc85e0d7a55330442ffc04e3316d3ac632e15a8118d2907e2ce9e43157
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3316.ebuild b/x11-wm/compiz/compiz-0.9.8.2.ebuild
similarity index 69%
rename from x11-wm/compiz/compiz-0.9.8_rc3316.ebuild
rename to x11-wm/compiz/compiz-0.9.8.2.ebuild
index 6027908..863516d 100644
--- a/x11-wm/compiz/compiz-0.9.8_rc3316.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8.2.ebuild
@@ -4,19 +4,13 @@
 
 EAPI=4
 
-MY_PV="${PV%_*}"
-
-SRC_URI=""
-EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MY_PV}"
-EBZR_REVISION="${PV#*_rc}"
-
-inherit eutils bzr cmake-utils gnome2-utils flag-o-matic
+inherit eutils cmake-utils gnome2-utils versionator
 
 DESCRIPTION="OpenGL compositing window manager."
 HOMEPAGE="https://launchpad.net/compiz"
-
+SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-3)/${PV}/+download/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0.9.8"
+SLOT="0.9"
 KEYWORDS="~amd64 ~x86"
 IUSE="+cairo debug dbus fuse gnome gtk kde +svg test"
 
@@ -32,29 +26,27 @@ COMMONDEPEND="
 	!x11-apps/ccsm
 	!dev-python/compizconfig-python
 	!x11-apps/fusion-icon
-	>=dev-libs/boost-1.34.0
-	>=dev-libs/glib-2.30.0
+	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
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
+	media-libs/mesa
+	x11-base/xorg-server
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXrandr
-	>=x11-libs/libXrender-0.9.3
+	x11-libs/libXrender
 	x11-libs/libXinerama
 	x11-libs/libICE
 	x11-libs/libSM
-	>=x11-libs/startup-notification-0.7
-	cairo? (
-		x11-libs/cairo[X]
-	)
+	x11-libs/startup-notification
+	cairo? ( x11-libs/cairo[X] )
 	fuse? ( sys-fs/fuse )
 	gtk? (
 		>=x11-libs/gtk+-2.18.0
@@ -63,17 +55,15 @@ COMMONDEPEND="
 		gnome? (
 			gnome-base/gnome-desktop
 			gnome-base/gconf
-			>=x11-wm/metacity-2.23.2
+			x11-wm/metacity
 		)
 	)
-	kde? (
-		>=kde-base/kwin-4.3.0:4
-	)
+	kde? ( kde-base/kwin:4 )
 	svg? (
-		>=gnome-base/librsvg-2.14.0:2
-		>=x11-libs/cairo-1.0
+		gnome-base/librsvg:2
+		x11-libs/cairo
 	)
-	dbus? ( >=sys-apps/dbus-1.0 )"
+	dbus? ( sys-apps/dbus )"
 
 DEPEND="${COMMONDEPEND}
 	app-admin/chrpath
@@ -97,7 +87,7 @@ RDEPEND="${COMMONDEPEND}
 # - Check proper compilation with missing gettext/intltool
 # - CFLAGS are NOT respected, this needs to be fixed
 # - Default decorator exec command in ccsm is bad
-# - 0.9.8.0 release does not build - need to walk through commits and find out why
+# - Check all dependencies once more
 # - Check CMakeFiles.txt this subdirectories :
 # cmake - ?
 # src
@@ -105,19 +95,13 @@ RDEPEND="${COMMONDEPEND}
 # plugins
 # tests - ?
 
-src_unpack() {
-	bzr_src_unpack
-}
-
 src_prepare() {
-	bzr_src_prepare
-
 	epatch "${FILESDIR}/${P}-sandbox.patch"
-	epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch
-	epatch "${FILESDIR}"/${P}-rsvg-cairo.patch
 
 	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
 	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+
+	base_src_prepare
 }
 
 src_configure() {
@@ -128,31 +112,25 @@ src_configure() {
 		"$(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"
-		"-DCOMPIZ_DESTDIR=${D}"
 	)
-
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
-	pushd ${CMAKE_BUILD_DIR}
-	dodir /usr/share/cmake/Modules
-	emake DESTDIR="${D}" findcompiz_install
-	emake DESTDIR="${D}" install
-	popd ${CMAKE_BUILD_DIR}
-	chrpath -d "${D}/usr/lib64/python2.7/site-packages/compizconfig.so"
-
-	ewarn "The dbus plugin is known to crash compiz in this version. Disable"
-	ewarn "it if you experience crashes when plugins are enabled/disabled."
+	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() {
@@ -161,6 +139,10 @@ pkg_preinst() {
 
 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() {

diff --git a/x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch
new file mode 100644
index 0000000..da43346
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch
@@ -0,0 +1,26 @@
+--- compiz-0.9.8.2/cmake/base.cmake~	2012-09-12 14:29:09.000000000 +0000
++++ compiz-0.9.8.2/cmake/base.cmake	2012-09-12 14:29:09.000000000 +0000
+@@ -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 &&

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch
deleted file mode 100644
index a2c5925..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- compizconfig/CMakeLists.txt.orig	2012-09-04 14:56:20.082299507 +0400
-+++ compizconfig/CMakeLists.txt	2012-09-04 14:56:31.109299403 +0400
-@@ -7,8 +7,10 @@
- add_subdirectory (libcompizconfig)
- add_subdirectory (compizconfig-python)
- add_subdirectory (ccsm)
-+if (USE_GNOME)
- add_subdirectory (gconf)
- add_subdirectory (gsettings)
-+endif (USE_GNOME)
- 
- add_custom_target (pyclean)
- 

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch
deleted file mode 100644
index ad484f5..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Revert back commit from revision 3309(http://bazaar.launchpad.net/~compiz-team/compiz/0.9.8/revision/3309)
-
---- plugins/imgsvg/src/imgsvg.h.orig	2012-09-15 13:03:21.776447000 +0400
-+++ plugins/imgsvg/src/imgsvg.h	2012-09-15 13:03:33.383185000 +0400
-@@ -35,6 +35,7 @@
- 
- #include <cairo/cairo-xlib.h>
- #include <librsvg/rsvg.h>
-+#include <librsvg/rsvg-cairo.h>
- 
- #include <X11/Xatom.h>
- #include <X11/extensions/shape.h>

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch
deleted file mode 100644
index 55bde3e..0000000
--- a/x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN a/cmake/base.cmake b/cmake/base.cmake
---- a/cmake/base.cmake	2012-06-29 02:33:47.076801000 -0500
-+++ b/cmake/base.cmake	2012-06-29 22:47:06.868740002 -0500
-@@ -53,8 +53,8 @@
- 	     DESTINATION
- 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
-     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 make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
-     )
-     find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
-     if (NOT _find_compizconfig)
-@@ -70,8 +70,8 @@
- 	     ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/)
-     add_custom_target (
- 	findcompizconfig_install
--	${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
--	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules
-+	${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+	${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
-     )
- endfunction ()
- 
-diff -urN a/compizconfig/libcompizconfig/config/CMakeLists.txt b/compizconfig/libcompizconfig/config/CMakeLists.txt
---- a/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 02:33:51.195800999 -0500
-+++ b/compizconfig/libcompizconfig/config/CMakeLists.txt	2012-06-29 22:48:56.602740000 -0500
-@@ -1,10 +1,10 @@
- set (_config_file
-      config)
- 
--compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
-+compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
- 
- add_custom_target (
-     config_install
--    ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules &&
--    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
-+    ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-+    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
-     )


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-09-15 11:31 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-08  9:28 [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/ Sergey Popov
  -- strict thread matches above, loose matches on Subject: below --
2012-09-15 11:31 Sergey Popov
2012-09-15 11:31 Sergey Popov
2012-09-15  9:11 Sergey Popov
2012-09-15  9:11 Sergey Popov
2012-09-04 12:21 Sergey Popov
2012-09-04 12:01 Sergey Popov
2012-09-04  8:25 Sergey Popov
2012-09-04  8:25 Sergey Popov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox