From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EA9E41388C1 for ; Fri, 1 Jan 2016 07:55:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11465E085B; Fri, 1 Jan 2016 07:55:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8D5FE085B for ; Fri, 1 Jan 2016 07:55:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6AD32340831 for ; Fri, 1 Jan 2016 07:55:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3D50B5D for ; Fri, 1 Jan 2016 07:55:32 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1451634909.68efac96d646a880a0941040b53290275e8bb85e.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/aegisub/aegisub-3.0.4.ebuild media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch X-VCS-Directories: media-video/aegisub/files/ media-video/aegisub/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 68efac96d646a880a0941040b53290275e8bb85e X-VCS-Branch: master Date: Fri, 1 Jan 2016 07:55:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c6eb80f-3867-42d8-9bb0-48d568b8e4fc X-Archives-Hash: f7bb4fcf5b6129f5b3106e20d875f862 commit: 68efac96d646a880a0941040b53290275e8bb85e Author: Ilya Tumaykin gmail com> AuthorDate: Fri Jan 1 02:53:07 2016 +0000 Commit: Ian Delaney gentoo 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)