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

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     1b351fe6533cf16ed689aee82bd4f817af25527c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 23:02:45 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 23:03:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b351fe6

app-misc/golly: use desktop/xdg-utils eclasses instead of gnome-2

Reported-by:  Agostino Sarubbo
Closes: https://bugs.gentoo.org/709262
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-misc/golly/{golly-3.3.ebuild => golly-3.3-r1.ebuild} | 12 ++++--------
 app-misc/golly/golly-3.3.ebuild                          | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
similarity index 81%
copy from app-misc/golly/golly-3.3.ebuild
copy to app-misc/golly/golly-3.3-r1.ebuild
index f3319b32e24..dffedc97b55 100644
--- a/app-misc/golly/golly-3.3.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 WX_GTK_VER=3.0
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
+inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
 
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/"
@@ -42,14 +42,10 @@ src_install() {
 	make_desktop_entry ${PN} "Golly" ${PN} "Science"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
index f3319b32e24..dffedc97b55 100644
--- a/app-misc/golly/golly-3.3.ebuild
+++ b/app-misc/golly/golly-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 WX_GTK_VER=3.0
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
+inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
 
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/"
@@ -42,14 +42,10 @@ src_install() {
 	make_desktop_entry ${PN} "Golly" ${PN} "Science"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }