From c870e170f1f0153094db5ddbdad94c2902bf4b46 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 15:03:12 +0100 Subject: [PATCH] dev-perl/Locale-gettext: Sync with gentoo It's from gentoo commit 4ee52a1e1eae8bad02d024e6c65a2d16c667d302. --- .../Locale-gettext-1.50.0-r1.ebuild | 23 ----- .../Locale-gettext-1.70.0-r1.ebuild | 25 ++++++ .../Locale-gettext-1.70.0.ebuild | 22 ----- .../dev-perl/Locale-gettext/Manifest | 9 +- .../Locale-gettext-1.70.0-no-dot-inc.patch | 90 +++++++++++++++++++ .../compatibility-with-POSIX-module.diff | 16 ---- .../dev-perl/Locale-gettext/metadata.xml | 2 +- 7 files changed, 117 insertions(+), 70 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.50.0-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.50.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.50.0-r1.ebuild deleted file mode 100644 index dbe7bdb3f3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.50.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_PN=gettext -MODULE_AUTHOR=PVANDRY -MODULE_VERSION=1.05 -inherit perl-module - -DESCRIPTION="A Perl module for accessing the GNU locale utilities" - -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND="sys-devel/gettext" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/compatibility-with-POSIX-module.diff ) - -# Disabling the tests - not ready for prime time - mcummings -#SRC_TEST="do" diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild new file mode 100644 index 0000000000..f3e5ac2dc6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_NAME=gettext +DIST_AUTHOR=PVANDRY +DIST_VERSION=1.07 +inherit perl-module + +DESCRIPTION="A Perl module for accessing the GNU locale utilities" + +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + sys-devel/gettext +" +BDEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" + +PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch") + +S="${WORKDIR}/${PN}-${DIST_VERSION}" diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild deleted file mode 100644 index 542a8efc79..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_NAME=gettext -DIST_AUTHOR=PVANDRY -DIST_VERSION=1.07 -inherit perl-module - -DESCRIPTION="A Perl module for accessing the GNU locale utilities" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="sys-devel/gettext" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker -" - -S="${WORKDIR}/${PN}-${DIST_VERSION}" diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Manifest b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Manifest index 120b6a0c36..e801cadb37 100644 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Manifest @@ -1,8 +1 @@ -AUX compatibility-with-POSIX-module.diff 449 SHA256 e40b9911008c65719f8f890856d1fb77dc5f7f728f68231ec48264e86aae8008 SHA512 079d36e570bbfb6d940c5b02ecd14f685ca004c07e747b019dfb086b4017d0f59e76e94d4f423fe6d43a619d446f5b90443f60731f6008b789822b48d98e9b78 WHIRLPOOL c70513623e3518b419d3b8ce4d42a7f453100f840ab4928be9913b454def0f928bbd52f07d70030343e57b59c98a5359f5944b7be146387c9d3414195e6cb5df -DIST gettext-1.05.tar.gz 7693 SHA256 27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694 SHA512 ce58940be16b7f2b3bde8f321f142486b38874018d37267ecf0587f44a0ea6c7a2d86fc22ce4ac78f3c9cc521e1ef7142009dd8d050aa45bb12a0e64959d37b1 WHIRLPOOL 87b64aae4d24435fcd38804fbcb9d41747f703a004b40b48a0e91718a67bd42958ede87d79deb462325d2bc6d81ba78a0babb9f879ca9176601ab247540bff0c -DIST gettext-1.07.tar.gz 8651 SHA256 909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15 SHA512 d3716a597d586ee2ff29472ca7b13aaf67770299de31e5f12abafebc879bbe4a1e1dbc0025cf4f3dc29992955f26cffc3be387d974c3911af095d5b49e67a1c6 WHIRLPOOL d41dc69e46d9ae533989cb8eee3e055f968cff87d45deca91d0a6cad40a7cef584713df965f445eb217304696a7f84cb21882a10653dbe8a43882ca7cdcc272a -EBUILD Locale-gettext-1.50.0-r1.ebuild 668 SHA256 e79790e442279d8fc2f12115d95f92e90fef69a824f6727a033ce38e82fd1918 SHA512 062fb86104b0a2c79a383a8cfc1922a526edc95ae84b9011b8986db407bff7588d523455329642d98b833d10f0675e48b863e1e169ef2646e461d69da9f03247 WHIRLPOOL 88f9531f5b5a55304505ca7c3913f0130437cfd88b6fad572e1395580e263b3d70459f9f5c4da7cf425c33e92d0d9a2d59e9d4aced9f3d82740eaad0627d2c84 -EBUILD Locale-gettext-1.70.0.ebuild 625 SHA256 81dabd75554f1968ad14f4911a33d7e576339da142d4abf69022238e0323d304 SHA512 c67cd437f8e977e51e6d6d7cb129fa1d894984e6d3060db228e19e09dd6f7f91e363309d9ed15bb9bf2d4b9bf17193c0e238cb862a50ac9f3436205532d3d953 WHIRLPOOL de8b9cd0167dce780eb220f427ec49493cd70c46de88c9d7c87b4097aa5b3fb4f0de75c22d99b25b5eb5a9fc49ddeee1dc279af821537cddb2654820fee46ad0 -MISC ChangeLog 2697 SHA256 f9c56a5d8cae92cbfd4356e47dba2aadded07330ccf33ec23a667375827f19c0 SHA512 2c65896075fbe6d0062b185505ff67fde3731d22c7689b4fc6c17efc4db67b3edafd045b5a7685c7bd4a28de8bc7309130fc8df8ad84451f8e41597dce80b584 WHIRLPOOL fc0fb4c56a1438c4b18958bc8f9effa361174d1dfdbb42b30c964cc0fc25d978dd584718b8735db0669ee55e35b4f63f3b3c8b3292b5878ca5697542b9880d27 -MISC ChangeLog-2015 6394 SHA256 1ca5cad5f7f234db21a7f273bb7178fccad5102d7df1ad3b76e82248e48abc55 SHA512 0440cc0e560df5b25f8d67164617f23870443a5e1c0acda2a22444a617cfd8441bc58502984d35a27a33319bb395d036b858ded22dcd249b6510c0ef3923acf9 WHIRLPOOL 2d0cede5efb0714619877398f8cc5cf82e845cfb69d776451ee144265a0eb5f4a834674410d27b57f3a4f3a9ba44e4e4b31c830245bc0a7372ed6e926a125408 -MISC metadata.xml 393 SHA256 5682047b2c98cd0d61d48c9d33c749ed17c361eb7679b620d569fdc36b601405 SHA512 368d7a37c00a186733e33eeaa01c12fdfed50f2f45c66bc88d0dfddcfd063aacb6c0953aa76737d8f9f5c2ed392e0eef41279975cf2cfad7fb423b8ca29592b0 WHIRLPOOL 1002806a98a7640b8604aaf60875b017f5ca1dea6ee5b76364f8c25a8ba6ad2507271d96d459d2d1c5570cd14a80eafefb4e536250fb6e235850eafe552dbd64 +DIST gettext-1.07.tar.gz 8651 BLAKE2B ecdc105303c0b494d53f985ca0d789d75da33abc85e8579a43af1658d6faa18e2564e18fc6613548acc2add4ce847d03769c1fbe29dbb760b9498f4b251cbb1c SHA512 d3716a597d586ee2ff29472ca7b13aaf67770299de31e5f12abafebc879bbe4a1e1dbc0025cf4f3dc29992955f26cffc3be387d974c3911af095d5b49e67a1c6 diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch new file mode 100644 index 0000000000..962d90cdae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch @@ -0,0 +1,90 @@ +From 08c1f219ae209b2475e5a1b025caceb10cb4a41b Mon Sep 17 00:00:00 2001 +From: Kim Vandry +Date: Sun, 28 May 2017 19:11:30 +0100 +Subject: Update tests to work with @INC that does not contain '.' + +Perl 5.25.11 removes '.' from the default @INC, and this breaks +`require "test_data/gen_test_data.pl"` due to not being able to assume +./test_data/gen_test_data.pl is in the @INC load path, and due to +`require` treating paths without leading "/" or "./" as search paths. + +This change implements the first solution suggested by the reporter of +the bug: Re-organise test dependencies into a dedicated directory such +as `t/lib` and load that path into @INC with `use lib 't/lib'`. + +Bug: https://rt.cpan.org/Ticket/Display.html?id=121458 +Bug: https://bugs.gentoo.org/617048 +--- + MANIFEST | 2 +- + t/frconvert.t | 3 ++- + t/jaconvert.t | 3 ++- + {test_data => t/lib}/gen_test_data.pl | 0 + t/raw.t | 3 ++- + 5 files changed, 7 insertions(+), 4 deletions(-) + rename {test_data => t/lib}/gen_test_data.pl (100%) + +diff --git a/MANIFEST b/MANIFEST +index 9604b91..e9f6e08 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -8,7 +8,7 @@ t/jaconvert.t + t/raw.t + t/use.t + test_data/foo.po +-test_data/gen_test_data.pl ++t/lib/gen_test_data.pl + test_data/jaeuc.po + MANIFEST + META.yml Module YAML meta-data (added by MakeMaker) +diff --git a/t/frconvert.t b/t/frconvert.t +index 2bca28b..9a4f4f5 100644 +--- a/t/frconvert.t ++++ b/t/frconvert.t +@@ -1,8 +1,9 @@ + #!/usr/bin/env perl -w + use strict; + use Test; ++use lib 't/lib'; + BEGIN { plan tests => 1 } +-require "test_data/gen_test_data.pl"; ++require "gen_test_data.pl"; + + gen("foo"); + use Locale::gettext; +diff --git a/t/jaconvert.t b/t/jaconvert.t +index 5794dc4..b95c883 100644 +--- a/t/jaconvert.t ++++ b/t/jaconvert.t +@@ -1,8 +1,9 @@ + #!/usr/bin/env perl -w + use strict; + use Test; ++use lib 't/lib'; + BEGIN { plan tests => 1 } +-require "test_data/gen_test_data.pl"; ++require "gen_test_data.pl"; + + gen("jaeuc"); + use Locale::gettext; +diff --git a/test_data/gen_test_data.pl b/t/lib/gen_test_data.pl +similarity index 100% +rename from test_data/gen_test_data.pl +rename to t/lib/gen_test_data.pl +diff --git a/t/raw.t b/t/raw.t +index 1e1cf14..7439397 100644 +--- a/t/raw.t ++++ b/t/raw.t +@@ -1,8 +1,9 @@ + #!/usr/bin/env perl -w + use strict; + use Test; ++use lib 't/lib'; + BEGIN { plan tests => 1 } +-require "test_data/gen_test_data.pl"; ++require "gen_test_data.pl"; + + gen("foo"); + use Locale::gettext; +-- +2.14.3 + diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff deleted file mode 100644 index 101e9f26e2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff +++ /dev/null @@ -1,16 +0,0 @@ -Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=237378 -Bug: http://rt.cpan.org/Public/Bug/Display.html?id=35680 -Bug-Debian: http://bugs.debian.org/479803 -Author: Raphaël Hertzog -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479803#20 - ---- a/gettext.pm -+++ b/gettext.pm -@@ -32,6 +32,7 @@ to internationalize software. - =cut - - use Carp; -+use POSIX qw(:locale_h); - - require Exporter; - require DynaLoader; diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/metadata.xml index 30ac1ae4e2..c0b5ec0486 100644 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/metadata.xml @@ -1,5 +1,5 @@ - + perl@gentoo.org