commit: 0ab0eccf1cba817194be494894987b02337eef3f Author: Georgy Yakovlev <ya <AT> sysdump <DOT> net> AuthorDate: Fri Feb 24 06:34:59 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Mar 3 13:12:22 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab0eccf
app-shells/fish: add nls support This adds nls useflag and includes backported upstream patch to honor LINGUAS. Fixes bug 409969. Closes: https://github.com/gentoo/gentoo/pull/4072 .../fish/files/fish-2.5.0-honor-linguas.patch | 32 ++++++++++++++++++++++ app-shells/fish/fish-2.5.0.ebuild | 9 ++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch b/app-shells/fish/files/fish-2.5.0-honor-linguas.patch new file mode 100644 index 00000000000..843036d6e5d --- /dev/null +++ b/app-shells/fish/files/fish-2.5.0-honor-linguas.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile.in b/Makefile.in +index 35e63ae..b73c612 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -195,11 +195,16 @@ ifeq ($(shell uname), Darwin) + endif + + # +-# All translation message catalogs ++# All translation message catalogs, filter files based on LINGUAS. + # + TRANSLATIONS_SRC := $(wildcard po/*.po) +-ifdef HAVE_GETTEXT ++ifeq ($(HAVE_GETTEXT), 1) + TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) ++ifdef LINGUAS ++ TRANSLATIONS_ALL := $(TRANSLATIONS) ++ TRANSLATIONS_WANTED = $(patsubst %,po/%.gmo,$(LINGUAS)) ++ TRANSLATIONS = $(filter $(TRANSLATIONS_WANTED),$(TRANSLATIONS_ALL)) ++endif + else + TRANSLATIONS := + endif +@@ -764,7 +769,7 @@ uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show + .PHONY: uninstall + + install-translations: $(TRANSLATIONS) | show-HAVE_GETTEXT +-ifdef HAVE_GETTEXT ++ifeq ($(HAVE_GETTEXT), 1) + @echo "Installing translations..." + $v for i in $(TRANSLATIONS); do \ + $(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/`basename $$i .gmo`/LC_MESSAGES; \ diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.5.0.ebuild index 5132a555abc..6d94ff16ddf 100644 --- a/app-shells/fish/fish-2.5.0.ebuild +++ b/app-shells/fish/fish-2.5.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" +IUSE="nls" RDEPEND=" >=dev-libs/libpcre2-10.21[pcre32] @@ -19,9 +19,11 @@ RDEPEND=" DEPEND=" ${RDEPEND} sys-devel/bc - sys-devel/gettext + nls? ( sys-devel/gettext ) " +PATCHES=( "${FILESDIR}/${P}-honor-linguas.patch" ) + src_configure() { # Set things up for fish to be a default shell. # It has to be in /bin in case /usr is unavailable. @@ -29,7 +31,8 @@ src_configure() { econf \ docdir="${EPREFIX}"/usr/share/doc/${PF} \ --bindir="${EPREFIX}"/bin \ - --without-included-pcre2 + --without-included-pcre2 \ + $(use_with nls gettext) } src_test() {
