[gentoo-commits] repo/gentoo:master commit in: app-text/po4a/files/, app-text/po4a/

[Akinori Hattori]

commit:     126521cd90f951c8984181daa43bf0d5f64217f0
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 14:27:49 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 14:27:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126521cd

app-text/po4a: rename patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 .../po4a/files/{po4a-man.patch => po4a-0.66-man.patch} |  0
 app-text/po4a/files/po4a-0.67-man.patch                | 18 ------------------
 app-text/po4a/files/po4a-man.patch                     | 16 ++++++++--------
 app-text/po4a/po4a-0.66.ebuild                         |  2 +-
 app-text/po4a/po4a-0.67.ebuild                         |  2 +-
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/app-text/po4a/files/po4a-man.patch 
b/app-text/po4a/files/po4a-0.66-man.patch
similarity index 100%
copy from app-text/po4a/files/po4a-man.patch
copy to app-text/po4a/files/po4a-0.66-man.patch

diff --git a/app-text/po4a/files/po4a-0.67-man.patch 
b/app-text/po4a/files/po4a-0.67-man.patch
deleted file mode 100644
index 6c79ebf77dd2..000000000000
--- a/app-text/po4a/files/po4a-0.67-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Po4aBuilder.pm
-+++ b/Po4aBuilder.pm
-@@ -234,7 +234,6 @@
-         }
-         $parser->parse_from_file ($file, $out);
- 
--        system("gzip -9 -f $out") and die;
-         unlink "$file" || die;
-     }
- 
-@@ -253,7 +252,6 @@
-             print "Convert $outdir/$outfile.$section (online docbook.xsl 
file). ";
-             system("xsltproc -o $outdir/$outfile.$section --nonet 
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") 
and die;
-             }
--                system ("gzip -9 -f $outdir/$outfile.$section") and die;
-             }
-             unlink "$file" || die;
-         }

diff --git a/app-text/po4a/files/po4a-man.patch 
b/app-text/po4a/files/po4a-man.patch
index 40927dbda818..6c79ebf77dd2 100644
--- a/app-text/po4a/files/po4a-man.patch
+++ b/app-text/po4a/files/po4a-man.patch
@@ -1,6 +1,6 @@
 --- a/Po4aBuilder.pm
 +++ b/Po4aBuilder.pm
-@@ -232,7 +232,6 @@
+@@ -234,7 +234,6 @@
          }
          $parser->parse_from_file ($file, $out);
  
@@ -8,11 +8,11 @@
          unlink "$file" || die;
      }
  
-@@ -250,7 +249,6 @@
-               print "Convert $outdir/$outfile.$section (online docbook.xsl 
file). ";
-               system("xsltproc -o $outdir/$outfile.$section --nonet 
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") 
and die;
-           }
--            system ("gzip -9 -f $outdir/$outfile.$section") and die;
+@@ -253,7 +252,6 @@
+             print "Convert $outdir/$outfile.$section (online docbook.xsl 
file). ";
+             system("xsltproc -o $outdir/$outfile.$section --nonet 
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") 
and die;
+             }
+-                system ("gzip -9 -f $outdir/$outfile.$section") and die;
+             }
+             unlink "$file" || die;
          }
-         unlink "$file" || die;
-     }

diff --git a/app-text/po4a/po4a-0.66.ebuild b/app-text/po4a/po4a-0.66.ebuild
index 0c39ceb095cc..075e72ec5e4e 100644
--- a/app-text/po4a/po4a-0.66.ebuild
+++ b/app-text/po4a/po4a-0.66.ebuild
@@ -37,7 +37,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
                virtual/latex-base
        )"
 
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=( "${FILESDIR}"/${P}-man.patch )
 
 DIST_TEST="do"
 

diff --git a/app-text/po4a/po4a-0.67.ebuild b/app-text/po4a/po4a-0.67.ebuild
index 4fe9ab68c59f..300d739e1730 100644
--- a/app-text/po4a/po4a-0.67.ebuild
+++ b/app-text/po4a/po4a-0.67.ebuild
@@ -38,7 +38,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
                virtual/latex-base
        )"
 
-PATCHES=( "${FILESDIR}"/${P}-man.patch )
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
 
 DIST_TEST="do"