1 |
commit: 715ab2bcc90b347358a3b04b704d63734f11f5ba |
2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 23 17:56:59 2020 +0000 |
4 |
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 23 18:02:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=715ab2bc |
7 |
|
8 |
vdr-plugin-2.eclass: ls: cannot access /.../po : No such file or directory fixed |
9 |
|
10 |
portage complain about this behavior on old media-plugins/vdr-* |
11 |
they are not converted to gettext language handling. |
12 |
the small fix will detect and surpress this messsage. |
13 |
add detailed description for this helper function. |
14 |
whitespace |
15 |
|
16 |
Closes: |
17 |
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> |
18 |
|
19 |
eclass/vdr-plugin-2.eclass | 13 ++++++++----- |
20 |
1 file changed, 8 insertions(+), 5 deletions(-) |
21 |
|
22 |
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass |
23 |
index 5a0792efe93..67ccb1e6ab1 100644 |
24 |
--- a/eclass/vdr-plugin-2.eclass |
25 |
+++ b/eclass/vdr-plugin-2.eclass |
26 |
@@ -1,4 +1,4 @@ |
27 |
-# Copyright 1999-2019 Gentoo Authors |
28 |
+# Copyright 1999-2020 Gentoo Authors |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
# @ECLASS: vdr-plugin-2.eclass |
32 |
@@ -176,7 +176,7 @@ vdr_create_header_checksum_file() { |
33 |
} |
34 |
|
35 |
fix_vdr_libsi_include() { |
36 |
- eqawarn "Fixing include of libsi-headers" |
37 |
+ eqawarn "Fixing include of libsi-headers" |
38 |
local f |
39 |
for f; do |
40 |
sed -i "${f}" \ |
41 |
@@ -250,7 +250,8 @@ vdr_gettext_missing() { |
42 |
} |
43 |
|
44 |
vdr_detect_po_dir() { |
45 |
- # helper function |
46 |
+# helper function to find the |
47 |
+# DIR ${S}/po or DIR ${S]/_subdir_/po |
48 |
|
49 |
[[ -f po ]] && local po_dir="${S}" |
50 |
local po_subdir=( ${S}/${PO_SUBDIR} ) |
51 |
@@ -270,7 +271,9 @@ vdr_linguas_support() { |
52 |
vdr_detect_po_dir |
53 |
|
54 |
for f in ${pofile_dir[*]}; do |
55 |
- PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) |
56 |
+ if [[ -d ${f}/po ]]; then |
57 |
+ PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) |
58 |
+ fi |
59 |
einfo "LINGUAS=\"${PLUGIN_LINGUAS}\"" |
60 |
|
61 |
sed -i ${f}/Makefile \ |
62 |
@@ -282,7 +285,7 @@ vdr_linguas_support() { |
63 |
} |
64 |
|
65 |
vdr_i18n() { |
66 |
-# i18n handling was deprecated since >=media-video/vdr-1.5.9, |
67 |
+# i18n handling was deprecated since >=media-video/vdr-1.5.9, |
68 |
# finally with >=media-video/vdr-1.7.27 it has been dropped entirely and some |
69 |
# plugins will fail to compile because they're still using the old variant. |
70 |
# Simply remove the i18n.o object from Makefile (OBJECT) and |