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@gentoo.org>

diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index b9d4d984f6dd42c1557f9c6d4eda53596c87690a..1c5774d1e7171f343164cabc09077509cfd74de4 100644 (file)
--- 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 49f4e63a42b26cb4783faa56044579d72dc91124..dc86361bb11d8eb3bd46dd294f93c2947044939a 100644 (file)
--- 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 a6e3aed2b30850ae8ed0aa2b9d3e297e1d8041e3..95c4ba7af871909ea6292815ef8ccc1664f487b8 100644 (file)
--- 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
 }