Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/golly/
Date: Tue, 11 Feb 2020 23:03:12
Message-Id: 1581462181.1b351fe6533cf16ed689aee82bd4f817af25527c.slyfox@gentoo
1 commit: 1b351fe6533cf16ed689aee82bd4f817af25527c
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 11 23:02:45 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 11 23:03:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b351fe6
7
8 app-misc/golly: use desktop/xdg-utils eclasses instead of gnome-2
9
10 Reported-by: Agostino Sarubbo
11 Closes: https://bugs.gentoo.org/709262
12 Package-Manager: Portage-2.3.88, Repoman-2.3.20
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 app-misc/golly/{golly-3.3.ebuild => golly-3.3-r1.ebuild} | 12 ++++--------
16 app-misc/golly/golly-3.3.ebuild | 12 ++++--------
17 2 files changed, 8 insertions(+), 16 deletions(-)
18
19 diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
20 similarity index 81%
21 copy from app-misc/golly/golly-3.3.ebuild
22 copy to app-misc/golly/golly-3.3-r1.ebuild
23 index f3319b32e24..dffedc97b55 100644
24 --- a/app-misc/golly/golly-3.3.ebuild
25 +++ b/app-misc/golly/golly-3.3-r1.ebuild
26 @@ -1,4 +1,4 @@
27 -# Copyright 1999-2019 Gentoo Authors
28 +# Copyright 1999-2020 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI=7
32 @@ -6,7 +6,7 @@ EAPI=7
33 WX_GTK_VER=3.0
34 PYTHON_COMPAT=( python2_7 )
35
36 -inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
37 +inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
38
39 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
40 HOMEPAGE="http://golly.sourceforge.net/"
41 @@ -42,14 +42,10 @@ src_install() {
42 make_desktop_entry ${PN} "Golly" ${PN} "Science"
43 }
44
45 -pkg_preinst() {
46 - gnome2_icon_savelist
47 -}
48 -
49 pkg_postinst() {
50 - gnome2_icon_cache_update
51 + xdg_icon_cache_update
52 }
53
54 pkg_postrm() {
55 - gnome2_icon_cache_update
56 + xdg_icon_cache_update
57 }
58
59 diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
60 index f3319b32e24..dffedc97b55 100644
61 --- a/app-misc/golly/golly-3.3.ebuild
62 +++ b/app-misc/golly/golly-3.3.ebuild
63 @@ -1,4 +1,4 @@
64 -# Copyright 1999-2019 Gentoo Authors
65 +# Copyright 1999-2020 Gentoo Authors
66 # Distributed under the terms of the GNU General Public License v2
67
68 EAPI=7
69 @@ -6,7 +6,7 @@ EAPI=7
70 WX_GTK_VER=3.0
71 PYTHON_COMPAT=( python2_7 )
72
73 -inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
74 +inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
75
76 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
77 HOMEPAGE="http://golly.sourceforge.net/"
78 @@ -42,14 +42,10 @@ src_install() {
79 make_desktop_entry ${PN} "Golly" ${PN} "Science"
80 }
81
82 -pkg_preinst() {
83 - gnome2_icon_savelist
84 -}
85 -
86 pkg_postinst() {
87 - gnome2_icon_cache_update
88 + xdg_icon_cache_update
89 }
90
91 pkg_postrm() {
92 - gnome2_icon_cache_update
93 + xdg_icon_cache_update
94 }