Revision bump: EAPI 5, port to autotools-utils eclass. Install html documentation in proper location, wrt bug #296112. Thanks to Chris Mayo <aklhfex AT gmail.com> for suggested patch

(Portage version: 2.2.0_alpha187/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 74 insertions, 1 deletions

diff --git a/app-text/docbook2X/ChangeLog b/app-text/docbook2X/ChangeLog
index c544dd0009d3..fafdfe53c38e 100644
--- a/app-text/docbook2X/ChangeLog
+++ b/app-text/docbook2X/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/docbook2X
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.46 2013/07/29 10:14:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.47 2013/07/29 10:48:04 pinkbyte Exp $
+
+*docbook2X-0.8.8-r3 (29 Jul 2013)
+
+  29 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> +docbook2X-0.8.8-r3.ebuild,
+  +files/docbook2X-0.8.8-drop-htmldir.patch:
+  Revision bump: EAPI 5, port to autotools-utils eclass. Install html
+  documentation in proper location, wrt bug #296112. Thanks to Chris Mayo
+  <aklhfex AT gmail.com> for suggested patch
 
   29 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> docbook2X-0.8.8-r2.ebuild:
   Automake 1.12 can be used for building instead of old 1.9
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild
new file mode 100644
index 000000000000..7f04f67009fc
--- /dev/null
+++ b/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild,v 1.1 2013/07/29 10:48:04 pinkbyte Exp $
+
+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 ~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
+}
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