Fix info manual (was referencing old name); factor out autoreconf handling if we were to execute that on a non-live ebuild.

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

4 files changed, 40 insertions, 27 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 3165d221d9df..b79aa8fa9e61 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.169 2011/10/04 18:23:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.170 2011/11/02 15:09:11 flameeyes Exp $
+
+  02 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> grub-1.99-r2.ebuild,
+  grub-9999.ebuild:
+  Fix info manual (was referencing old name); factor out autoreconf handling if
+  we were to execute that on a non-live ebuild.
 
   04 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 78c71ba7bc0c..017c5b6102bf 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -41,24 +41,14 @@ EBUILD grub-0.97-r6.ebuild 8801 RMD160 3da0ba7ea62758c9fd352f7290b441c3e9f08fb6
 EBUILD grub-0.97-r8.ebuild 8941 RMD160 4caee80e02de14e6a88a3ab016df32f90c258f09 SHA1 be1f73938f4763cf6413afee97062abb8666ffbb SHA256 5876009e82e6556be90d2355defd3039d244f5a53313ba29ce937e9c14e169ff
 EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 SHA1 4796cd56c8e77239719bd31a0542b11129e7922f SHA256 153939f732549503f08dd2acff27325b3e398ffc065e16c1749281c6c66a97d5
 EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58
-EBUILD grub-1.99-r2.ebuild 7920 RMD160 50fbed308527298d07f7496548fefd4a6b4cc352 SHA1 4f355451b6bf22717038f03cb637a86539b51b7f SHA256 0edce7952ec39265ddfac804c7e7e76f504fd0f4d7983c1820335adb2fb11221
-EBUILD grub-9999.ebuild 7705 RMD160 654570be7597b4e7002a0c5072fe6cc2fab2d74e SHA1 7dc468d1128fa60dae41208dca25da980c9b1887 SHA256 5a6d2a699a8c470e6a2970b947c82c259bbeedbae59ab476ecdf125b53d62bf0
-MISC ChangeLog 34746 RMD160 96ccfb56167a5b2e3a8d4bdc46fbdde87bcf768c SHA1 7c1d4a34ee7ff673372f35bf046e2576ea32a408 SHA256 e6c4bf1077a68838c9a75a949a81182ab7c0e0c19c80f5d17261205fe5466593
+EBUILD grub-1.99-r2.ebuild 8173 RMD160 54cfa0067d173e38556f186e7cf112773c56b1a9 SHA1 738039d456a90d29cac850b63aaaa173923c202d SHA256 92d939e9d5a6554f19f2435c1f3ca2ae16510864216fe71c9c4ea90ea1cb4a0b
+EBUILD grub-9999.ebuild 7958 RMD160 eba980f636eea345ce5bed4d965c9882a1517fce SHA1 9ef7a9d8403a9bbf6c8047571e50056e8f3709ec SHA256 f40cbd4dccf473b6a5789b4ad08cc1c27cf4a3e35c5c42fbbf2f8a736af15fcf
+MISC ChangeLog 34972 RMD160 f77cd47f380e02d9efa0bb824ec3311a170b90cc SHA1 e88606cdd9b1ee6b2ae7825a5b2995b142e1b18c SHA256 0a9cee86eaf0b5fcb3e350955480525f335fd072084d4381b46420b07b7f2fe1
 MISC metadata.xml 515 RMD160 7ff103974a6e301b4ba14c55c674c1bf35b1a045 SHA1 05d70f211a5f37e1368b74f7a74b0830d8198787 SHA256 dc713fb7db877b0d8405ac8dba28c4253347205a46d677ffe71901c2f017fb0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOi07tAAoJEOSiRoyO7jvo8sgP/2esuIp0+ztcPz8ZOrzKoWpJ
