[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/

[Andreas Sturmlechner]

commit:     f62ec5c837533604cae31bd0d19db7f2ef43cf90
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 12:06:44 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 22 14:09:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62ec5c8

dev-util/cmake: Switch back to xdg-utils.eclass to avoid deps

Less deps at the cost of more lines.

Closes: https://bugs.gentoo.org/723512
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/cmake/cmake-3.13.5.ebuild | 18 +++++++++++-------
 dev-util/cmake/cmake-3.16.5.ebuild | 20 ++++++++++++--------
 dev-util/cmake/cmake-3.17.2.ebuild | 20 ++++++++++++--------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index b9d4d984f6d..1c5774d1e71 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
+inherit bash-completion-r1 cmake elisp-common flag-o-matic toolchain-funcs virtualx xdg-utils
 
 MY_P="${P/_/-}"
 
@@ -211,16 +211,20 @@ src_install() {
 	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
 }
 
-pkg_preinst() {
-	use qt5 && xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postinst
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postrm
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
 }

diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.16.5.ebuild
index 49f4e63a42b..dc86361bb11 100644
--- a/dev-util/cmake/cmake-3.16.5.ebuild
+++ b/dev-util/cmake/cmake-3.16.5.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg cmake
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
 
 MY_P="${P/_/-}"
 
@@ -201,16 +201,20 @@ src_install() {
 	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
 }
 
-pkg_preinst() {
-	use qt5 && xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postinst
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postrm
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
 }

diff --git a/dev-util/cmake/cmake-3.17.2.ebuild b/dev-util/cmake/cmake-3.17.2.ebuild
index a6e3aed2b30..95c4ba7af87 100644
--- a/dev-util/cmake/cmake-3.17.2.ebuild
+++ b/dev-util/cmake/cmake-3.17.2.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg cmake
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
 
 MY_P="${P/_/-}"
 
@@ -201,16 +201,20 @@ src_install() {
 	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
 }
 
-pkg_preinst() {
-	use qt5 && xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postinst
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postrm
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
 }