commit: 68efac96d646a880a0941040b53290275e8bb85e Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> AuthorDate: Fri Jan 1 02:53:07 2016 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Fri Jan 1 07:55:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68efac96
media-video/aegisub: fix installation of 3.0.4 with empty LINGUAS 3.2.2 and live are not affected. Package-Manager: portage-2.2.24 media-video/aegisub/aegisub-3.0.4.ebuild | 3 ++- ...isub-3.0.4-fix-install-with-empty-LINGUAS.patch | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild index 6320424..93bc4fe 100644 --- a/media-video/aegisub/aegisub-3.0.4.ebuild +++ b/media-video/aegisub/aegisub-3.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -57,6 +57,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}/${P}-fix-lua-macro.patch" + "${FILESDIR}/${P}-fix-install-with-empty-LINGUAS.patch" "${FILESDIR}/${P}-respect-user-compiler-flags.patch" ) 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 new file mode 100644 index 0000000..59927d3 --- /dev/null +++ b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch @@ -0,0 +1,23 @@ +Upstream always installs all available localization files. We workaround it by +sed'ing out unneeded languages from PO variable in aegisub/po/Makefile file. +This can lead to an empty PO definition and in this case install target fails. +Thus a simple guard is introduced to prevent this fail. + +diff --git a/aegisub/po/Makefile b/aegisub/po/Makefile +index 0b73bde..957c123 100644 +--- a/aegisub/po/Makefile ++++ b/aegisub/po/Makefile +@@ -38,11 +38,13 @@ all: $(MO) + $(BIN_MSGFMT) -o $@ $< + + install: ++ifdef PO + @$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix $(DESTDIR)$(P_LOCALE)/, $(basename $(PO)))) + @for i in $(basename $(PO)); do \ + echo $(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \ + $(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \ + done ++endif + + + CLEANFILES = $(MO)