From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E2F01382C5 for ; Fri, 22 May 2020 14:09:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9044EE08AE; Fri, 22 May 2020 14:09:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 699E9E08AE for ; Fri, 22 May 2020 14:09:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F2AE34F2A0 for ; Fri, 22 May 2020 14:09:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65A7B257 for ; Fri, 22 May 2020 14:09:43 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1590156568.f62ec5c837533604cae31bd0d19db7f2ef43cf90.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.13.5.ebuild dev-util/cmake/cmake-3.16.5.ebuild dev-util/cmake/cmake-3.17.2.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f62ec5c837533604cae31bd0d19db7f2ef43cf90 X-VCS-Branch: master Date: Fri, 22 May 2020 14:09:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1ef23459-4e75-44fe-9aa9-346596d948b6 X-Archives-Hash: 49e0abe434da0c46d0950bc676730fa8 commit: f62ec5c837533604cae31bd0d19db7f2ef43cf90 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 22 12:06:44 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 }