Execute bootstrap script as pointed out by Sergei Trofimovich.

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

3 files changed, 30 insertions, 26 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index b066599cb1aa..9753422cc0f8 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/automake
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.154 2011/12/31 07:19:05 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.155 2012/01/19 16:17:29 vapier Exp $
+
+  19 Jan 2012; Mike Frysinger <vapier@gentoo.org> automake-9999.ebuild:
+  Execute bootstrap script as pointed out by Sergei Trofimovich.
 
 *automake-1.11.2 (31 Dec 2011)
 
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 76b08fd887ab..ea25b5fb5905 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -45,23 +45,23 @@ EBUILD automake-1.6.3-r1.ebuild 1497 RMD160 c4d1b5b2e605a1e90fcb195acb525ed449be
 EBUILD automake-1.7.9-r2.ebuild 1671 RMD160 3f507f67705c00bc78ae430b07d8afe3331413d9 SHA1 62ea8c1f4992791af548fb652b5aa8e2f672f2de SHA256 4c0ca5c7acd316145075c66ee84543bb9352075287d88b942139d8aee6fc0679
 EBUILD automake-1.8.5-r4.ebuild 1688 RMD160 1d52217f4cd225c1b734b407fdec80cda3b0323d SHA1 a98e99e77f10b9c4bdd1671cd34c6e7d354c016e SHA256 070b98552be58187a62aa40794d94420686a7bbaed0686a85bd97621a00c8da1
 EBUILD automake-1.9.6-r3.ebuild 1911 RMD160 2a056ece008e0030160dbf5e9a7b7804cfbdbcb3 SHA1 04da5793a096d5d057227b3dbf6c555c84fc3b04 SHA256 c015ac5f4b6117c036114ad348670ffaa674d280aa5cff2b53d08e5b4caec0f4
-EBUILD automake-9999.ebuild 1528 RMD160 9a5feec8789c746638b1e3501ded247f6b91bb56 SHA1 c52578a9d9f8d205bef61d4ab6c40ee3a557eb12 SHA256 2fd918f66ebe5c5962a35603eceaef8327fe29d1f36e1c04a6b29bc61e0e0c2b
-MISC ChangeLog 25029 RMD160 feef43dadf5016b5a4f989f06c4c5f96d1e743aa SHA1 61580dd710a19fa0d9ccd74261d305db3e7e2f27 SHA256 265549a7b056626e9491820dff07c9ea0a775f6756e420d9a7b7daf32d6090b0
+EBUILD automake-9999.ebuild 1616 RMD160 96c7bbdc46266a4ad970068831e1668c340cc3b7 SHA1 135afe33df46059b68c9bc53cd11e5d9c069797b SHA256 232cd799a9e0feff5f323bb7345cc56d2b0c1fd588e68ab213ff0720bfe37a1c
+MISC ChangeLog 25167 RMD160 7b5882567f721336d85473c5fdcc0ba4dd2bf861 SHA1 e525bcc8726c12de98028c8f91f9e265bc607900 SHA256 ff06bb23dfab8fe88f836bc899d381b88ac025eeb8ab0a4b512bd47dc09d0363
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO/reyAAoJELEHsLL7fEFWBiIP/RhK598hBni/zV1FSiT6Fk/X
-QA9Ka9E3KXy+MLntPvXy3paBr1ySaVkhFV7r3c0RIZdD6pNLWhUbgkxrLujz7tE3
-xGuua7+5P+uoq3KsC5ZRtpQuyDP4e/v8t34ZJs8JCI1LXIUEH4AigDNzO8YhS1mT
-kAAUVAkeiBoNgE3plWq+/Q/OcP9fAwmB1IQFGHJyDW6wvDytl3gYbPsgAxIu/pQT
-RR6t2yQnaRsrx5NILm6qdQ4OLftZTnNVTWvfGAEk3ewc61ctmcgK4fbNkeszRZe1
-5RR53m3ZBcPSPSPEbnw3F8iCwug54zFUhmWOa6z8eO1Z9lsSRgwDg83+tB3jaI3W
-jXOSjT4eCDaB1hSLCOlWeyk/zm6yEytJQppoMINSMmyvKub3lvgeZl0+Xdj1SAz8
-sr/0WmmklNM/UkWfBc8jZGW9Eh0E/XOWO/1wsXZeA60MnZUgFldUTQF4O2In7KvL
-5LMi2691obe0ekqQACj52Lw1BYf/LLqS+VzZbdPGmKCqCSPVM/Q9S3ZBFYBnXARx
-/zzmO0mj2Ts0gKsZnDK8me9J23iD8Juntou7bNW3p8DOFbTr9Z038ulmjcFTnUW8
-3DcQATE2rNJeL0PPNJLjOZtP8eWbPZWCWt7tF5WPPhW/az1XXX83T4lL+MF5RU2+
-uZH5yTGsQ0VZiMUhCmw4
-=Xh6F
+iQIcBAEBAgAGBQJPGEIfAAoJELEHsLL7fEFWgHIP/RgbC8ktgouy/MSrdV8rFETW
+5AivRmvIBmsn1D0vRU9Vuntm5zxJQvl0CT8uE8lUtaYzQL2phv1mXeR0C1A+JQna
+ytEhb3YUHkNL6YbFWPetDFSGjzvVEylPp4FN/y+AVrMiGCVtdZsgzqWHqMpSx5kk
+AZhLleYsUzMrb9tUw/tlNpLzZS7g0Cymwuu7ibnamWwS/U3RS5nH0p8rR4IR1gF9
+xMPt2TsbzFqo2IsSvyL3cTSBOL/KBELF1TgrJunLMTD9Oz4BEZP+V5fWvTjN20/m
+fWFraN+luAkj9SryuA47hEVm8e98Q5dgy71Q0lp/N9XkrVS8HR7ilwNVKvBaGHR3
+H/5b0Oc8F95c6Actu4ZiQISR7HbqO3eoxYqUJpTL2KitY/9A6LaZEIel4Qr/1t+x
+zitljY806Csk1qUWTkqfoea2PD+qj9AsQMdkcwIfJbY9DOAH8X6yz4j8VS8Er2tz
+PbiXu/uLNjxbM4FpUDu9i2nva5tKh86yKQpOrCqIAbhNMKx31l6dyhgf4gECjKey
+4HZrDB2LjJcD+0dubR/ntddXAIJVWQlvJLdxQZ1IO5wBVIOJjJGq6hjt8cNdCfGl
+SGvKuE8MzkLEmQbQWFcU/5+y7DA+AV6pU7BEWCAihf5YXqQgly8v6H+voLw13CTR
+kyzyY6bib5dRL+FF0kh9
+=xbV5
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 0eda3f4d3a85..0a69f10f4bca 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-9999.ebuild,v 1.4 2011/09/21 08:35:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-9999.ebuild,v 1.5 2012/01/19 16:17:29 vapier Exp $
 
+EAPI="2"
 EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
 	http://git.savannah.gnu.org/r/${PN}.git"
 
@@ -24,18 +25,18 @@ RDEPEND="dev-lang/perl
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
 
-src_unpack() {
-	git-2_src_unpack
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi || die "sed failed"
+		doc/automake.texi || die
 	export WANT_AUTOCONF=2.5
+	# Don't try wrapping the autotools this thing runs as it tends
+	# to be a bit esoteric, and the script does `set -e` itself.
+	./bootstrap
 }
 
-src_compile() {
-	econf --docdir=/usr/share/doc/${PF} || die
-	emake || die
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF}
 }
 
 src_install() {