summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-06-10 13:56:23 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-06-10 13:56:23 +0000
commit53a319dd62cd0083bb378d9ac27e375a2fc081cb (patch)
treee7388cc5597528bf51e4059cb0b74b90ee7dbff0 /app-text
parent[dev-texlive/texlive-documentation-bulgarian] add ~mips keywords (diff)
downloadgentoo-2-53a319dd62cd0083bb378d9ac27e375a2fc081cb.tar.gz
gentoo-2-53a319dd62cd0083bb378d9ac27e375a2fc081cb.tar.bz2
gentoo-2-53a319dd62cd0083bb378d9ac27e375a2fc081cb.zip
Add fix for parallel build, closes bug #273143.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/xmlto/ChangeLog6
-rw-r--r--app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch19
-rw-r--r--app-text/xmlto/xmlto-0.0.22.ebuild7
3 files changed, 29 insertions, 3 deletions
diff --git a/app-text/xmlto/ChangeLog b/app-text/xmlto/ChangeLog
index b05deda9376f..1db0aedab889 100644
--- a/app-text/xmlto/ChangeLog
+++ b/app-text/xmlto/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/xmlto
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.49 2009/05/22 13:08:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.50 2009/06/10 13:56:22 flameeyes Exp $
+
+ 10 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> xmlto-0.0.22.ebuild,
+ +files/xmlto-0.0.22-parallelmake.patch:
+ Add fix for parallel build, closes bug #273143.
22 May 2009; Samuli Suominen <ssuominen@gentoo.org>
files/xmlto-0.0.22-format_fo_passivetex_check.patch:
diff --git a/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch b/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch
new file mode 100644
index 000000000000..eec3d6d7210f
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch
@@ -0,0 +1,19 @@
+Index: xmlto-0.0.22/Makefile.am
+===================================================================
+--- xmlto-0.0.22.orig/Makefile.am
++++ xmlto-0.0.22/Makefile.am
+@@ -67,11 +67,9 @@ EXTRA_DIST = xmlto.spec \
+ doc/xmlif.xml \
+ xmlto.mak
+
+-$(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
+- for xml in xmlif.xml xmlto.xml; do \
+- FORMAT_DIR=$(top_srcdir)/format \
+- $(BASH) ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
+- done || ( RC=$$?; exit $$RC )
++man/man1/%.1: doc/%.xml
++ FORMAT_DIR=$(top_srcdir)/format \
++ $(BASH) ./xmlto -o $(dir $@) man $<
+
+ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
+ TESTS = xmlif/test/run-test
diff --git a/app-text/xmlto/xmlto-0.0.22.ebuild b/app-text/xmlto/xmlto-0.0.22.ebuild
index 915f2dadea55..59e971dff4d0 100644
--- a/app-text/xmlto/xmlto-0.0.22.ebuild
+++ b/app-text/xmlto/xmlto-0.0.22.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.22.ebuild,v 1.2 2009/05/22 12:57:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.22.ebuild,v 1.3 2009/06/10 13:56:22 flameeyes Exp $
EAPI=2
-inherit eutils
+inherit eutils autotools
DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
HOMEPAGE="https://fedorahosted.org/xmlto/browser"
@@ -29,6 +29,9 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-format_fo_passivetex_check.patch
+ epatch "${FILESDIR}"/${P}-parallelmake.patch
+
+ eautoreconf
}
src_configure() {