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

[Andreas Sturmlechner]

commit:     1e2ad588144c99bde794caa503273a883a807219
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 16:53:47 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 19:06:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2ad588

app-misc/xmind: EAPI-7 bump, add missing pkg_postrm

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-misc/xmind/xmind-3.7.6_p201801311814.ebuild | 26 ++++++++++++-------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild 
b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
index 7ee0129f5e3..6dd4d5a8ae8 100644
--- a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
@@ -1,30 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+MY_P="${PN}-8-update7-linux"
 inherit desktop font optfeature xdg
 
-MY_PV="8-update7"
-MY_P="${PN}-${MY_PV}-linux"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
+DESCRIPTION="Brainstorming and mind mapping software tool"
 HOMEPAGE="https://www.xmind.net";
 SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
        https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz";
+S="${WORKDIR}"
+
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND="
        >=virtual/jre-1.8
        x11-libs/gtk+:2
 "
 
-S=${WORKDIR}
-
 QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
 QA_FLAGS_IGNORED="
        
opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444/eclipse_1617.so
@@ -36,12 +34,7 @@ FONT_SUFFIX="ttf"
 FONT_S="${S}/fonts"
 
 src_configure() {
-       if use amd64; then
-               XDIR="XMind_amd64"
-       else
-               XDIR="XMind_i386"
-       fi
-       mv "$XDIR" XMind || die
+       mv "XMind_$(usex amd64 amd64 i386)" XMind || die
        # force data instance & config area to be at home/.xmind directory
        sed \
                -e '/-configuration/d' \
@@ -83,3 +76,8 @@ pkg_postinst() {
        xdg_pkg_postinst
        optfeature "audio notes support" media-sound/lame
 }
+
+pkg_postrm() {
+       font_pkg_postrm
+       xdg_pkg_postrm
+}