From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../files/intltool-0.50.2-absolute-paths.patch | 63 +++++++++++++++++++ .../files/intltool-0.50.2-localedir-fix.patch | 70 ++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch create mode 100644 dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch (limited to 'dev-util/intltool/files') diff --git a/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch b/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch new file mode 100644 index 000000000000..117f4a30c29b --- /dev/null +++ b/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch @@ -0,0 +1,63 @@ +From c262cb09fa9f4dad056ba5b25a8627408bcf909a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 14 Apr 2013 20:41:41 +0200 +Subject: [PATCH] Fix handling absolute paths in single file key output. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Michał Górny +Fixes: https://bugs.gentoo.org/show_bug.cgi?id=464954 +--- + intltool-merge.in | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/intltool-merge.in b/intltool-merge.in +index 1afa2a4..47dbbdf 100644 +--- a/intltool-merge.in ++++ b/intltool-merge.in +@@ -1108,13 +1108,20 @@ sub keys_merge_translation + { + my ($lang) = @_; + +- if ( ! -d $lang && $MULTIPLE_OUTPUT) ++ my $outpath = "$OUTFILE"; ++ ++ if ($MULTIPLE_OUTPUT) + { +- mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; ++ $outpath = "$lang/$outpath"; ++ ++ if ( ! -d $lang ) ++ { ++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; ++ } + } + + open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n"; +- open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; ++ open OUTPUT, ">$outpath" or die "Cannot open $outpath: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + + while () +@@ -1159,7 +1166,7 @@ sub keys_merge_translation + close OUTPUT; + close INPUT; + +- print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; ++ print "CREATED $outpath\n" unless $QUIET_ARG; + } + + sub keys_merge_translations +@@ -1174,7 +1181,7 @@ sub keys_merge_translations + } + else + { +- keys_merge_translation ("."); ++ keys_merge_translation (); + } + } + +-- +1.8.1.5 + diff --git a/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch b/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch new file mode 100644 index 000000000000..a887c41d3b52 --- /dev/null +++ b/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch @@ -0,0 +1,70 @@ +=== modified file 'Makefile.in.in' +--- Makefile.in.in 2013-05-12 18:38:08 +0000 ++++ Makefile.in.in 2013-05-22 13:43:26 +0000 +@@ -33,8 +33,7 @@ + datadir = @datadir@ + datarootdir = @datarootdir@ + libdir = @libdir@ +-DATADIRNAME = @DATADIRNAME@ +-itlocaledir = $(prefix)/$(DATADIRNAME)/locale ++localedir = @localedir@ + subdir = po + install_sh = @install_sh@ + # Automake >= 1.8 provides @mkdir_p@. +@@ -108,7 +107,7 @@ + install-data-yes: all + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ +- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ ++ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $$dir; \ + if test -r $$lang.gmo; then \ + $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ +@@ -142,8 +141,8 @@ + uninstall: + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ +- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ +- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + done + + check: all $(GETTEXT_PACKAGE).pot + +=== modified file 'intltool.m4' +--- intltool.m4 2012-02-20 14:50:33 +0000 ++++ intltool.m4 2013-05-12 17:08:09 +0000 +@@ -155,31 +155,6 @@ + # Substitute ALL_LINGUAS so we can use it in po/Makefile + AC_SUBST(ALL_LINGUAS) + +-# Set DATADIRNAME correctly if it is not set yet +-# (copied from glib-gettext.m4) +-if test -z "$DATADIRNAME"; then +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[]], +- [[extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr]])], +- [DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share +- dnl in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [DATADIRNAME=share], [DATADIRNAME=lib]) +- ;; +- *) +- [DATADIRNAME=lib] +- ;; +- esac]) +-fi +-AC_SUBST(DATADIRNAME) +- + IT_PO_SUBDIR([po]) + + ]) + -- cgit v1.2.3-65-gdbad