[gentoo-commits] repo/proj/guru:master commit in: app-office/pyspread/

[Andrew Ammerlaan]

commit:     14b589b00430c82befbd8fb2e0d9ab654372cac4
Author:     Maciej Barć <xgqt <AT> protonmail <DOT> com>
AuthorDate: Mon Nov  9 12:37:08 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Nov  9 12:38:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14b589b0

app-office/pyspread: domenu for .desktop; install icons; rm empty USE

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Maciej Barć <xgqt <AT> protonmail.com>

 app-office/pyspread/pyspread-1.99.2-r1.ebuild | 9 ++++-----
 app-office/pyspread/pyspread-1.99.4.ebuild    | 9 ++++-----
 app-office/pyspread/pyspread-9999.ebuild      | 9 ++++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app-office/pyspread/pyspread-1.99.2-r1.ebuild 
b/app-office/pyspread/pyspread-1.99.2-r1.ebuild
index f88641b1..4cfdb881 100644
--- a/app-office/pyspread/pyspread-1.99.2-r1.ebuild
+++ b/app-office/pyspread/pyspread-1.99.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit eutils xdg distutils-r1
+inherit eutils xdg desktop distutils-r1
 
 DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python"
 HOMEPAGE="https://pyspread.gitlab.io";
@@ -21,7 +21,6 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
        >=dev-python/PyQt5-5.10.0[svg,${PYTHON_USEDEP}]
@@ -40,7 +39,7 @@ python_prepare_all() {
 python_install() {
        distutils-r1_python_install
 
-       # Install the provided desktop file
-       insinto /usr/share/applications
-       doins "${PN}.desktop"
+       doicon "${PN}"/share/icons/"${PN}.ico"
+       doicon "${PN}"/share/icons/"${PN}.svg"
+       domenu "${PN}.desktop"
 }

diff --git a/app-office/pyspread/pyspread-1.99.4.ebuild 
b/app-office/pyspread/pyspread-1.99.4.ebuild
index f88641b1..4cfdb881 100644
--- a/app-office/pyspread/pyspread-1.99.4.ebuild
+++ b/app-office/pyspread/pyspread-1.99.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit eutils xdg distutils-r1
+inherit eutils xdg desktop distutils-r1
 
 DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python"
 HOMEPAGE="https://pyspread.gitlab.io";
@@ -21,7 +21,6 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
        >=dev-python/PyQt5-5.10.0[svg,${PYTHON_USEDEP}]
@@ -40,7 +39,7 @@ python_prepare_all() {
 python_install() {
        distutils-r1_python_install
 
-       # Install the provided desktop file
-       insinto /usr/share/applications
-       doins "${PN}.desktop"
+       doicon "${PN}"/share/icons/"${PN}.ico"
+       doicon "${PN}"/share/icons/"${PN}.svg"
+       domenu "${PN}.desktop"
 }

diff --git a/app-office/pyspread/pyspread-9999.ebuild 
b/app-office/pyspread/pyspread-9999.ebuild
index f88641b1..4cfdb881 100644
--- a/app-office/pyspread/pyspread-9999.ebuild
+++ b/app-office/pyspread/pyspread-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit eutils xdg distutils-r1
+inherit eutils xdg desktop distutils-r1
 
 DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python"
 HOMEPAGE="https://pyspread.gitlab.io";
@@ -21,7 +21,6 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
        >=dev-python/PyQt5-5.10.0[svg,${PYTHON_USEDEP}]
@@ -40,7 +39,7 @@ python_prepare_all() {
 python_install() {
        distutils-r1_python_install
 
-       # Install the provided desktop file
-       insinto /usr/share/applications
-       doins "${PN}.desktop"
+       doicon "${PN}"/share/icons/"${PN}.ico"
+       doicon "${PN}"/share/icons/"${PN}.svg"
+       domenu "${PN}.desktop"
 }