[gentoo-commits] repo/gentoo:master commit in: eclass/

[David Seifert]

commit:     bc7675865f8f89016e64865db0a40083de2d6784
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  8 15:31:49 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 15:31:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc767586

xdg-utils.eclass: drop support for EAPI 5 and 6

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 eclass/xdg-utils.eclass | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
index 84f88eee18fc..de383d88cf95 100644
--- a/eclass/xdg-utils.eclass
+++ b/eclass/xdg-utils.eclass
@@ -7,7 +7,7 @@
 # freedesktop-b...@gentoo.org
 # @AUTHOR:
 # Original author: Gilles Dartiguelongue <e...@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Auxiliary functions commonly used by XDG compliant packages.
 # @DESCRIPTION:
 # This eclass provides a set of auxiliary functions needed by most XDG
@@ -18,10 +18,6 @@
 #  * XDG mime information database management
 
 case ${EAPI} in
-       5|6)
-               ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated 
EAPI ${EAPI}!"
-               ewarn "${CATEGORY}/${PF}: Support will be removed on 
2024-10-08. Please port to newer EAPI."
-               ;;
        7|8) ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
@@ -72,7 +68,7 @@ xdg_desktop_database_update() {
        fi
 
        ebegin "Updating .desktop files database"
-       update-desktop-database -q "${EROOT%/}${DESKTOP_DATABASE_DIR}"
+       update-desktop-database -q "${EROOT}${DESKTOP_DATABASE_DIR}"
        eend $?
 }
 
@@ -93,7 +89,7 @@ xdg_icon_cache_update() {
        ebegin "Updating icons cache"
        local dir retval=0
        local fails=()
-       for dir in "${EROOT%/}"/usr/share/icons/*; do
+       for dir in "${EROOT}"/usr/share/icons/*; do
                if [[ -f ${dir}/index.theme ]]; then
                        if ! gtk-update-icon-cache -qf "${dir}"; then
                                debug-print "Updating cache failed on ${dir}"
@@ -134,6 +130,6 @@ xdg_mimeinfo_database_update() {
        local -x PKGSYSTEM_ENABLE_FSYNC=0
 
        ebegin "Updating shared mime info database"
-       update-mime-database "${EROOT%/}${MIMEINFO_DATABASE_DIR}"
+       update-mime-database "${EROOT}${MIMEINFO_DATABASE_DIR}"
        eend $?
 }