[gentoo-commits] repo/gentoo:master commit in: app-emacs/emacs-common-gentoo/

[Ulrich Müller]

commit:     66bd2c16de5af5d58a7413ba7cbb89e6b6c2f5aa
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 12:34:36 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 12:44:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66bd2c16

app-emacs/emacs-common-gentoo: Drop gnome2-utils.

gnome2_icon_savelist() and gnome2_icon_cache_update() are no longer
defined in EAPI 7. Use xdg_icon_cache_update as replacement.

Closes: https://bugs.gentoo.org/692520
Reported-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ...mon-gentoo-1.6-r2.ebuild => emacs-common-gentoo-1.6-r3.ebuild} | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
similarity index 94%
rename from app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild
rename to app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
index 6cd58fb8613..abe44b42f39 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1
+inherit elisp-common desktop xdg-utils readme.gentoo-r1
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
@@ -48,8 +48,6 @@ src_install() {
 		doicon -s scalable emacs23.svg
 		newicon -s scalable emacs25.svg emacs.svg
 		popd
-
-		gnome2_icon_savelist
 	fi
 
 	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
@@ -91,7 +89,7 @@ pkg_preinst() {
 pkg_postinst() {
 	if use X; then
 		xdg_desktop_database_update
-		gnome2_icon_cache_update
+		xdg_icon_cache_update
 	fi
 	readme.gentoo_print_elog
 }
@@ -99,6 +97,6 @@ pkg_postinst() {
 pkg_postrm() {
 	if use X; then
 		xdg_desktop_database_update
-		gnome2_icon_cache_update
+		xdg_icon_cache_update
 	fi
 }