From 51536d2fe4697ba9114d611178bb9e20d3d5b729 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 23 Dec 2017 20:48:53 +0000
Subject: gentoo resync : 23.12.2017

---
 app-text/po4a/Manifest                             |  1 -
 .../po4a-0.45-port-our-regex-to-perl-5.22.patch    | 44 ----------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch

(limited to 'app-text/po4a')

diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 5a7eb84afcd6..627bcc964fa5 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,5 +1,4 @@
 AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
-AUX po4a-0.45-port-our-regex-to-perl-5.22.patch 1779 BLAKE2B 25f66218bc9410aaf0ecb7399a6163b0a14e8b598a94dabacea5f452ac65608c780c552df84ba0248119a36584bb4dc2258a8d46222a86572d1d6f0c596af7c3 SHA512 493e80b8ffff96ef4434fe268e96a305246ca5f492f4d24fa01752131aa6f2c88c6b484f7e8c536d268d3de4c0fb7b0b7a920bc2709108f66822b5e64b030576
 DIST po4a_0.45.orig.tar.gz 2208959 BLAKE2B f5fd533036eac41aa15413559bab7fb176556b47d63fe7bae4a98797a128f8314f6a22076fd1792d1ae19d8aad27599508064ec8323b6fe8ffd433989541151e SHA512 e67334b7a45d3c23b7226077e01e12b3c4f1202531596f02851b6a9e7249b2b8a0c37f37ebbaf591753f041a4c6ce42c062b4822e91ac75884dcd0994c27323f
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
 EBUILD po4a-0.45-r3.ebuild 1980 BLAKE2B 3840a33a5c574b1f853a6ac582a93cd0f51f90c36fce29dd74be8a8432d5a4a923046b173a59a5b9cb3040e91fc44624ddfdea9e125399d1349c35c835079b62 SHA512 28547b542eb7ddc4125f9d6c1d1cd9efa3f0db8498beffde5ffe0f8ff9bd2223ff2e43d7b8f0d71571f6a91487c3259941cc1b5c217bcb8b01a443093cdde26e
diff --git a/app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch b/app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch
deleted file mode 100644
index a204d5e97217..000000000000
--- a/app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix sgml and tex regex against perl-5.22. See Gentoo-bug: 604428.
-Based on a patch from upstream git. Original commit info:
-From 44e5c2f02b3166536257bc9d6384d41dda386648 Mon Sep 17 00:00:00 2001
-From: Martin Quinson <martin.quinson@loria.fr>
-Date: Fri, 28 Aug 2015 19:01:17 +0200
-Subject: [PATCH] Port our regex to Perl 5.22 (patch by Roderich Schupp)
-
----
- lib/Locale/Po4a/Sgml.pm | 4 ++--
- lib/Locale/Po4a/TeX.pm  | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Locale/Po4a/Sgml.pm b/lib/Locale/Po4a/Sgml.pm
-index 742e003..3ad5e8d 100644
---- a/lib/Locale/Po4a/Sgml.pm
-+++ b/lib/Locale/Po4a/Sgml.pm
-@@ -672,9 +672,9 @@ sub parse_file {
-             }
-         }
-     }
--    $prolog =~ s/<!--{PO4A-ent-beg-(.*?)}(.*?){PO4A-ent-end}-->/<!ENTITY % $1 SYSTEM "$2">/g;
-+    $prolog =~ s/<!--\{PO4A-ent-beg-(.*?)\}(.*?)\{PO4A-ent-end\}-->/<!ENTITY % $1 SYSTEM "$2">/g;
-     # Unprotect undefined inclusions, and die of them
--    $prolog =~ s/{PO4A-percent}/%/sg;
-+    $prolog =~ s/\{PO4A-percent\}/%/sg;
-     if ($prolog =~ /%([^;\s]*);/) {
-         die wrap_mod("po4a::sgml",
-                      dgettext("po4a",
-diff --git a/lib/Locale/Po4a/TeX.pm b/lib/Locale/Po4a/TeX.pm
-index a78f94b..0faa465 100644
---- a/lib/Locale/Po4a/TeX.pm
-+++ b/lib/Locale/Po4a/TeX.pm
-@@ -1168,7 +1168,7 @@ sub parse {
- #       environment contains an un-closed bracket)
-         if (   ($closed and ($line =~ /^\s*$/ or
-                              $line =~ /^\s*$RE_VERBATIM\s*$/))
--            or (in_verbatim(@env) and $line =~ /^\s*\Q$ESCAPE\Eend{$env[-1]}\s*$/)
-+            or (in_verbatim(@env) and $line =~ /^\s*\Q$ESCAPE\Eend\{$env[-1]\}\s*$/)
-            ) {
-             # An empty line. This indicates the end of the current
-             # paragraph.
--- 
-2.10.2
-
-- 
cgit v1.2.3