diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-util/intltool | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
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 <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-util/intltool')
-rw-r--r-- | dev-util/intltool/Manifest | 2 | ||||
-rw-r--r-- | dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch | 63 | ||||
-rw-r--r-- | dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch | 70 | ||||
-rw-r--r-- | dev-util/intltool/intltool-0.50.2-r1.ebuild | 33 | ||||
-rw-r--r-- | dev-util/intltool/intltool-0.51.0.ebuild | 30 | ||||
-rw-r--r-- | dev-util/intltool/metadata.xml | 11 |
6 files changed, 209 insertions, 0 deletions
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest new file mode 100644 index 000000000000..7e9e239e98eb --- /dev/null +++ b/dev-util/intltool/Manifest @@ -0,0 +1,2 @@ +DIST intltool-0.50.2.tar.gz 189483 SHA256 67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406 SHA512 9f7f0746e77a1a6765b49e16f65438103bc031f3fa8cac42c061deade4291703b95aa336eba2500c8f05d19e35620cf01a120c71a7b6816c1bfecbb9fd747b11 WHIRLPOOL b026ab99921aaddb376823f1eb06e7d669bcc0a3cfb12431676e4e041343a370d7f715d39d60ef991e86e4f8441228713fc82a7ecb3cae2dc3273f7f01ce66a3 +DIST intltool-0.51.0.tar.gz 162286 SHA256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf WHIRLPOOL f0cf9a23c7f7dd9d4ec504709c447de1895bf5bdb10fe2000f9ebc8d93b0be204bb4bc1a54a1c3e981a9f8754cc354224e8411711e4996fc7ffd56335cb300cd 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?= <mgorny@gentoo.org> +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 <mgorny@gentoo.org> +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 (<INPUT>) +@@ -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]) + + ]) + diff --git a/dev-util/intltool/intltool-0.50.2-r1.ebuild b/dev-util/intltool/intltool-0.50.2-r1.ebuild new file mode 100644 index 000000000000..7b6f95c35107 --- /dev/null +++ b/dev-util/intltool/intltool-0.50.2-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +DESCRIPTION="Internationalization Tool Collection" +HOMEPAGE="https://launchpad.net/intltool/" +SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=" + >=dev-lang/perl-5.8.1 + dev-perl/XML-Parser +" +RDEPEND="${DEPEND} + sys-devel/gettext +" +DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO ) + +src_prepare() { + # Use plain localedir to install mo files to, rather than trying to + # guess one, bug #432848#c11 + epatch "${FILESDIR}/${P}-localedir-fix.patch" + + # Fix handling absolute paths in single file key output, bug #470040 + epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch" +} diff --git a/dev-util/intltool/intltool-0.51.0.ebuild b/dev-util/intltool/intltool-0.51.0.ebuild new file mode 100644 index 000000000000..8d02a40c7b35 --- /dev/null +++ b/dev-util/intltool/intltool-0.51.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +DESCRIPTION="Internationalization Tool Collection" +HOMEPAGE="https://launchpad.net/intltool/" +SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=" + >=dev-lang/perl-5.8.1 + dev-perl/XML-Parser +" +RDEPEND="${DEPEND} + sys-devel/gettext +" +DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO ) + +src_prepare() { + # Fix handling absolute paths in single file key output, bug #470040 + # https://bugs.launchpad.net/intltool/+bug/1168941 + epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch" +} diff --git a/dev-util/intltool/metadata.xml b/dev-util/intltool/metadata.xml new file mode 100644 index 000000000000..ab11cfdf2c80 --- /dev/null +++ b/dev-util/intltool/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>freedesktop</herd> + <maintainer> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="launchpad">intltool</remote-id> + </upstream> +</pkgmetadata> |