Update to EAPI=4, and make --program-transform-name work with newer versions of autotools #318297 by Patrick Lauer.

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 25 insertions, 24 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/Manifest b/app-text/docbook2X/Manifest
index d6a1359e2c2e..20eaf2bbaae0 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -10,14 +10,24 @@ DIST docbook2X-0.8.8.tar.gz 723909 RMD160 35c8dcbe86e91e787a67b1d17251bf00fed9aa
 EBUILD docbook2X-0.6.1-r2.ebuild 1493 RMD160 9b71d505117606242cfbbbe9b1c127a9d6d9565c SHA1 0da44b91ee4c2891ef982cb9d9d09569ea37f4b6 SHA256 0046e0cf067e085addeaec0ff0e3617b9c70542870baa09a412f0b9ee9535359
 EBUILD docbook2X-0.8.7-r1.ebuild 938 RMD160 719bbeb2fddde84764e532f597a91aa03a15b4cb SHA1 2d061cdfe0a924231edaa86f1ae7da42b944d02f SHA256 87138d6ef7e650e05a489a7815ed59a7a9838188f9df2ec6b628f0a0843e59f6
 EBUILD docbook2X-0.8.8-r1.ebuild 1032 RMD160 616b540f10794e7f4680e18886cce8dbd2718940 SHA1 6d64debc6b3107d887f68de29fd869c82ceb5bfd SHA256 04587c87194ca5f409296f43cbe20fb55fe5b5f6b52880cce3b4ecb385454d1d
-EBUILD docbook2X-0.8.8-r2.ebuild 1645 RMD160 36b8780af82632b5699f8633d4de9269950db704 SHA1 47d401e0b1151374a1399ab5d3319d4a3c7befae SHA256 cfa4e63c1f0e74bfc56b697a295a1604d869583f522cb00c6a470b5f321180cf
+EBUILD docbook2X-0.8.8-r2.ebuild 1414 RMD160 a1dd630756aff573cc6faa77c2ee8cedefb3e7ca SHA1 5c38752d61fba73c145e8e5a1394ed2d4a2920c0 SHA256 9272a527a6664407b3ff297908ba262d10743858d7bbbc17e270e2e2d922cf86
 EBUILD docbook2X-0.8.8.ebuild 1001 RMD160 7342631b1240fa4b8322aaa9bd00b92288cdffc6 SHA1 32de09cdd287df655697aaec6cd1bd0eaf67b0a3 SHA256 2cdf239aefe30673c829ae66b0ee1afd05d9e3e38fe558db8ff8f8a9d268055c
-MISC ChangeLog 6135 RMD160 3e05d791106dd7521e863b96feb9e5860bcf9e5f SHA1 e7c064795dbdbe3e1dde74d49ea237d41b3915f7 SHA256 f114ccfdf555bae5a59c516b18c7e6d2d62f7d2a8e5096a6cb9476fe7694661e
+MISC ChangeLog 6331 RMD160 fe7882ba00e00eb31a60d0073aefc8cee334cd4f SHA1 edc2aa6ed69794c106385989bda2afc5f86bfdad SHA256 be02da014c12fe573815d85151b2403c3361e45e42c4b75c404d18caf77c34dc
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+qkVUACgkQvFcC4BYPU0pvNACeMZRtSf2slxR3L5QH92lGaTkD
-3xwAoIpG3aqt9yx1lcmQz95gfWTeKnw9
-=QvU+
+iQIcBAEBAgAGBQJPvvxKAAoJELEHsLL7fEFWw8cP/3pR8DqfiIC8GcFdDGfkFQFW
+sA9f4GxAlGrtBaC7TZUZ7LTNUFCx/zYfwW+8GUx230jpsrYJe8fFfMoVZHh1KYT3
+Ns+x327+9WkYRfquhcVnoWOPwRDy2m2XqMr5Ix7faGj7n+9LxWweGgd78T3ORy83
+pDU5dcpXn8EVSt1kFxDL/OKXb4DKMhkqK/AaTCzshi7bgxGN8XHZ55aNuG5HWNCP
+sIJ26ILWijUdWfvGA6QtSvCmS9AOwvw43LnxZvM8S2eVpOC4mW/NTc6JoKFBZzIM
+KCM+5phMUuy8jMTVOCcdvpqIrywuyhm+VhjINhgUIO07zYjqCNhWsYVR4VrN+DpF
+OJi8W9uEpSpmSX5LC9wenBv3XhnMOTMiohdRMklwR0Kk4kZcJR+jRgV9ZNu0qI2j
+hdpfkkcZWxHCkd1ASByYendIANWaPtMFe8G0Wo+ECKO7JgenUMtDu7m29H5OXuGv
+3ibl1PIU2szsLyhsy+9WJbX1q3YCNbsjvMtN1sZw5bLD0ZsXZqmZ6sUim/EYCEjO
+kxgoRXgq0ytip8pjvnHXgEo9rVkFcQdU4gKLoTiQ4cjPGQEEiWPBtr4okXijRXZ7
+7kYDPtalxUN37Qju8T12fylzVIzVYRoGSa1whQ7kZRZIbgjMK937NG8TavyX+b2v
+XkRn2MD/OGDaCMjTGX/m
+=DKyT
 -----END PGP SIGNATURE-----
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() {