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 05B7E1382C5 for ; Sun, 4 Mar 2018 22:11:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 402F0E0940; Sun, 4 Mar 2018 22:11:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 15ABDE092E for ; Sun, 4 Mar 2018 22:11:44 +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 1A3DA335C9E for ; Sun, 4 Mar 2018 22:11:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F027624D for ; Sun, 4 Mar 2018 22:11:38 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1520201473.5101c60417100439ea1902db0ee9b3ccb0bbc192.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mediainfo/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mediainfo/mediainfo-17.12.ebuild X-VCS-Directories: media-video/mediainfo/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 5101c60417100439ea1902db0ee9b3ccb0bbc192 X-VCS-Branch: master Date: Sun, 4 Mar 2018 22:11:38 +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: e42a1503-a716-4999-83e0-beec5e422274 X-Archives-Hash: d731e7b3565605a98db169364e338c8c commit: 5101c60417100439ea1902db0ee9b3ccb0bbc192 Author: Poncho spahan ch> AuthorDate: Wed Feb 14 12:16:17 2018 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sun Mar 4 22:11:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5101c604 media-video/mediainfo: don't install two desktop files, fix QA warnings. fix the following desktop file related QA warnings QA Notice: new icons were found installed but GTK+ icon cache has not been updated QA Notice: .desktop files with MimeType= were found installed but desktop mimeinfo cache has not been updated Closes: https://bugs.gentoo.org/638862 Closes: https://github.com/gentoo/gentoo/pull/7183 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-video/mediainfo/mediainfo-17.12.ebuild | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/media-video/mediainfo/mediainfo-17.12.ebuild b/media-video/mediainfo/mediainfo-17.12.ebuild index a6625f97df5..904d5ce192e 100644 --- a/media-video/mediainfo/mediainfo-17.12.ebuild +++ b/media-video/mediainfo/mediainfo-17.12.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 WX_GTK_VER="3.0" -inherit eutils autotools wxwidgets +inherit eutils gnome2-utils xdg-utils autotools wxwidgets DESCRIPTION="MediaInfo supplies technical and tag information about media files" HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo" @@ -34,8 +34,8 @@ src_prepare() { local target for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} - sed -i -e "s:-O2::" configure.ac + cd "${S}"/Project/GNU/${target} || die + sed -i -e "s:-O2::" configure.ac || die eautoreconf done } @@ -43,7 +43,7 @@ src_prepare() { src_configure() { local target for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} + cd "${S}"/Project/GNU/${target} || die local args="" [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui" econf ${args} @@ -53,19 +53,25 @@ src_configure() { src_compile() { local target for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} + cd "${S}"/Project/GNU/${target} || die default done } src_install() { local target for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} + cd "${S}"/Project/GNU/${target} || die default dodoc "${S}"/History_${target}.txt - if [[ ${target} == "GUI" ]]; then - newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png - make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK" - fi done } + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +}