From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D14D558973 for ; Fri, 29 Jan 2016 10:34:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47AA3E0871; Fri, 29 Jan 2016 10:34:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F2DEE0871 for ; Fri, 29 Jan 2016 10:34:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8ABBD340C1A for ; Fri, 29 Jan 2016 10:34:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D54C38EC for ; Fri, 29 Jan 2016 10:34:01 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1454061864.82b1bdcc1fe9c333b7cf2e3990badb4ee5229c22.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 82b1bdcc1fe9c333b7cf2e3990badb4ee5229c22 X-VCS-Branch: master Date: Fri, 29 Jan 2016 10:34:01 +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-Archives-Salt: 5008951f-aeb6-4ec9-9e2e-d504f394f094 X-Archives-Hash: 9067e26d87ea2d6b0de035ec115c7502 commit: 82b1bdcc1fe9c333b7cf2e3990badb4ee5229c22 Author: Michael Palimaka gentoo org> AuthorDate: Fri Jan 29 10:04:24 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Jan 29 10:04:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=82b1bdcc kde5.eclass: port from fdo-mime to xdg This will ensure that both the desktop database and the mime database will always be updated, with the added benefit that the update will only be triggered if the relevant files are installed. eclass/kde5.eclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 2218212..70437b1 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -19,7 +19,7 @@ _KDE5_ECLASS=1 # for tests you should proceed with setting VIRTUALX_REQUIRED=test. : ${VIRTUALX_REQUIRED:=manual} -inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx +inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg if [[ ${KDE_BUILD_TYPE} = live ]]; then case ${KDE_SCM} in @@ -627,6 +627,7 @@ kde5_pkg_preinst() { debug-print-function ${FUNCNAME} "$@" gnome2_icon_savelist + xdg_pkg_preinst } # @FUNCTION: kde5_pkg_postinst @@ -636,7 +637,7 @@ kde5_pkg_postinst() { debug-print-function ${FUNCNAME} "$@" gnome2_icon_cache_update - fdo-mime_desktop_database_update + xdg_pkg_postinst } # @FUNCTION: kde5_pkg_postrm @@ -646,7 +647,7 @@ kde5_pkg_postrm() { debug-print-function ${FUNCNAME} "$@" gnome2_icon_cache_update - fdo-mime_desktop_database_update + xdg_pkg_postrm } fi