Use portable fix for parallel make, include man pages in the dist to avoid CBUILD...

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/app-text/xmlto/ChangeLog b/app-text/xmlto/ChangeLog
index 5b078142de9026c4620fce72b64d57248ee81056..a1c4980b2e94996b386a53293d92021aeebe05ef 100644 (file)
--- a/app-text/xmlto/ChangeLog
+++ b/app-text/xmlto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/xmlto
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.68 2011/07/30 22:10:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.69 2011/08/19 15:23:41 vapier Exp $
+
+*xmlto-0.0.24-r1 (19 Aug 2011)
+
+  19 Aug 2011; Mike Frysinger <vapier@gentoo.org> +xmlto-0.0.24-r1.ebuild,
+  +files/xmlto-0.0.24-parallelmake.patch:
+  Use portable fix for parallel make, include man pages in the dist to avoid
+  CBUILD vs CHOST issues, and drop autotool regeneration to speed things up.
 
 *xmlto-0.0.24 (30 Jul 2011)
 

diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 5a90bf74140ea01d53c3548e670e7c6c45db07f9..6d492dfbe5ff8ebc2d5fabeada6372a3aa38c952 100644 (file)
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 RMD160 4b64ec2f1e3d69f352a5eb35275aca4b55a5dab8 SHA1 6cd57ff4025e087eb51fb85df03e3886afedbeab SHA256 64c1df49f92a44d4219c10b60e60bee34063fc6b99ae5f0ed1b14e11b27ea16d
 AUX xmlto-0.0.22-parallelmake.patch 690 RMD160 27f1eca6d1e55f6aae6c8e12145d0cd5ea9aee4b SHA1 deb114420982577cb504e407ccba97177eb474db SHA256 24f2bdcf3a96ef983625b7ad58cf7f78bc4943519617e6ed125066b9760fcaf5
+AUX xmlto-0.0.24-parallelmake.patch 1968 RMD160 a1a5ade46d34635491099ba54336f04125659e2e SHA1 8d26dbb3620f4a34231cd3aab6c8d336ab577868 SHA256 be7e5192ee9591ffae51ad64b525de3a4df95da7a7ddbf886ee74fb5434ac7b2
 DIST xmlto-0.0.22.tar.bz2 103939 RMD160 7e2bf68d114473a6ca5162c2d88eaf46ed3a5f46 SHA1 dfe5a5a80bfd814d9e048be55cf8e3d176ad2d0a SHA256 afccc4712f22e0b1773d45803187d7998319662766b10a963f5452d83c0324aa
 DIST xmlto-0.0.23.tar.bz2 105201 RMD160 bbf1e1ee8674a7faeb10643f74a6025d4421d66e SHA1 69aab42d941089db3edb32987299290e2472f675 SHA256 a9ffb2760ded55924708cf42f575aaa87cf38fce4d9019ad287213303a8cb1c4
+DIST xmlto-0.0.24-mans.tar.bz2 4575 RMD160 6687bf4d59b823f416b37b179a24ed6d9a315227 SHA1 e5c44ec88dd3e473d0be5151008b00d5fe190dc1 SHA256 1a5b78cf9b349023aaed17c2b39d94e123da58d9b682693013fb3bcdaac7735b
 DIST xmlto-0.0.24.tar.bz2 111860 RMD160 c3aa05569571aa7c2acbe0cc93c136a0d77a7d80 SHA1 68b1664e9ba4d76c37c373f2f0082d62c41506c8 SHA256 30f59f4cc87a5e86f74fc1d2e63ceb6adc7a260d438e0439689efc2588976e13
 EBUILD xmlto-0.0.22.ebuild 1423 RMD160 147777d7c455269167633ea220e2bea2a83e409b SHA1 54d07e3dea7dbace1fa8089ec784afef0135ffe4 SHA256 a0db187591e2290817f453a6c991bf2d2bee2f5b30e4c532ebb9e907cfcff14f
 EBUILD xmlto-0.0.23.ebuild 1516 RMD160 8dd5e2abd1ee25246214255c3657d094e26ae1e0 SHA1 b8435dddc75e705ab5b6f34a3e3dd281fb833e52 SHA256 f827fe95eb0d73ffae9d64dd80b61325bc9802b4853cbd2441fd94c1b81c80af
