commit:     b6f8d947e3ffb7c79cfcc9da9d2253536df4636d
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Wed Nov 25 21:57:08 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Nov 25 21:57:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b6f8d947

*/*: don't explicitly call xdg-utils functions

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 app-text/komikku/komikku-0.12.0.ebuild                         | 10 +++-------
 app-text/komikku/komikku-0.15.0.ebuild                         | 10 +++-------
 games-emulation/melonds/melonds-0.8.3.ebuild                   |  9 ++-------
 games-emulation/melonds/melonds-0.9.ebuild                     |  8 +-------
 games-emulation/melonds/melonds-9999.ebuild                    |  8 +-------
 net-im/nheko/nheko-0.7.1.ebuild                                |  2 +-
 net-im/nheko/nheko-0.7.2.ebuild                                |  2 +-
 .../torbrowser-launcher/torbrowser-launcher-0.3.2.ebuild       |  8 +-------
 .../torbrowser-launcher/torbrowser-launcher-0.3.3.ebuild       |  8 +-------
 www-client/torbrowser-launcher/torbrowser-launcher-9999.ebuild |  8 +-------
 x11-misc/gammy/gammy-0.9.58a.ebuild                            | 10 ----------
 x11-misc/gammy/gammy-0.9.59.ebuild                             | 10 ----------
 x11-misc/gammy/gammy-9999.ebuild                               | 10 ----------
 13 files changed, 15 insertions(+), 88 deletions(-)

diff --git a/app-text/komikku/komikku-0.12.0.ebuild 
b/app-text/komikku/komikku-0.12.0.ebuild
index 0198a0a2..23ecb7bb 100644
--- a/app-text/komikku/komikku-0.12.0.ebuild
+++ b/app-text/komikku/komikku-0.12.0.ebuild
@@ -53,21 +53,17 @@ src_test() {
 
 pkg_preinst() {
        gnome2_schemas_savelist
-       xdg_environment_reset
+       xdg_pkg_preinst
 }
 
 pkg_postinst() {
        gnome2_gconf_install
        gnome2_schemas_update
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
+       xdg_pkg_postinst
 }
 
 pkg_postrm() {
        gnome2_gconf_uninstall
        gnome2_schemas_update
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
+       xdg_pkg_postrm
 }

diff --git a/app-text/komikku/komikku-0.15.0.ebuild 
b/app-text/komikku/komikku-0.15.0.ebuild
index 0198a0a2..23ecb7bb 100644
--- a/app-text/komikku/komikku-0.15.0.ebuild
+++ b/app-text/komikku/komikku-0.15.0.ebuild
@@ -53,21 +53,17 @@ src_test() {
 
 pkg_preinst() {
        gnome2_schemas_savelist
-       xdg_environment_reset
+       xdg_pkg_preinst
 }
 
 pkg_postinst() {
        gnome2_gconf_install
        gnome2_schemas_update
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
+       xdg_pkg_postinst
 }
 
 pkg_postrm() {
        gnome2_gconf_uninstall
        gnome2_schemas_update
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
+       xdg_pkg_postrm
 }

diff --git a/games-emulation/melonds/melonds-0.8.3.ebuild 
b/games-emulation/melonds/melonds-0.8.3.ebuild
index ddd58073..ee801375 100644
--- a/games-emulation/melonds/melonds-0.8.3.ebuild
+++ b/games-emulation/melonds/melonds-0.8.3.ebuild
@@ -36,8 +36,8 @@ RDEPEND="
 "
 
 pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
+       xdg_pkg_postinst
+
        elog "You need the following files in order to run melonDS:"
        elog "- bios7.bin"
        elog "- bios9.bin"
@@ -47,8 +47,3 @@ pkg_postinst() {
        elog "The romlist.bin file can be found in the /usr/share/melonDS 
directory"
        elog "The rest of those files can be found somewhere in the internet 
;-)"
 }
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

diff --git a/games-emulation/melonds/melonds-0.9.ebuild 
b/games-emulation/melonds/melonds-0.9.ebuild
index d7c1be9b..940706ef 100644
--- a/games-emulation/melonds/melonds-0.9.ebuild
+++ b/games-emulation/melonds/melonds-0.9.ebuild
@@ -41,8 +41,7 @@ RDEPEND="
 "
 
 pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
+       xdg_pkg_postinst
 
        elog "You need the following files in order to run melonDS:"
        elog "- bios7.bin"
@@ -52,8 +51,3 @@ pkg_postinst() {
        elog "Place them in ~/.config/melonDS"
        elog "Those files can be found somewhere on the Internet ;-)"
 }
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

diff --git a/games-emulation/melonds/melonds-9999.ebuild 
b/games-emulation/melonds/melonds-9999.ebuild
index d7c1be9b..940706ef 100644
--- a/games-emulation/melonds/melonds-9999.ebuild
+++ b/games-emulation/melonds/melonds-9999.ebuild
@@ -41,8 +41,7 @@ RDEPEND="
 "
 
 pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
+       xdg_pkg_postinst
 
        elog "You need the following files in order to run melonDS:"
        elog "- bios7.bin"
@@ -52,8 +51,3 @@ pkg_postinst() {
        elog "Place them in ~/.config/melonDS"
        elog "Those files can be found somewhere on the Internet ;-)"
 }
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

diff --git a/net-im/nheko/nheko-0.7.1.ebuild b/net-im/nheko/nheko-0.7.1.ebuild
index 43287ca3..16b387a0 100644
--- a/net-im/nheko/nheko-0.7.1.ebuild
+++ b/net-im/nheko/nheko-0.7.1.ebuild
@@ -34,7 +34,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
        cmake_src_prepare
-       xdg_environment_reset
+       xdg_src_prepare
 
        # TODO: Unbundle SingleApplication, blurhash and cpp-httplib.
 }

diff --git a/net-im/nheko/nheko-0.7.2.ebuild b/net-im/nheko/nheko-0.7.2.ebuild
index e6ce8bd1..b226c0c4 100644
--- a/net-im/nheko/nheko-0.7.2.ebuild
+++ b/net-im/nheko/nheko-0.7.2.ebuild
@@ -34,7 +34,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
        cmake_src_prepare
-       xdg_environment_reset
+       xdg_src_prepare
 
        # TODO: Unbundle SingleApplication, blurhash and cpp-httplib.
 }

diff --git a/www-client/torbrowser-launcher/torbrowser-launcher-0.3.2.ebuild 
b/www-client/torbrowser-launcher/torbrowser-launcher-0.3.2.ebuild
index a228e582..d62241c3 100644
--- a/www-client/torbrowser-launcher/torbrowser-launcher-0.3.2.ebuild
+++ b/www-client/torbrowser-launcher/torbrowser-launcher-0.3.2.ebuild
@@ -46,13 +46,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
+       xdg_pkg_postinst
 
        elog "For updating over system TOR install net-vpn/tor and 
dev-python/txsocksx"
 }
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

diff --git a/www-client/torbrowser-launcher/torbrowser-launcher-0.3.3.ebuild 
b/www-client/torbrowser-launcher/torbrowser-launcher-0.3.3.ebuild
index a228e582..d62241c3 100644
--- a/www-client/torbrowser-launcher/torbrowser-launcher-0.3.3.ebuild
+++ b/www-client/torbrowser-launcher/torbrowser-launcher-0.3.3.ebuild
@@ -46,13 +46,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
+       xdg_pkg_postinst
 
        elog "For updating over system TOR install net-vpn/tor and 
dev-python/txsocksx"
 }
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

diff --git a/www-client/torbrowser-launcher/torbrowser-launcher-9999.ebuild 
b/www-client/torbrowser-launcher/torbrowser-launcher-9999.ebuild
index a228e582..d62241c3 100644
--- a/www-client/torbrowser-launcher/torbrowser-launcher-9999.ebuild
+++ b/www-client/torbrowser-launcher/torbrowser-launcher-9999.ebuild
@@ -46,13 +46,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
+       xdg_pkg_postinst
 
        elog "For updating over system TOR install net-vpn/tor and 
dev-python/txsocksx"
 }
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

diff --git a/x11-misc/gammy/gammy-0.9.58a.ebuild 
b/x11-misc/gammy/gammy-0.9.58a.ebuild
index 3a75f14f..5f1989cd 100644
--- a/x11-misc/gammy/gammy-0.9.58a.ebuild
+++ b/x11-misc/gammy/gammy-0.9.58a.ebuild
@@ -50,13 +50,3 @@ src_install() {
 
        make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings"
 }
-
-pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

diff --git a/x11-misc/gammy/gammy-0.9.59.ebuild 
b/x11-misc/gammy/gammy-0.9.59.ebuild
index 3a75f14f..5f1989cd 100644
--- a/x11-misc/gammy/gammy-0.9.59.ebuild
+++ b/x11-misc/gammy/gammy-0.9.59.ebuild
@@ -50,13 +50,3 @@ src_install() {
 
        make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings"
 }
-
-pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

diff --git a/x11-misc/gammy/gammy-9999.ebuild b/x11-misc/gammy/gammy-9999.ebuild
index 3a75f14f..5f1989cd 100644
--- a/x11-misc/gammy/gammy-9999.ebuild
+++ b/x11-misc/gammy/gammy-9999.ebuild
@@ -50,13 +50,3 @@ src_install() {
 
        make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings"
 }
-
-pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_icon_cache_update
-}

Reply via email to