[gentoo-commits] repo/gentoo:master commit in: app-misc/xmind/

["David Seifert" <soap@gentoo.org>]

commit:     60f1ad733a8bc66c792d1db101a4046e08666f24
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Nov 14 21:47:00 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> 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
 }