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