[gentoo-commits] repo/gentoo:master commit in: media-gfx/sxiv/

[Tim Harder]

commit:     e9fac96c4e3ae98d34aecc09961fb0be1b2e4054
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 05:26:53 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Feb  5 05:26:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9fac96c

media-gfx/sxiv: version bump to 26

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/sxiv/Manifest                             |  1 +
 media-gfx/sxiv/{sxiv-9999.ebuild => sxiv-26.ebuild} | 14 +++++---------
 media-gfx/sxiv/sxiv-9999.ebuild                     | 14 +++++---------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 3081a79574d..6d16ece80f6 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1 +1,2 @@
 DIST sxiv-25.tar.gz 48814 BLAKE2B 
17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8
 SHA512 
ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
+DIST sxiv-26.tar.gz 48569 BLAKE2B 
a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95
 SHA512 
c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb

diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
similarity index 83%
copy from media-gfx/sxiv/sxiv-9999.ebuild
copy to media-gfx/sxiv/sxiv-26.ebuild
index 348cf62e0e1..ff78c92751b 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
+inherit desktop xdg-utils savedconfig toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/muennich/sxiv.git";
@@ -47,16 +47,12 @@ src_install() {
        save_config config.h
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
 pkg_postinst() {
        xdg_desktop_database_update
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }
 
 pkg_postrm() {
        xdg_desktop_database_update
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }

diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 348cf62e0e1..ff78c92751b 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
+inherit desktop xdg-utils savedconfig toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/muennich/sxiv.git";
@@ -47,16 +47,12 @@ src_install() {
        save_config config.h
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
 pkg_postinst() {
        xdg_desktop_database_update
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }
 
 pkg_postrm() {
        xdg_desktop_database_update
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }