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 6102513835A for ; Sat, 14 Nov 2020 21:48:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 472AFE086A; Sat, 14 Nov 2020 21:48:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 3282FE086A for ; Sat, 14 Nov 2020 21:48:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 84AC03411A6 for ; Sat, 14 Nov 2020 21:48:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C824E44F for ; Sat, 14 Nov 2020 21:48:25 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1605390420.60f1ad733a8bc66c792d1db101a4046e08666f24.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/xmind/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild app-misc/xmind/xmind-3.7.6_p201801311814.ebuild X-VCS-Directories: app-misc/xmind/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 60f1ad733a8bc66c792d1db101a4046e08666f24 X-VCS-Branch: master Date: Sat, 14 Nov 2020 21:48:25 +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: 7787901a-de63-4b07-80af-232af02e338c X-Archives-Hash: e34b7b6b0ae8ed20bb1ee8da4bde877c commit: 60f1ad733a8bc66c792d1db101a4046e08666f24 Author: Jakov Smolic sartura hr> AuthorDate: Sat Nov 14 21:47:00 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Nov 14 21:47:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f1ad73 app-misc/xmind: inherit xdg.eclass and optfeature.eclass Closes: https://bugs.gentoo.org/734254 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild | 17 ++++------------- app-misc/xmind/xmind-3.7.6_p201801311814.ebuild | 16 ++++------------ 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild index dfb4046680b..1851c251719 100644 --- a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild +++ b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit desktop eutils multilib gnome2-utils +inherit desktop eutils multilib optfeature xdg MY_PN="${PN}-portable" MY_P="${MY_PN}-${PV}" @@ -15,7 +15,6 @@ SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip LICENSE="EPL-1.0 LGPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" DEPEND="app-arch/unzip" RDEPEND=" @@ -75,15 +74,7 @@ src_install() { make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;" } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { - gnome2_icon_cache_update - elog "For audio notes support, install media-sound/lame" -} - -pkg_postrm() { - gnome2_icon_cache_update + xdg_pkg_postinst + optfeature "audio notes support" media-sound/lame } diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild index 03ce175e13f..67866d5575d 100644 --- a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild +++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit desktop font gnome2-utils +inherit desktop font optfeature xdg MY_PV="8-update7" MY_P="${PN}-${MY_PV}-linux" @@ -78,16 +78,8 @@ src_install() { font_src_install } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { - gnome2_icon_cache_update font_pkg_postinst - elog "For audio notes support, install media-sound/lame" -} - -pkg_postrm() { - gnome2_icon_cache_update + xdg_pkg_postinst + optfeature "audio notes support" media-sound/lame }