Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 2/3] eutils.eclass: Remove validate_desktop_entries function.
Date: Fri, 24 Nov 2017 12:59:16
Message-Id: fc3a3999f31780a7602984636d33befacf6a172f.1511526872.git.ulm@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/3] Further cleanup of eutils.eclass by "Ulrich Müller"
1 This function is no longer used in the tree. It was deprecated more
2 than 8 months ago in commit 650a1ebe8f63d3750908142e2117b24a8efc9403.
3 ---
4 eclass/eutils.eclass | 30 ------------------------------
5 1 file changed, 30 deletions(-)
6
7 diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
8 index 7fd4b847a649..972a2138aad7 100644
9 --- a/eclass/eutils.eclass
10 +++ b/eclass/eutils.eclass
11 @@ -314,36 +314,6 @@ _eutils_eprefix_init() {
12 has "${EAPI:-0}" 0 1 2 && : ${ED:=${D}} ${EPREFIX:=} ${EROOT:=${ROOT}}
13 }
14
15 -# @FUNCTION: validate_desktop_entries
16 -# @USAGE: [directories]
17 -# @DESCRIPTION:
18 -# Validate desktop entries using desktop-file-utils
19 -validate_desktop_entries() {
20 - eqawarn "validate_desktop_entries is deprecated and should be not be used."
21 - eqawarn ".desktop file validation is done implicitly by Portage now."
22 -
23 - _eutils_eprefix_init
24 - if [[ -x "${EPREFIX}"/usr/bin/desktop-file-validate ]] ; then
25 - einfo "Checking desktop entry validity"
26 - local directories=""
27 - for d in /usr/share/applications $@ ; do
28 - [[ -d ${ED}${d} ]] && directories="${directories} ${ED}${d}"
29 - done
30 - if [[ -n ${directories} ]] ; then
31 - for FILE in $(find ${directories} -name "*\.desktop" \
32 - -not -path '*.hidden*' | sort -u 2>/dev/null)
33 - do
34 - local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
35 - sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
36 - [[ -n $temp ]] && elog ${temp/--/${FILE/${ED}/}:}
37 - done
38 - fi
39 - echo ""
40 - else
41 - einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
42 - fi
43 -}
44 -
45 # @FUNCTION: make_session_desktop
46 # @USAGE: <title> <command> [command args...]
47 # @DESCRIPTION:
48 --
49 2.15.0