From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BF359138010 for ; Sat, 15 Sep 2012 09:12:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61515E0730; Sat, 15 Sep 2012 09:11:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 141B1E064B for ; Sat, 15 Sep 2012 09:11:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5631833CEF0 for ; Sat, 15 Sep 2012 09:11:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 15CB6E5444 for ; Sat, 15 Sep 2012 09:11:50 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1347700293.52ef473ed4acb168fc31dbc835645e38f3a858ef.pinkbyte@gentoo> Subject: [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/ X-VCS-Repository: proj/desktop-effects X-VCS-Files: x11-wm/compiz/ChangeLog x11-wm/compiz/Manifest x11-wm/compiz/compiz-0.9.8_rc3275.ebuild x11-wm/compiz/compiz-0.9.8_rc3282.ebuild x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch x11-wm/compiz/files/compiz-0.9.8_rc3275-sandbox.patch x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch X-VCS-Directories: x11-wm/compiz/files/ x11-wm/compiz/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 52ef473ed4acb168fc31dbc835645e38f3a858ef X-VCS-Branch: v0.9.8-test Date: Sat, 15 Sep 2012 09:11:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 38674189-e7e0-4bd5-99a0-0c8719846cad X-Archives-Hash: 233f9a560610841950fde40d4057d42b commit: 52ef473ed4acb168fc31dbc835645e38f3a858ef Author: Sergey Popov gentoo org> AuthorDate: Sat Sep 15 09:11:33 2012 +0000 Commit: Sergey Popov gentoo 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 -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 -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} - )