summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorMarcin Deranek <gringo@slonko.net>2017-03-22 21:21:06 +0100
committerMarcin Deranek <gringo@slonko.net>2017-03-22 21:21:14 +0100
commitee67ebf93ca7748506ae5da04e4ce24fa66b5757 (patch)
treee441c760494ddb4a11aded5c9687fd80f725c479 /x11-wm
parent6b72612823752791211560d817ceb69211fa077f (diff)
downloadportage-ee67ebf93ca7748506ae5da04e4ce24fa66b5757.tar.gz
portage-ee67ebf93ca7748506ae5da04e4ce24fa66b5757.tar.bz2
portage-ee67ebf93ca7748506ae5da04e4ce24fa66b5757.zip
Update ebuild
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/compiz/Manifest2
-rw-r--r--x11-wm/compiz/compiz-0.9.13.9999.ebuild34
2 files changed, 18 insertions, 18 deletions
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 26f7c3e..41401c1 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,2 +1,2 @@
AUX access_violation.patch 1456 SHA256 efcfe62878821c78eee374508762f4cb769ee7f19235c8d6deb7a81b031690b8 SHA512 04af43f754aca8490e8462562311372e12306bb89aa3c9ed4ac466c65827f17a9f379c1250ad0881c0b3db18a068fd458a7275c8184851d72519a71f1e4fc3f1 WHIRLPOOL 43c5e35f202fc1e5a44168cea3b25ee92d5dbce1bfd62a06e188f534b81eb8b41b5fa050dbf8f82d0336fea05be9c5ea7afecb30af613f3a889b31836adcd5e5
-EBUILD compiz-0.9.13.9999.ebuild 3900 SHA256 5f5d488e5b8c38879faf93e5d82deae5664d4c2b3603d8b560304166943ab057 SHA512 8d02dfb7fb0304630e33e3c91d6668af098d3d72aa669b32048f39b75031772d43b62ec6de8a6afe671f73b935e7528c87fcc3b57789f7368aa6acec2ffe423b WHIRLPOOL 896367b10706d52ae9f378cd1af568eebab8abefcaa0391a1cb6512286efd1e5ff4aad4e21d5934ea2a80df1541c4d136ac4d2f5f33d7347ba1ea6c945ff0a09
+EBUILD compiz-0.9.13.9999.ebuild 3826 SHA256 f89f004edf18b3f3019a69fd22365d5ab8c3d4c02d212dde2011986a61e41c87 SHA512 0d891dae80304bbd66e155f513517d6969b1bfefa2efab09156032432de77264d4dfcd65861b4671ffc7a05ea4835f7338590c85be7be21369046c8d642db606 WHIRLPOOL 83836e3848e0cbee83fccebeec55099375308e2d6e7dc7d782c1db22d31a0245f2553ea50f5fe935d42dd4c2a0048a28e2585eac2dc76a7d6c4187d96aeabceb
diff --git a/x11-wm/compiz/compiz-0.9.13.9999.ebuild b/x11-wm/compiz/compiz-0.9.13.9999.ebuild
index fb5f09c..7a53478 100644
--- a/x11-wm/compiz/compiz-0.9.13.9999.ebuild
+++ b/x11-wm/compiz/compiz-0.9.13.9999.ebuild
@@ -1,8 +1,9 @@
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils eutils gnome2-utils toolchain-funcs python versionator
+inherit cmake-utils eutils gnome2-utils python-single-r1 toolchain-funcs versionator
BRANCH="$(get_version_component_range 1-3)"
MINOR="$(get_version_component_range 4)"
@@ -109,32 +110,31 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}"/access_violation.patch
+ eapply_user
}
pkg_setup() {
- python_set_active_version 2
+ python-single-r1_pkg_setup
}
src_configure() {
- use debug && CMAKE_BUILD_TYPE=Debug
+ use debug && CMAKE_BUILD_TYPE=Debug
local mycmakeargs=(
- "$(cmake-utils_use_use gles GLES)"
- "$(cmake-utils_use_use gnome GCONF)"
- "$(cmake-utils_use_use gnome GNOME)"
- "$(cmake-utils_use_use gnome GNOME_KEYBINDINGS)"
- "$(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_BUILD_TYPE=Release"
+ "-DUSE_GLES=$(usex gles)"
+ "-DUSE_GNOME=$(usex gnome)"
+ "-DUSE_METACITY=$(usex gnome)"
+ "-DUSE_GTK=$(usex gtk)"
+ "-DUSE_KDE4=$(usex kde)"
+ "-DCOMPIZ_BUILD_TESTING=$(usex test)"
+ "-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_INSTALL_PREFIX=/usr"
"-DCOMPIZ_DEFAULT_PLUGINS=composite,opengl,decor,resize,place,move,ccp"
"-DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On"
"-DCOMPIZ_PACKAGING_ENABLED=On"
- "-DCOMPIZ_BUILD_WITH_RPATH=Off"
- "-DCOMPIZ_BUILD_TESTING=Off"
- "-DCOMPIZ_WERROR=Off"
- "-Wno-dev"
+ "-DCOMPIZ_BUILD_WITH_RPATH=Off"
+ "-DCOMPIZ_BUILD_TESTING=Off"
+ "-DCOMPIZ_WERROR=Off"
+ "-Wno-dev"
)
cmake-utils_src_configure
}