+EBUILD xmlto-0.0.24-r1.ebuild 1543 RMD160 ee4764806f2ae9337c968c07857bbcf2852c69a4 SHA1 f03ed8755b34ad1ae3e152808ccaaa6250622e56 SHA256 a42755a0b271674493f0ccb9382cafcdab535fe27d9764cf35434ae1264b68d2
 EBUILD xmlto-0.0.24.ebuild 1528 RMD160 041bb558ac6947f729e213848f82d059ffec1900 SHA1 a31a65c8086220008f5366e4382c6a810036d8ec SHA256 421d1282ddcabd3fee32e6565ee0d71c47caaf191470ed63e9952f3a94269c73
-MISC ChangeLog 8600 RMD160 91755ba29ae043196866eecfc296c26ce1109328 SHA1 195b17ed3781f19c2437b537a9625962a7bc742b SHA256 2d9eaa69195ccccf23ed63363c45cc5cb79eb1be7c30cd9c525e77e50fa1a63b
+MISC ChangeLog 8903 RMD160 fa68030fb6d4e8396dff867cfbdab39783782f07 SHA1 52af205d7463cec0cc72a5ac7410ad7cc8ecaf9f SHA256 01aad60157a921f9713495c7978a94c819f77c42d17212de60b757321449df8f
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5OgAMACgkQaC/OocHi7JbI6QD/To/FJnfcedOfUrM8tFLjx6pI
+JZHXRMi8PMlYgR5n3DcA/Rgbw7VWU3h6lbAGV4zmB4EhhCiehteppVwaWZilf7Bf
+=bA4R
+-----END PGP SIGNATURE-----

diff --git a/app-text/xmlto/files/xmlto-0.0.24-parallelmake.patch b/app-text/xmlto/files/xmlto-0.0.24-parallelmake.patch
new file mode 100644 (file)
index 0000000..6d18724
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.24-parallelmake.patch
@@ -0,0 +1,56 @@
+From f2ada08ce5b92de1869419f1ed50aa1190a8bfb4 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 19 Aug 2011 10:47:10 -0400
+Subject: [PATCH] fix building manpages in parallel
+
+The current man page rules allow make to fire off two children (1 per
+man page), but each child will attempt to create all the required man
+pages.  So it's possible for the children to collide on their outputs.
+Rewrite the rules so that each man page will fire off one child and
+only process its specific man page.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile.am |    8 +++-----
+ 1 files changed, 3 insertions(+), 5 deletions(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -68,11 +68,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 )
++GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $<
++man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE)
++man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE)
+ 
+ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
+ TESTS = xmlif/test/run-test
+
+The Makefile.in patch is trivial, so avoid autotools just for this
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -959,11 +959,9 @@
+       uninstall-man uninstall-man1 uninstall-nobase_pkgdataDATA
+ 
+ 
+-$(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 )
++GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $<
++man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE)
++man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE)
+ 
+ tag:
+       cvs tag -c `echo V@VERSION@ | tr . _`
+-- 
+1.7.6
+

diff --git a/app-text/xmlto/xmlto-0.0.24-r1.ebuild b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
new file mode 100644 (file)
index 0000000..5ec7acd
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.1 2011/08/19 15:23:41 vapier Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
+HOMEPAGE="https://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2
+       mirror://gentoo/${P}-mans.tar.bz2
+       http://dev.gentoo.org/~vapier/dist/${P}-mans.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="latex"
+
+RDEPEND="app-shells/bash
+       || ( sys-apps/which sys-freebsd/freebsd-ubin )
+       dev-libs/libxslt
+       >=app-text/docbook-xsl-stylesheets-1.62.0-r1
+       ~app-text/docbook-xml-dtd-4.2
+       || ( sys-apps/util-linux app-misc/getopt )
+       || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
+       latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
+DEPEND="${RDEPEND}
+       sys-devel/flex"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+       epatch "${FILESDIR}"/${PN}-0.0.24-parallelmake.patch
+}
+
+src_configure() {
+       export BASH
+       has_version sys-apps/util-linux || export GETOPT="getopt-long"
+       econf
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
+       insinto /usr/share/doc/${PF}/xml
+       doins doc/*.xml
+}