From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-text/docbook2X/Manifest | 7 ++ app-text/docbook2X/docbook2X-0.8.8-r4.ebuild | 56 ++++++++++++++ .../files/docbook2X-0.8.8-drop-htmldir.patch | 14 ++++ ...docbook2X-0.8.8-error_on_missing_refentry.patch | 33 ++++++++ ...book2X-0.8.8-filename_whitespace_handling.patch | 43 +++++++++++ ...k2X-0.8.8-preprocessor_declaration_syntax.patch | 90 ++++++++++++++++++++++ app-text/docbook2X/metadata.xml | 8 ++ 7 files changed, 251 insertions(+) create mode 100644 app-text/docbook2X/Manifest create mode 100644 app-text/docbook2X/docbook2X-0.8.8-r4.ebuild create mode 100644 app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch create mode 100644 app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch create mode 100644 app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch create mode 100644 app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch create mode 100644 app-text/docbook2X/metadata.xml (limited to 'app-text/docbook2X') diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest new file mode 100644 index 000000000000..ef42c70bbe91 --- /dev/null +++ b/app-text/docbook2X/Manifest @@ -0,0 +1,7 @@ +AUX docbook2X-0.8.8-drop-htmldir.patch 327 BLAKE2B 052e6e19a639182c8fb04ddfbde371ec0e154ee9049d97827fa6b65db7e745aefc65c3a49f5c8e49f710abfdabc88784a256535d0f2c0c203990e4999b32a7a7 SHA512 c8e3cbbf1f18aeb5489d12f8fd661c38adae7e60ef3861135ff0aa3c515cc509ecc9ae19ace81e94cd181dac15b08bbb4783b39bd96674bdc83abc95aac5ddcc +AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c63ce5828d5a2d450cafd9989af98f99e2aab89c940074105806d85156acadc1b3ea35aee159956da4e7d3d22c6e2bbc10f3bed899b76787db8 SHA512 ea9ed94190edb2ac2055694bb927457f94eeadf0eff340b9f5fdba6fad5b1dc0b9617829ce3470914cbe0ba0be145dfb000218d57f22ee767ebb8082d6c06bfb +AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375 +AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45 +DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c +EBUILD docbook2X-0.8.8-r4.ebuild 1564 BLAKE2B 10d1dc9014784b6cf72037c1d139ef787a9fae9cc8dfa9057e04460b8bf7e96ad8c3bc8e619a548875846b5ab0102c79cd28d39a4eb49308b12fa5fbe67a9d21 SHA512 7718a0eadc029faa32d909e5374d9bd86fc3a61281dc03405064e8ed46de0129f0f26ce1b32270bd4e80b7fb92f3dcf134ae05e44f28e603b5e99d250e2b26ff +MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759 diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild new file mode 100644 index 000000000000..b91b8f23d5d9 --- /dev/null +++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 #290284 +inherit autotools-utils + +DESCRIPTION="Tools to convert docbook to man and info" +SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz" +HOMEPAGE="http://docbook2x.sourceforge.net/" + +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris" +IUSE="test" +LICENSE="MIT" + +# dev-perl/XML-LibXML - although not mentioned upstream is required +# for make check to complete. +DEPEND="dev-lang/perl + dev-libs/libxslt + dev-perl/XML-NamespaceSupport + dev-perl/XML-SAX + dev-perl/XML-LibXML + app-text/docbook-xsl-stylesheets + =app-text/docbook-xml-dtd-4.2*" +RDEPEND="${DEPEND}" + +PATCHES=( + # Patches from debian, for description see patches itself. + "${FILESDIR}/${P}-filename_whitespace_handling.patch" + "${FILESDIR}/${P}-preprocessor_declaration_syntax.patch" + "${FILESDIR}/${P}-error_on_missing_refentry.patch" + # bug #296112 + "${FILESDIR}/${P}-drop-htmldir.patch" +) +src_prepare() { + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed' + + autotools-utils_src_prepare +} + +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 +} + +src_install() { + autotools-utils_src_install + 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 new file mode 100644 index 000000000000..a7e11b2dfd7e --- /dev/null +++ b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch @@ -0,0 +1,14 @@ +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 +@@ -182,8 +182,6 @@ + # Install (automake) + # + +-htmldir = $(datadir)/doc/docbook2X +- + man_MANS = $(MAN_FILES) + html_DATA = $(HTML_FILES) + info_TEXINFOS = docbook2X.texi 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 new file mode 100644 index 000000000000..b8a493be2f36 --- /dev/null +++ b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_fix_439214_error_on_missing_refentry.dpatch by Daniel Leidert +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: If there is no refentry element, the manpage stylesheets silently +## DP: "ignores" this. It has been requested to print at least a +## DP: warning. +## DP: +## DP: +## DP: + +@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 +@@ -111,11 +111,15 @@ + + + +- +- ++ + + + ++ ++ ++ ++ WARNING: Sorry, but I cannot find a refentry element in your source! ++ + + + 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 new file mode 100644 index 000000000000..26cdf8e1baea --- /dev/null +++ b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix_420153_filename_whitespace_handling.dpatch by +## Daniel Leidert (dale) +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Peter Eisentraut reported a regression in the whitespace handling of +## DP: refentrytitle content during filename creation: +## DP: http://bugs.debian.org/420153. The problem is, that upstream first +## DP: replaces all spaces (but not linebreaks btw) with underlines and then +## DP: it tries to normalize the result. This means, that a linebreak with +## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'. +## DP: So what we basically do in this patch is, that we first normalize the +## 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 +@@ -30,7 +30,7 @@ + + + +- ++ + + + +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 +@@ -38,7 +38,11 @@ + + + +- ++ ++ ++ ++ ++ + + + + docbook2x + + -- cgit v1.2.3