From 741ccef9051f84980a2dec54679699229d42371e Mon Sep 17 00:00:00 2001
From: Marcin Deranek <gringo@slonko.net>
Date: Fri, 26 Jul 2019 21:43:21 +0200
Subject: Fix python module path

---
 x11-wm/compiz/Manifest           |  2 +-
 x11-wm/compiz/compiz-9999.ebuild | 31 +++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'x11-wm')

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index ca9e70d..a4c1e28 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,4 +1,4 @@
 AUX access_violation.patch 974 BLAKE2B 9b226e3d7255073bff22448f096fc19f743b97582b2e4de2725c7df84f0895bb63b7eee25d3b82f08090b19b5ea9c1179d57d1eaf994bfabc42e4e04e8f1ec33 SHA512 0d91b71ad9c2646745d91a8a6b3d9228a23dccb3971abf69094ca4f6b3055f92570f01eb6dda62acab8630c05cc9480e846b59bd3b6044a73b31510d72a8f800
 AUX fix_pkgconfig_libdir.patch 1155 BLAKE2B 33319182db6d8c46ca0d2f2ced06fd4610c39f59588ff85045a4f83877f25163b0692458e426bf2199fb14e784605ca4844f523b31d1a2d16e201ce8317422c5 SHA512 fb1362ef72864bdcb46d82c042dd688850f496a244b58b9314a2466f93aa79d8a31fc3585a6f08d3d4836c0fdc9d8ce7b4f5a1332bf87c3349a59e4b8011b3c6
 EBUILD compiz-0.9.13.9999.ebuild 3636 BLAKE2B ad8141a2d9d323ca091b122af0c2c8e110563d5c41f99d6b5ea53ce8707f9db639dd5b8705faf4c70bb68ca9f4b37e4429a5700db829d14f9c637b955c1af3d1 SHA512 5ed76b241fae11650c1b78d03853fe1cc7fd64f43529a9f93ca7cfe6cd670ab8074ebe588f258d24fbb5eaf741947fe1ba97e0ff03b8924720e208d0f74d8819
-EBUILD compiz-9999.ebuild 3467 BLAKE2B 55b76823499816b775ddfc2f5727bb0395ec384bd4f8b10a045586fd624a2ebc743dc276e6ad7366c8cacc491842c5291368501b6bd3794a249de4ffac84895e SHA512 13318a36292ddc3261f7cdff565b7350b368ae2e6d0e2bd2f4f82955845977eb78d2189f786cee604020edfbfa1475389610bf31206204599f193c2770f045db
+EBUILD compiz-9999.ebuild 3495 BLAKE2B 6c45cc275e86c7b44197e73fa1cb6a97d4cd81aa3a7ec19869e10947924d8d8de92cd765523ebfed4328be3c9c043605c1f5039503cea1f8ac3ec5ee1b5d0a7a SHA512 517f0ffae69298c4d5afc91e43feb6f57869cafc2d085bdfbdca97d12e4ef5a891265370e268b6e21d2d37632f9ab58a9b2cb4881215fb378b6a174be3ef5af2
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index 95a81d0..3fae3fc 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -101,7 +101,10 @@ pkg_pretend() {
 
 src_prepare() {
 	cmake-utils_src_prepare
-	sed -i -e 's/CYTHON_BIN cython3/CYTHON_BIN cython/' compizconfig/compizconfig-python/CMakeLists.txt
+	sed -i \
+		-e 's|CYTHON_BIN cython3|CYTHON_BIN cython|' \
+		-e "s|/lib/python|/$(get_libdir)/python|" \
+		compizconfig/compizconfig-python/CMakeLists.txt
 	epatch "${FILESDIR}"/access_violation.patch
 	epatch "${FILESDIR}"/fix_pkgconfig_libdir.patch
 	eapply_user
@@ -114,19 +117,19 @@ pkg_setup() {
 src_configure() {
 	use debug && CMAKE_BUILD_TYPE=Debug
 	local mycmakeargs=(
-		"-DUSE_GLES=$(usex gles)"
-		"-DUSE_GNOME=$(usex gnome)"
-		"-DUSE_METACITY=$(usex gnome)"
-		"-DUSE_GTK=$(usex gtk)"
-		"-DCMAKE_BUILD_TYPE=Release"
-		"-DCOMPIZ_BUILD_TESTING=$(usex test)"
-		"-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"
+		-DUSE_GLES=$(usex gles)
+		-DUSE_GNOME=$(usex gnome)
+		-DUSE_METACITY=$(usex gnome)
+		-DUSE_GTK=$(usex gtk)
+		-DCMAKE_BUILD_TYPE=Release
+		-DCOMPIZ_BUILD_TESTING=$(usex test)
+		-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
 	)
 	cmake-utils_src_configure
 }
-- 
cgit v1.2.3