-hQryqebvANC7/AeWBFsQhEfR+PIDyeKmpI/CuJWk7T7n+PTYNaX0lDLIuiqejagQ
-A5LiZxcImvXDRBpn2aLL5hYtcBklrV3PQjk+8NQEMW3+nowWjOu9YfixrNleGb/e
-ck3bi/pzpcE0TOTSNLKYiHDycrZxZDy8L80FVpy5YENOHzb9pR+6FKBHrWacFquL
-C9gp1Vphk59HEL6ZLViHF3s/OwoFDbvMUR/QqCwg2iulLiiuMP8eX9wePqiDPDgW
-eR3N+iUXlJr35StkrTI03uxPvqp6CkzsmKww8D7FyeDCvgyD4zDSI/PhQy3AUeGe
-Mm48T+FXBNEypN4GE93YvPOAZwyrHun82ElSrW7BFrvuNGj5Q3QhVbfZ7Stba52M
-whXOsuMayrJTAmJlNH6F0f48a7q6QiRgpXdiWY3k2bo60lLW0h7f9/yeHLm6qxdO
-5STXxQnW5YKWec8sRmmubADVXu9jzafYqpQEgCVQ8mtu7JomTMCTCKr8IpEWh2g1
-mm6aaWVuhkZ9oJ2UHsDuK3E6Uaumzupyc/ukl76dxoVWGxeWlvW+K46tkhSqbQRs
-LeCVtFwYyodNcYDv3mRiGgAMFwjbOxGDBsDxR44XRKsh84rqoVGJXaE7lSDVLPr2
-gpKYHDMbZ2cCle8gYjHR
-=TWBP
+iEYEARECAAYFAk6xXSgACgkQAiZjviIA2XhJngCbBR2dj7MP6kpTuMGRBI9uULgW
+JXoAoN5LRLu1jtnuhtsCTH+sKfUyO6dY
+=maf/
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.99-r2.ebuild b/sys-boot/grub/grub-1.99-r2.ebuild
index e83dd270524d..4133a4d176d2 100644
--- a/sys-boot/grub/grub-1.99-r2.ebuild
+++ b/sys-boot/grub/grub-1.99-r2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.5 2011/10/04 18:23:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.6 2011/11/02 15:09:11 flameeyes Exp $
 
 EAPI=4
 
 if [[ ${PV} == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="autotools bzr"
+	LIVE_ECLASS="bzr"
 	SRC_URI=""
+	DO_AUTORECONF="true"
 else
 	MY_P=${P/_/\~}
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
@@ -15,7 +16,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${LIVE_ECLASS}
+inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
 unset LIVE_ECLASS
 
 DESCRIPTION="GNU GRUB boot loader"
@@ -58,8 +59,9 @@ DEPEND="${RDEPEND}
 	>=dev-lang/python-2.5.2
 	sys-devel/flex
 	virtual/yacc
+	sys-apps/texinfo
 "
-if [[ ${PV} == "9999" ]]; then
+if [[ -n ${DO_AUTORECONF} ]] ; then
 	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
 else
 	DEPEND+=" app-arch/xz-utils"
@@ -170,8 +172,15 @@ src_prepare() {
 
 	epatch_user
 
+	# fix texinfo file name, as otherwise the grub2.info file will be
+	# useless
+	sed -i \
+		-e '/setfilename/s:grub.info:grub2.info:' \
+		-e 's:(grub):(grub2):' \
+		"${S}"/docs/grub.texi
+
 	# autogen.sh does more than just run autotools
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ -n ${DO_AUTORECONF} ]] ; then
 		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
 		(. ./autogen.sh) || die
 	fi
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index c5cc7d7a546a..b3b77b56ded6 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.44 2011/10/04 18:23:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.45 2011/11/02 15:09:11 flameeyes Exp $
 
 EAPI=4
 
 if [[ ${PV} == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="autotools bzr"
+	LIVE_ECLASS="bzr"
 	SRC_URI=""
+	DO_AUTORECONF="true"
 else
 	MY_P=${P/_/\~}
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
@@ -15,7 +16,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${LIVE_ECLASS}
+inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
 unset LIVE_ECLASS
 
 DESCRIPTION="GNU GRUB boot loader"
@@ -58,8 +59,9 @@ DEPEND="${RDEPEND}
 	>=dev-lang/python-2.5.2
 	sys-devel/flex
 	virtual/yacc
+	sys-apps/texinfo
 "
-if [[ ${PV} == "9999" ]]; then
+if [[ -n ${DO_AUTORECONF} ]] ; then
 	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
 else
 	DEPEND+=" app-arch/xz-utils"
@@ -166,8 +168,15 @@ src_prepare() {
 
 	epatch_user
 
+	# fix texinfo file name, as otherwise the grub2.info file will be
+	# useless
+	sed -i \
+		-e '/setfilename/s:grub.info:grub2.info:' \
+		-e 's:(grub):(grub2):' \
+		"${S}"/docs/grub.texi
+
 	# autogen.sh does more than just run autotools
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ -n ${DO_AUTORECONF} ]] ; then
 		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
 		(. ./autogen.sh) || die
 	fi