Port patch from core version 1.14 for perl-5.12

Package-Manager: portage-2.2_rc67_p192/cvs/Linux x86_64

4 files changed, 48 insertions, 6 deletions

diff --git a/perl-core/locale-maketext/ChangeLog b/perl-core/locale-maketext/ChangeLog
index 534d2f97b5ff..ad6e77d14bbc 100644
--- a/perl-core/locale-maketext/ChangeLog
+++ b/perl-core/locale-maketext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for perl-core/locale-maketext
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/locale-maketext/ChangeLog,v 1.21 2010/01/17 15:18:45 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/locale-maketext/ChangeLog,v 1.22 2010/07/14 07:03:59 tove Exp $
+
+*locale-maketext-1.13-r1 (14 Jul 2010)
+
+  14 Jul 2010; Torsten Veller <tove@gentoo.org> +files/1.13-defined.patch,
+  +locale-maketext-1.13-r1.ebuild:
+  Port patch from core version 1.14 for perl-5.12
 
   17 Jan 2010; Torsten Veller <tove@gentoo.org>
   -locale-maketext-1.09.ebuild, -locale-maketext-1.10.ebuild:
diff --git a/perl-core/locale-maketext/Manifest b/perl-core/locale-maketext/Manifest
index 6a30a4457806..a9ccbf9ad65a 100644
--- a/perl-core/locale-maketext/Manifest
+++ b/perl-core/locale-maketext/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.13-defined.patch 442 RMD160 1ac6b16700b1f3dec21c50992ce6f682338665d1 SHA1 fcf62a6d855c569c6834190e2184b6e5fd796692 SHA256 9cb266b02c71163c9138fc3c31a7d2d0baff2c8c7802ef9fd8ff48ade605d012
 DIST Locale-Maketext-1.13.tar.gz 46713 RMD160 40667fc61a5c0d9f8d73498863649835c8e5cbc7 SHA1 2b00771bdae6999fc6eb02c93931a98bb44aa847 SHA256 df502ff86040af73250b98a8f2c8a7f7e8f449eea53188f6e811091734837963
+EBUILD locale-maketext-1.13-r1.ebuild 599 RMD160 988f839b91add539ce3f4967df1ebf14883812ba SHA1 e75fdc36cc19755901414e8339ea10e1a376168b SHA256 91711b5f1602f39f871a37da475cb5aa057fa71a78a508ec23b3a7e9d0e41343
 EBUILD locale-maketext-1.13.ebuild 663 RMD160 65250f7a498f928c1e94638e4c8a81c3d2928597 SHA1 ef7cef091470ede31602c6de94f6575a49914a8d SHA256 fda498d4886c19d1737974693c258aad8c027251dbf2ad4253e76c4de38af7af
-MISC ChangeLog 5025 RMD160 869dde5b5d2b5b61c79badb85ff589803822fcc8 SHA1 846e7d6327528d8a5d3f2a56b2f4f3734fe03480 SHA256 d8075d63375b66e982f10e0248a24819d71a85feaaf98ded0159720a38073cdc
+MISC ChangeLog 5226 RMD160 08b3262bd83b5dc6e301ea383ab4a04d79f2a271 SHA1 abe207a1fe3cef208e6494d9ef8f339525dad621 SHA256 4051950e7ae7ca61907b9f31e4816500aad8309c6c52c0cddb02b94e861cc4cb
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktTKlsACgkQV3J2n04EauyAGQCffxN7Tiize7W3B/hxGmjHfk4H
-mx0AoKBHnmd5n98qNJdE+DNXwU7EY+wH
-=ysKh
+iEYEARECAAYFAkw9YWcACgkQV3J2n04EauyozQCfQ+eSAskE+mr4ZlDiPWpaM/sP
+jWsAnRKX0nakNt8o1mW14cDusVjs206G
+=DR1G
 -----END PGP SIGNATURE-----
diff --git a/perl-core/locale-maketext/files/1.13-defined.patch b/perl-core/locale-maketext/files/1.13-defined.patch
new file mode 100644
index 000000000000..6fd3d6fd64b9
--- /dev/null
+++ b/perl-core/locale-maketext/files/1.13-defined.patch
@@ -0,0 +1,11 @@
+--- Locale-Maketext-1.13/lib/Locale/Maketext.pm
++++ Locale-Maketext-1.13/lib/Locale/Maketext.pm
+@@ -401,7 +401,7 @@
+     my $module = $_[0];   # ASSUME sane module name!
+     { no strict 'refs';
+         return($tried{$module} = 1)
+-        if defined(%{$module . '::Lexicon'}) or defined(@{$module . '::ISA'});
++        if %{$module . '::Lexicon'} or @{$module . '::ISA'};
+         # weird case: we never use'd it, but there it is!
+     }
+ 
diff --git a/perl-core/locale-maketext/locale-maketext-1.13-r1.ebuild b/perl-core/locale-maketext/locale-maketext-1.13-r1.ebuild
new file mode 100644
index 000000000000..20b5e7cd9db6
--- /dev/null
+++ b/perl-core/locale-maketext/locale-maketext-1.13-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/locale-maketext/locale-maketext-1.13-r1.ebuild,v 1.1 2010/07/14 07:03:59 tove Exp $
+
+EAPI=3
+
+MY_PN=Locale-Maketext
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+MODULE_AUTHOR=FERREIRA
+
+inherit perl-module
+
+DESCRIPTION="Localization framework for Perl programs"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/perl-i18n-langtags-0.30"
+
+SRC_TEST="do"
+PATCHES=( "${FILESDIR}"/1.13-defined.patch )