commit: b4d9ef28d653ca5246e3821460265944c8106192
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 03:12:22 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 03:12:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d9ef28
app-text/docbook2X: port to EAPI 7
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/docbook2X/docbook2X-0.8.8-r4.ebuild | 20 ++++++++++++--------
.../files/docbook2X-0.8.8-drop-htmldir.patch | 4 ++--
.../docbook2X-0.8.8-error_on_missing_refentry.patch | 5 ++---
...ocbook2X-0.8.8-filename_whitespace_handling.patch | 10 ++++------
...ook2X-0.8.8-preprocessor_declaration_syntax.patch | 10 ++++------
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index 53121b0e749..bd850d26957 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-AUTOTOOLS_AUTORECONF=1 #290284
-inherit autotools-utils
+inherit autotools
DESCRIPTION="Tools to convert docbook to man and info"
SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
@@ -35,23 +34,28 @@ PATCHES=(
# bug #296112
"${FILESDIR}/${P}-drop-htmldir.patch"
)
+
src_prepare() {
+ default
+
sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
'sed on configure.ac failed'
- autotools-utils_src_prepare
+ # bug #290284
+ eautoreconf
}
src_configure() {
local myeconfargs=(
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
--with-xslt-processor=libxslt
--program-transform-name='/^docbook2/s,$,.pl,'
)
- autotools-utils_src_configure
+
+ econf "${myeconfargs[@]}"
}
src_install() {
- autotools-utils_src_install
+ default
+
dosym docbook2man.pl /usr/bin/docbook2x-man
dosym docbook2texi.pl /usr/bin/docbook2x-texi
}
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
index a7e11b2dfd7..a36308587e4 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
@@ -1,8 +1,8 @@
Put HTML documentation in proper directory.
Patch by Chris Mayo, https://bugs.gentoo.org/show_bug.cgi?id=296112
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
@@ -182,8 +182,6 @@
# Install (automake)
#
diff --git
a/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
index b8a493be2f3..a9d598874f9 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
@@ -10,9 +10,8 @@
## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
@DPATCH@
-diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl
---- trunk~/xslt/man/docbook.xsl 2006-04-11 21:00:19.000000000 +0200
-+++ trunk/xslt/man/docbook.xsl 2008-02-05 03:31:48.000000000 +0100
+--- a/xslt/man/docbook.xsl
++++ b/xslt/man/docbook.xsl
@@ -111,11 +111,15 @@
<xsl:when test="child::refentry">
<xsl:apply-templates />
diff --git
a/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
index 26cdf8e1bae..7d181a1ccb0 100644
---
a/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
+++
b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
@@ -13,9 +13,8 @@
## DP: refentrytitle and then replace any spaces left with underlines.
@DPATCH@
-diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl
docbook2x-0.8.8/xslt/man/manpage.xsl
---- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000
+0200
-+++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000
+0200
+--- a/xslt/man/manpage.xsl
++++ b/xslt/man/manpage.xsl
@@ -30,7 +30,7 @@
<xsl:template name="manpage-filename">
@@ -25,9 +24,8 @@ diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl
docbook2x-0.8.8/xslt/man/manpa
</xsl:template>
-diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl
docbook2x-0.8.8/xslt/man/refentry.xsl
---- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000
+0200
-+++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000
+0200
+--- a/xslt/man/refentry.xsl
++++ b/xslt/man/refentry.xsl
@@ -38,7 +38,11 @@
<xsl:template name="refentry-filename">
<xsl:param name="title" />
diff --git
a/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
index b6ddbfa2a0d..6c85701d2e9 100644
---
a/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
+++
b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
@@ -13,9 +13,8 @@
## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
@DPATCH@
-diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
---- trunk~/perl/db2x_manxml.pl 2006-04-22 17:21:32.000000000 +0200
-+++ trunk/perl/db2x_manxml.pl 2007-11-24 01:27:37.000000000 +0100
+--- a/perl/db2x_manxml.pl
++++ b/perl/db2x_manxml.pl
@@ -342,6 +342,25 @@
$self->{line_start} = 1;
}
@@ -67,9 +66,8 @@ diff -urNad trunk~/perl/db2x_manxml.pl
trunk/perl/db2x_manxml.pl
# Define escapes for switching to and from monospace fonts (groff only)
$self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});
-diff -urNad trunk~/xslt/backend/db2x_manxml.xsl
trunk/xslt/backend/db2x_manxml.xsl
---- trunk~/xslt/backend/db2x_manxml.xsl 2006-04-23 16:44:52.000000000
+0200
-+++ trunk/xslt/backend/db2x_manxml.xsl 2007-11-24 01:27:37.000000000 +0100
+--- a/xslt/backend/db2x_manxml.xsl
++++ b/xslt/backend/db2x_manxml.xsl
@@ -528,7 +528,7 @@
<exslt:document method="text"
encoding="{$encoding}"
