From 2eee51eb3bd7cb215ade775a4440de07edf93697 Mon Sep 17 00:00:00 2001
From: Marcin Deranek <marcin.deranek@booking.com>
Date: Tue, 10 Mar 2020 21:48:49 +0100
Subject: Another series of cleanups

---
 x11-wm/compiz/Manifest                     |  4 ++--
 x11-wm/compiz/compiz-9999.ebuild           | 14 ++++++++------
 x11-wm/compiz/files/access_violation.patch |  8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'x11-wm')

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 98b8c45..b6119fa 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,2 +1,2 @@
-AUX access_violation.patch 974 BLAKE2B 9b226e3d7255073bff22448f096fc19f743b97582b2e4de2725c7df84f0895bb63b7eee25d3b82f08090b19b5ea9c1179d57d1eaf994bfabc42e4e04e8f1ec33 SHA512 0d91b71ad9c2646745d91a8a6b3d9228a23dccb3971abf69094ca4f6b3055f92570f01eb6dda62acab8630c05cc9480e846b59bd3b6044a73b31510d72a8f800
-EBUILD compiz-9999.ebuild 3605 BLAKE2B 4862e2c53d14a5e5e852a67b4167a585770d5e7cd8c04b2b816e20759a0beec9a63b39033bd7deacf10c7f99da54d696d03745309a06507a41446aabf7b6b51d SHA512 5bc4b0c07332dbef3e16989c35ee05a52bf0f7e3d8e6622e47b5915aa41fc4568fe5738bfbe27b6e3651a9460a6bd56829c437b110d402da8e3bceef78653390
+AUX access_violation.patch 1023 BLAKE2B cc06552acc0241a4f4c30feee61023023143fbb935cf925a9c18037ddb6d8bb6ceafd6f8b05da5ab40b448195cbfdd71cd3a145d204330c7c4f708e26e9aead5 SHA512 9772aaa487284599ecbffabee4bc91d522c71797c3e08dddd549b4f13c1565f861c66a1b63feb72ce12b4432d852e259de2d22c9b82314ebcf28d10420736a63
+EBUILD compiz-9999.ebuild 3640 BLAKE2B 361ad9d52e6747d6765c4fc7c9fff95e94e39d77b62494d2b2c620962568365228c5881e73a9b673353c919d88745a29913a8a0d5e5dd641cb341d8536cee145 SHA512 9925d4dfe799deca91b9d8520274c389790115254d6cb0dd0c1e30f63c9d38f3be1f14b0c3544eb16b5f660f4d5b608e7ee369810f8948fea5327df681b4765e
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index dfd28b6..587ebc6 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -1,6 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils eutils gnome2-utils xdg-utils python-single-r1 toolchain-funcs
@@ -61,13 +62,13 @@ COMMONDEPEND="
 	virtual/opengl
 	virtual/glu
 	cairo? ( x11-libs/cairo[X] )
-	fuse? ( sys-fs/fuse )
+	fuse? ( sys-fs/fuse:= )
 	gtk? (
 		x11-libs/gtk+:3
 		x11-libs/libwnck:3
 		x11-libs/pango
 		gnome? (
-			gnome-base/gnome-desktop
+			gnome-base/gnome-desktop:=
 			gnome-base/gconf
 			x11-wm/metacity
 		)
@@ -87,10 +88,12 @@ DEPEND="${COMMONDEPEND}
 	)"
 
 RDEPEND="${COMMONDEPEND}
-	dev-python/pygtk
 	x11-apps/mesa-progs
 	x11-apps/xvinfo
 	x11-themes/hicolor-icon-theme"
+PATCHES=(
+	"${FILESDIR}/access_violation.patch"
+)
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
@@ -109,8 +112,7 @@ src_prepare() {
 	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
+		compizconfig/compizconfig-python/CMakeLists.txt || die
 	eapply_user
 }
 
diff --git a/x11-wm/compiz/files/access_violation.patch b/x11-wm/compiz/files/access_violation.patch
index 92af367..12df855 100644
--- a/x11-wm/compiz/files/access_violation.patch
+++ b/x11-wm/compiz/files/access_violation.patch
@@ -1,13 +1,13 @@
---- compizconfig/libcompizconfig/config/CMakeLists.txt.old	2015-02-03 12:09:12.000000000 +0100
-+++ compizconfig/libcompizconfig/config/CMakeLists.txt	2015-06-14 13:12:15.009100624 +0200
+--- compiz-9999/compizconfig/libcompizconfig/config/CMakeLists.txt.orig	2015-02-03 12:09:12.000000000 +0100
++++ compiz-9999/compizconfig/libcompizconfig/config/CMakeLists.txt	2015-06-14 13:12:15.009100624 +0200
 @@ -4,4 +4,4 @@
  configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config_test
  		${CMAKE_CURRENT_BINARY_DIR}/compiz-1/compizconfig/config)
  
 -install (FILES ${_config_file} DESTINATION ${COMPIZCONFIG_CONFIG_DIR})
 +install (FILES ${_config_file} DESTINATION $ENV{DESTDIR}${COMPIZCONFIG_CONFIG_DIR})
---- cmake/recompile_gsettings_schemas_in_dir_user_env.cmake.orig	2016-08-01 22:56:04.317994940 +0200
-+++ cmake/recompile_gsettings_schemas_in_dir_user_env.cmake	2016-08-01 22:58:03.707528553 +0200
+--- compiz-9999/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake.orig	2016-08-01 22:56:04.317994940 +0200
++++ compiz-9999/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake	2016-08-01 22:58:03.707528553 +0200
 @@ -18,6 +18,6 @@
  if (GLIB_COMPILE_SCHEMAS)
  
-- 
cgit v1.2.3