1 |
commit: 68efac96d646a880a0941040b53290275e8bb85e |
2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jan 1 02:53:07 2016 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 07:55:09 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68efac96 |
7 |
|
8 |
media-video/aegisub: fix installation of 3.0.4 with empty LINGUAS |
9 |
|
10 |
3.2.2 and live are not affected. |
11 |
|
12 |
Package-Manager: portage-2.2.24 |
13 |
|
14 |
media-video/aegisub/aegisub-3.0.4.ebuild | 3 ++- |
15 |
...isub-3.0.4-fix-install-with-empty-LINGUAS.patch | 23 ++++++++++++++++++++++ |
16 |
2 files changed, 25 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild |
19 |
index 6320424..93bc4fe 100644 |
20 |
--- a/media-video/aegisub/aegisub-3.0.4.ebuild |
21 |
+++ b/media-video/aegisub/aegisub-3.0.4.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2015 Gentoo Foundation |
24 |
+# Copyright 1999-2016 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
# $Id$ |
27 |
|
28 |
@@ -57,6 +57,7 @@ REQUIRED_USE=" |
29 |
|
30 |
PATCHES=( |
31 |
"${FILESDIR}/${P}-fix-lua-macro.patch" |
32 |
+ "${FILESDIR}/${P}-fix-install-with-empty-LINGUAS.patch" |
33 |
"${FILESDIR}/${P}-respect-user-compiler-flags.patch" |
34 |
) |
35 |
|
36 |
|
37 |
diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch |
38 |
new file mode 100644 |
39 |
index 0000000..59927d3 |
40 |
--- /dev/null |
41 |
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch |
42 |
@@ -0,0 +1,23 @@ |
43 |
+Upstream always installs all available localization files. We workaround it by |
44 |
+sed'ing out unneeded languages from PO variable in aegisub/po/Makefile file. |
45 |
+This can lead to an empty PO definition and in this case install target fails. |
46 |
+Thus a simple guard is introduced to prevent this fail. |
47 |
+ |
48 |
+diff --git a/aegisub/po/Makefile b/aegisub/po/Makefile |
49 |
+index 0b73bde..957c123 100644 |
50 |
+--- a/aegisub/po/Makefile |
51 |
++++ b/aegisub/po/Makefile |
52 |
+@@ -38,11 +38,13 @@ all: $(MO) |
53 |
+ $(BIN_MSGFMT) -o $@ $< |
54 |
+ |
55 |
+ install: |
56 |
++ifdef PO |
57 |
+ @$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix $(DESTDIR)$(P_LOCALE)/, $(basename $(PO)))) |
58 |
+ @for i in $(basename $(PO)); do \ |
59 |
+ echo $(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \ |
60 |
+ $(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \ |
61 |
+ done |
62 |
++endif |
63 |
+ |
64 |
+ |
65 |
+ CLEANFILES = $(MO) |