summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/docbook2X/ChangeLog6
-rw-r--r--app-text/docbook2X/docbook2X-0.8.8-r2.ebuild23
2 files changed, 10 insertions, 19 deletions
diff --git a/app-text/docbook2X/ChangeLog b/app-text/docbook2X/ChangeLog
index 629051026fd9..e266c0400296 100644
--- a/app-text/docbook2X/ChangeLog
+++ b/app-text/docbook2X/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/docbook2X
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.41 2012/05/09 15:46:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.42 2012/05/25 03:26:41 vapier Exp $
+
+ 25 May 2012; Mike Frysinger <vapier@gentoo.org> docbook2X-0.8.8-r2.ebuild:
+ Update to EAPI=4, and make --program-transform-name work with newer versions
+ of autotools #318297 by Patrick Lauer.
09 May 2012; Alexis Ballier <aballier@gentoo.org> docbook2X-0.8.8-r2.ebuild:
keyword ~amd64-fbsd
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
index e92882e59073..21386a068bf2 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2012 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-r2.ebuild,v 1.18 2012/05/09 15:46:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild,v 1.19 2012/05/25 03:26:41 vapier Exp $
-# bug 318297
-WANT_AUTOMAKE="1.10"
+EAPI="4"
inherit autotools eutils
@@ -25,13 +24,9 @@ DEPEND="dev-lang/perl
dev-perl/XML-LibXML
app-text/docbook-xsl-stylesheets
=app-text/docbook-xml-dtd-4.2*"
-
RDEPEND="${DEPEND}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
# Patches from debian, for description see patches itself.
epatch "${FILESDIR}"/${P}-filename_whitespace_handling.patch
epatch "${FILESDIR}"/${P}-preprocessor_declaration_syntax.patch
@@ -40,18 +35,10 @@ src_unpack() {
eautoreconf #290284
}
-src_compile() {
+src_configure() {
econf \
--with-xslt-processor=libxslt \
- --program-transform-name='s,\(docbook2.*\),\1.pl,' \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+ --program-transform-name='/^docbook2/s,$,.pl,'
}
pkg_postinst() {