More fixes

4 files changed, 22 insertions, 31 deletions

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index d423ccb..43bc64b 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,4 +1,3 @@
 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 3722 BLAKE2B f0c6eb25bce77d59518d80c3784d9bbc839dcc795d88e0e41b4a7d198bae22589a3787562edd4e9683f3ee4973c7b514b94d2f368bb93c58b2254368e12df971 SHA512 943eda4d4bfb95562fed505cbb20ea8590d541686d47f3d42542913f70bf6c9c32ff12ecc2ac3baaa02f1f751d0d4d03138caee9f016f556487899e8217b917a
-EBUILD compiz-9999.ebuild 3581 BLAKE2B abb12c6fa19a1437af0183eba64dfdab63cae4051692ef35e96f16327ba55373548c527ebe5e22b222e1169a6d959635e48b0d9da04ebe1d8b109ce139ceacf6 SHA512 6458efb2b68f9d21863e6ca9523e74478d6597a089fd08fd4a37f64da3bdc701bca63e0667e20ccbe270ad67154a117d28b0138ae86fa7d28925a4e0f425f452
+EBUILD compiz-0.9.13.9999.ebuild 3783 BLAKE2B 1438138c5e3af32f3449d13f4548c4b510061adf822cfdc81c4419c18a01d2217f0bbe5b3729bc03ab9ec2c06801ba7c7ce6b0d532ae19d033cc3a8723624c13 SHA512 f3564aa75dc535fc76690d6598803b516b50a563f19277dea4a0c1b4ba97ab0209a2c74824457e161e92d36b8910f03540f3bf91df8eecf459f95cc54240ee37
+EBUILD compiz-9999.ebuild 3651 BLAKE2B 8fe3324b6007040bb2251a5f6b0c72d59f112144049524f2d470a3117cce3fd2e61e41088c332a3b90541597ba3ba2700d3366a40ffc20760cdac39598a7d491 SHA512 e85c8b2b3dbf772d8cb5d8e77528b2ab51cac5951a44df0a54ef1c218e3deeb4d06b4cf3bc68f75b412f25c934ab24fb6b1f671b7d8cd1706f3fc786de00dde7
diff --git a/x11-wm/compiz/compiz-0.9.13.9999.ebuild b/x11-wm/compiz/compiz-0.9.13.9999.ebuild
index b39291d..516d56a 100644
--- a/x11-wm/compiz/compiz-0.9.13.9999.ebuild
+++ b/x11-wm/compiz/compiz-0.9.13.9999.ebuild
@@ -113,6 +113,10 @@ src_unpack() {
 	fi
 }
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 	sed -i -e 's/CYTHON_BIN cython3/CYTHON_BIN cython/' compizconfig/compizconfig-python/CMakeLists.txt
@@ -120,10 +124,6 @@ src_prepare() {
 	eapply_user
 }
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 src_configure() {
 	use debug && CMAKE_BUILD_TYPE=Debug
 	local mycmakeargs=(
@@ -146,6 +146,11 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	python_optimize
+}
+
 pkg_preinst() {
 	use gnome && gnome2_gconf_savelist
 	gnome2_icon_savelist
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index 89d7215..b6146a0 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -103,6 +103,10 @@ pkg_pretend() {
 	fi
 }
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 	sed -i \
@@ -110,14 +114,9 @@ src_prepare() {
 		-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
 }
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 src_configure() {
 	use debug && CMAKE_BUILD_TYPE=Debug
 	local mycmakeargs=(
@@ -138,6 +137,11 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	python_optimize
+}
+
 pkg_preinst() {
 	use gnome && gnome2_gconf_savelist
 	gnome2_icon_savelist
@@ -145,6 +149,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use gnome && gnome2_gconf_install
+	xdg_desktop_database_update
 	xdg_icon_cache_update
 	if use dbus; then
 		ewarn "The dbus plugin is known to crash compiz in this version. Disable"
@@ -157,5 +162,6 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
+	xdg_desktop_database_update
 	xdg_icon_cache_update
 }
diff --git a/x11-wm/compiz/files/fix_pkgconfig_libdir.patch b/x11-wm/compiz/files/fix_pkgconfig_libdir.patch
deleted file mode 100644
index c154dc6..0000000
--- a/x11-wm/compiz/files/fix_pkgconfig_libdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- cmake/base.cmake.orig	2019-06-23 15:06:08.415173847 +0200
-+++ cmake/base.cmake	2019-06-23 15:08:18.866267616 +0200
-@@ -40,13 +40,13 @@
- 
- # add install prefix to pkgconfig search path if needed
- string (REGEX REPLACE "([\\+\\(\\)\\^\\\$\\.\\-\\*\\?\\|])" "\\\\\\1" PKGCONFIG_REGEX ${CMAKE_INSTALL_PREFIX})
--set (PKGCONFIG_REGEX ".*${PKGCONFIG_REGEX}/lib/pkgconfig:${PKGCONFIG_REGEX}/share/pkgconfig.*")
-+set (PKGCONFIG_REGEX ".*${PKGCONFIG_REGEX}/lib${LIB_SUFFIX}/pkgconfig:${PKGCONFIG_REGEX}/share/pkgconfig.*")
- 
- if (NOT "$ENV{PKG_CONFIG_PATH}" MATCHES "${PKGCONFIG_REGEX}")
-     if ("" STREQUAL "$ENV{PKG_CONFIG_PATH}")
--	set (ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
-+	set (ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
-     else ()
- 	set (ENV{PKG_CONFIG_PATH}
--	    "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-+	    "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-     endif ()
- endif ()