diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-util/intltool |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-util/intltool')
-rw-r--r-- | dev-util/intltool/Manifest | 9 | ||||
-rw-r--r-- | dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch | 63 | ||||
-rw-r--r-- | dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch | 48 | ||||
-rw-r--r-- | dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch | 12 | ||||
-rw-r--r-- | dev-util/intltool/intltool-0.51.0-r1.ebuild | 30 | ||||
-rw-r--r-- | dev-util/intltool/intltool-0.51.0-r2.ebuild | 30 | ||||
-rw-r--r-- | dev-util/intltool/metadata.xml | 10 |
7 files changed, 202 insertions, 0 deletions
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest new file mode 100644 index 000000000000..3c487cf55190 --- /dev/null +++ b/dev-util/intltool/Manifest @@ -0,0 +1,9 @@ +AUX intltool-0.50.2-absolute-paths.patch 1798 SHA256 100745c58324e737af6b9b6c3691d2a1c43dd46993ab045da23b97d105c157c0 SHA512 f4fe5452b81d448d19ec58196ecb1a0fa619daedd67c86fc16dcd8f45b4fa449890a0fed14d6fdb259f7c6b13cf8a1ffe064d540305913a0d9df80bb5042aa17 WHIRLPOOL 51e930c4bb04502af3591002ed19224c14a55a1732019eca5ed885dc721d44ba0f0d3bb854c837c47458f3d3c984c8d77d5df26da502fdeccf42265597cad591 +AUX intltool-0.51.0-perl-5.22.patch 2184 SHA256 635c37f1f7761f2ed220614e4e37907d7f498d322ea5a1ee580b1eb1372e7419 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177 WHIRLPOOL b87c8680fa30f234e25229838047a2f086f5176d6c82e272e08d55944e7bf034a9d5069a0addd926d5ea25d726998325984c2d18042c8dfdf18b9569aed3e944 +AUX intltool-0.51.0-perl-5.26.patch 586 SHA256 713e66dbd1d69abe438775a7130e846b40cb1383254025cb76fd593d2f6e0ce7 SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591 WHIRLPOOL bfc9239b57f3707d85bb51d29b3c423697d6f187567bcddaec631acea6e49b3ff73e2d2f645d41c45678ebec3e45d3c1a49608a021cb2b8d411f2afcef8c4ebf +DIST intltool-0.51.0.tar.gz 162286 SHA256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf WHIRLPOOL f0cf9a23c7f7dd9d4ec504709c447de1895bf5bdb10fe2000f9ebc8d93b0be204bb4bc1a54a1c3e981a9f8754cc354224e8411711e4996fc7ffd56335cb300cd +EBUILD intltool-0.51.0-r1.ebuild 1012 SHA256 2c0978f48cf917acbb69241ea2f1359b38fb5066565c73aea8b1a22d68c924a4 SHA512 4e437718701d259bf927c568e3829c0d7c4fb8c175c9b51d844f400fbcbd076793eda5ed924845c77952ab6a4efd0a99059eadad0828b6819c26bbf2741cda5b WHIRLPOOL 7585627d721fb705c63bffde56755df406de790b6ef5a5d9724da4c5623ac806d04c5a7abec5f663304ac7abc428c2606ec35e4654a222a61d2320501c7dcfb5 +EBUILD intltool-0.51.0-r2.ebuild 1017 SHA256 9fd0565001baa94b04a1fe7c54be2acf1121f205c8a326e16ae1c9ef1a48eca5 SHA512 0d744d134aae2afbe386cc5b40785f00787012d67faa22942b5bb0032070fd970b2ba7131562be3d9106c4df7285abb08c5d1f7102a43374fea45723335a2261 WHIRLPOOL 14c5f6f261b091e73ab64f117f9631bf7122a7d765699d8b0ece62f25e0f541d7e11055079844955eda98206f2e2c3d2c2148a3057bce2e5275493663f26409b +MISC ChangeLog 3854 SHA256 ec58cd21053882ea8b5a632c857e28387ee0f218e1a162859e6ac2685f56f41d SHA512 1a13476240fb4f83291699c85a3679373941f976bd65483264b50fc94083637af7d1a96f0137539ff99936e6dc835acd2d79720e302558c870a881e24303f71b WHIRLPOOL de1cf2e0f0c66a36b9894711b7226e0d89d7b2de4d258a9ce0b9ae1ca9259a22155de5827d52bc3e4849e69158c7c7ea3e06098ae782ab49177321f4916d76e0 +MISC ChangeLog-2015 20527 SHA256 0b810b9468a2c540a827acd0363d98e5710383da464c42f409a5aeb9f50235d1 SHA512 40a3990e16a79f1542d0b6949d16d38b0802196c889ad65c97c8ef93764e25a54426d8c6196f75a352e1b9122875213c6d312b8cb7ff33c26399ba4d9574cab8 WHIRLPOOL a5e64e5bb4d4e28888810fbed071f83c57c50fcf4ce688eb1b30933ce2d377a39b2ca2c4216475cca3fa3efe20aa45d4ce4748ccb13c5e7170d8845f9b868e5d +MISC metadata.xml 304 SHA256 742891030ed6c77ca6eadbc784a3d979f90eb513608d5c83a649e8a489975052 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727 WHIRLPOOL a5120a3b7d8a35222ca13a627a0a233dd30d77c99621bf5051ef8f6ac6b22788440e6d719229f53d2f041919f41cb595348f1a0597d26c6c35cb9e007bfea3a1 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.51.0-perl-5.22.patch b/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch new file mode 100644 index 000000000000..097c511ce18d --- /dev/null +++ b/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch @@ -0,0 +1,48 @@ +https://bugs.launchpad.net/intltool/+bug/1490906 + +fix warnings w/newer perl: +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/bin/intltool-update line 1065. + +--- a/intltool-update.in ++++ b/intltool-update.in +@@ -1062,7 +1062,7 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + + # \s makes this not work, why? diff --git a/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch b/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch new file mode 100644 index 000000000000..4af2ed8647e9 --- /dev/null +++ b/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch @@ -0,0 +1,12 @@ +diff -ruN intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in +--- intltool-0.51.0.orig/intltool-update.in 2017-06-28 00:47:20.889269294 +0200 ++++ intltool-0.51.0/intltool-update.in 2017-06-28 00:48:14.592271529 +0200 +@@ -1068,7 +1068,7 @@ + my $untouched = $1; + my $sub = ""; + # Ignore recursive definitions of variables +- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; ++ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/; + + return SubstituteVariable ("$untouched$sub$rest"); + } diff --git a/dev-util/intltool/intltool-0.51.0-r1.ebuild b/dev-util/intltool/intltool-0.51.0-r1.ebuild new file mode 100644 index 000000000000..f431362b7ad4 --- /dev/null +++ b/dev-util/intltool/intltool-0.51.0-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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" + epatch "${FILESDIR}"/${PN}-0.51.0-perl-5.22.patch +} diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild new file mode 100644 index 000000000000..3f4e67497e47 --- /dev/null +++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 + dev-perl/XML-Parser +" +RDEPEND="${DEPEND} + sys-devel/gettext +" +DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO ) + +PATCHES=( + # Fix handling absolute paths in single file key output, bug #470040 + # https://bugs.launchpad.net/intltool/+bug/1168941 + "${FILESDIR}"/${PN}-0.50.2-absolute-paths.patch + "${FILESDIR}"/${PN}-0.51.0-perl-5.22.patch + "${FILESDIR}"/${PN}-0.51.0-perl-5.26.patch +) diff --git a/dev-util/intltool/metadata.xml b/dev-util/intltool/metadata.xml new file mode 100644 index 000000000000..525c1a60b10b --- /dev/null +++ b/dev-util/intltool/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="launchpad">intltool</remote-id> + </upstream> +</pkgmetadata> |