Move sys-devel/m4 from DEPEND to RDEPEND so stage1 builds via catalyst pull it into the stage1root correctly.

Package-Manager: portage-2.1_rc3

5 files changed, 43 insertions, 44 deletions

diff --git a/sys-devel/bison/ChangeLog b/sys-devel/bison/ChangeLog
index 1cf7c2a027a2..533a6659a45d 100644
--- a/sys-devel/bison/ChangeLog
+++ b/sys-devel/bison/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/bison
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.52 2006/05/23 06:49:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.53 2006/05/31 21:28:03 kumba Exp $
+
+  01 Jun 2006; Joshua Kinard <kumba@gentoo.org> bison-2.1.ebuild,
+  bison-2.2.ebuild:
+  Move sys-devel/m4 from DEPEND to RDEPEND so stage1 builds via catalyst pull
+  it into the stage1root correctly.
 
 *bison-2.2 (23 May 2006)
 
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 27890654e5ee..dfc2bc8422c5 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,48 +1,45 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX bison-1.32-extfix.patch 1170 RMD160 41daa5ee80712e419a15233af15efbd174ac1adf SHA1 a7cab61f53ca9d9d97b99c8687df1f092e1c1dbc SHA256 a47285e1b6f1ee53b8def53380068ad6a86ccd09e3338481f6d3d14c7e8b31c4 size 1170
+AUX bison-1.32-extfix.patch 1170 RMD160 41daa5ee80712e419a15233af15efbd174ac1adf SHA1 a7cab61f53ca9d9d97b99c8687df1f092e1c1dbc SHA256 a47285e1b6f1ee53b8def53380068ad6a86ccd09e3338481f6d3d14c7e8b31c4
 MD5 61b224a9eaf1ae7f77c2d1456d8fda87 files/bison-1.32-extfix.patch 1170
 RMD160 41daa5ee80712e419a15233af15efbd174ac1adf files/bison-1.32-extfix.patch 1170
 SHA256 a47285e1b6f1ee53b8def53380068ad6a86ccd09e3338481f6d3d14c7e8b31c4 files/bison-1.32-extfix.patch 1170
-AUX bison-1.875-gccerror.patch 1538 RMD160 f635120e5ee491a41b7593bf7bd9011abb73413b SHA1 591848455f5694dbf31d3564e20defde3cbb2cea SHA256 336cf89a430b6e54d206e2aa564455f7a81f5116c063a3f45d0f42b6cedf44af size 1538
+AUX bison-1.875-gccerror.patch 1538 RMD160 f635120e5ee491a41b7593bf7bd9011abb73413b SHA1 591848455f5694dbf31d3564e20defde3cbb2cea SHA256 336cf89a430b6e54d206e2aa564455f7a81f5116c063a3f45d0f42b6cedf44af
 MD5 644a4912da3e5107f509022f173ec146 files/bison-1.875-gccerror.patch 1538
 RMD160 f635120e5ee491a41b7593bf7bd9011abb73413b files/bison-1.875-gccerror.patch 1538
 SHA256 336cf89a430b6e54d206e2aa564455f7a81f5116c063a3f45d0f42b6cedf44af files/bison-1.875-gccerror.patch 1538
-AUX bison-2.0-token-name-translate.patch 826 RMD160 5e396bb32a633d5d8047e1ea7893e6322f663bd4 SHA1 cab128c6612745ef3394e3e18f2220551f0fd026 SHA256 9b9257066e1a80185599b3e871c6f1c44c0247659073ee53f3db49dc16f03c73 size 826
+AUX bison-2.0-token-name-translate.patch 826 RMD160 5e396bb32a633d5d8047e1ea7893e6322f663bd4 SHA1 cab128c6612745ef3394e3e18f2220551f0fd026 SHA256 9b9257066e1a80185599b3e871c6f1c44c0247659073ee53f3db49dc16f03c73
 MD5 b0e8983afb264754c539f1eb53116970 files/bison-2.0-token-name-translate.patch 826
 RMD160 5e396bb32a633d5d8047e1ea7893e6322f663bd4 files/bison-2.0-token-name-translate.patch 826
 SHA256 9b9257066e1a80185599b3e871c6f1c44c0247659073ee53f3db49dc16f03c73 files/bison-2.0-token-name-translate.patch 826
-DIST bison-1.875.tar.bz2 814922 size 814922
-DIST bison-1.875d.tar.bz2 882745 size 882745
-DIST bison-2.0.tar.gz 1163590 size 1163590
-DIST bison-2.1.tar.bz2 1005925 size 1005925
-DIST bison-2.2.tar.bz2 1077707 RMD160 c31ff04eeebdfc3fe1bef860daeb7c979d9054af SHA256 cb453a8b691ff3172ca470986da34d27bffac897347e6a5190b3938c8008ccb6 size 1077707
-EBUILD bison-1.875.ebuild 1796 RMD160 c1e45b6dd3e8b00cd8360105b477cc3b17a2457c SHA1 9bb03a21935b91d9c31c0e417a9e2b03c48a3b51 SHA256 bc58b359307667e7efc1843856227d6ad29e536e485ea18b2681824840e4b83d size 1796
+DIST bison-1.875.tar.bz2 814922
+DIST bison-1.875d.tar.bz2 882745
+DIST bison-2.0.tar.gz 1163590
+DIST bison-2.1.tar.bz2 1005925 RMD160 43967931eb04635547277bbd0152b45414420299 SHA1 0a3a5b3a506e4c406e6a82640058d3a29a309b84 SHA256 cb960197a77cfe8d36a969daa6eec577e22ca3d8fbae852b2cee5248bf6ae8ec
+DIST bison-2.2.tar.bz2 1077707 RMD160 c31ff04eeebdfc3fe1bef860daeb7c979d9054af SHA1 b01691c83cc0d08d3c03e32c494f6b03381ecd21 SHA256 cb453a8b691ff3172ca470986da34d27bffac897347e6a5190b3938c8008ccb6
+EBUILD bison-1.875.ebuild 1796 RMD160 c1e45b6dd3e8b00cd8360105b477cc3b17a2457c SHA1 9bb03a21935b91d9c31c0e417a9e2b03c48a3b51 SHA256 bc58b359307667e7efc1843856227d6ad29e536e485ea18b2681824840e4b83d
 MD5 891a59b63cc7cc11c919095f55a38de3 bison-1.875.ebuild 1796
 RMD160 c1e45b6dd3e8b00cd8360105b477cc3b17a2457c bison-1.875.ebuild 1796
 SHA256 bc58b359307667e7efc1843856227d6ad29e536e485ea18b2681824840e4b83d bison-1.875.ebuild 1796
-EBUILD bison-1.875d.ebuild 1791 RMD160 b5553654327701aef430d2a89c9b3953527f2c54 SHA1 73f56d50b2ea7699f49a5f389c5719d5552e1346 SHA256 5a6b81bb6ae12138d2ac6f09e23fe393402c506cb2fdee10ae6e9cd5bc93b55a size 1791
+EBUILD bison-1.875d.ebuild 1791 RMD160 b5553654327701aef430d2a89c9b3953527f2c54 SHA1 73f56d50b2ea7699f49a5f389c5719d5552e1346 SHA256 5a6b81bb6ae12138d2ac6f09e23fe393402c506cb2fdee10ae6e9cd5bc93b55a
 MD5 8daee23ecbd311833a371ff404cde24a bison-1.875d.ebuild 1791
 RMD160 b5553654327701aef430d2a89c9b3953527f2c54 bison-1.875d.ebuild 1791
 SHA256 5a6b81bb6ae12138d2ac6f09e23fe393402c506cb2fdee10ae6e9cd5bc93b55a bison-1.875d.ebuild 1791
-EBUILD bison-2.0.ebuild 1468 RMD160 889f8a78e79c353ab7d44beee9d886c0dc6c6a6c SHA1 70633dbdfc5ffe967343f7a68c01ba28b320f9f9 SHA256 12b720f6c3693667fce03a4666c41b8cf67a1a7a9b3b7aa4bf951b10b75e2ad1 size 1468
+EBUILD bison-2.0.ebuild 1468 RMD160 889f8a78e79c353ab7d44beee9d886c0dc6c6a6c SHA1 70633dbdfc5ffe967343f7a68c01ba28b320f9f9 SHA256 12b720f6c3693667fce03a4666c41b8cf67a1a7a9b3b7aa4bf951b10b75e2ad1
 MD5 2242f1d96824a7a82fcb75e0660f1eb2 bison-2.0.ebuild 1468
 RMD160 889f8a78e79c353ab7d44beee9d886c0dc6c6a6c bison-2.0.ebuild 1468
 SHA256 12b720f6c3693667fce03a4666c41b8cf67a1a7a9b3b7aa4bf951b10b75e2ad1 bison-2.0.ebuild 1468
-EBUILD bison-2.1.ebuild 1404 RMD160 c2a8ef4f84b17adc784d3bbaaaf74d5d03074022 SHA1 83f51337ad5b465bb49ef582dc8c3a7b3d221de7 SHA256 59acb6364ec768083f28caaa30261305826ac17d95fcc2ddbf86fbad496618e6 size 1404
-MD5 1a699495a807ed4382e0b452a1d07f9f bison-2.1.ebuild 1404
-RMD160 c2a8ef4f84b17adc784d3bbaaaf74d5d03074022 bison-2.1.ebuild 1404
-SHA256 59acb6364ec768083f28caaa30261305826ac17d95fcc2ddbf86fbad496618e6 bison-2.1.ebuild 1404
-EBUILD bison-2.2.ebuild 1417 RMD160 a2eb51dbefb8777ec3ea2e46098af7dd1c3dfcfc SHA1 d95a04b49b20be82fd2c53551e3832d0064b1aea SHA256 30f1c5347be46232ca6ffb9f8fcc6576864073eb09638d8a65a4a6a3a4e66936 size 1417
-MD5 075b4a25207cfd7249dab29835bcda24 bison-2.2.ebuild 1417
-RMD160 a2eb51dbefb8777ec3ea2e46098af7dd1c3dfcfc bison-2.2.ebuild 1417
-SHA256 30f1c5347be46232ca6ffb9f8fcc6576864073eb09638d8a65a4a6a3a4e66936 bison-2.2.ebuild 1417
-MISC ChangeLog 7108 RMD160 f04dae7830f7311cc26b03d3b8999e7c5b805fcb SHA1 14d77443e931b1cc2de1a5461545d7ec9ff478c8 SHA256 27739bdec6aa378a761d6932ed823578c3e5a560173699d4cc54dd168ff0a92e size 7108
-MD5 dce36114a82cb171b050326cc9565f44 ChangeLog 7108
-RMD160 f04dae7830f7311cc26b03d3b8999e7c5b805fcb ChangeLog 7108
-SHA256 27739bdec6aa378a761d6932ed823578c3e5a560173699d4cc54dd168ff0a92e ChangeLog 7108
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
+EBUILD bison-2.1.ebuild 1414 RMD160 b104ea32a08db1aa85731c6221b443c14d3649e9 SHA1 9435cb990922017c50dc53b381070394e57155cb SHA256 5a41417c147d8fee71b4e9d740a1abe6cee43fcd101a74082ea33c8317eee896
+MD5 be1547f4c2d654bd910e89f348480a8e bison-2.1.ebuild 1414
+RMD160 b104ea32a08db1aa85731c6221b443c14d3649e9 bison-2.1.ebuild 1414
+SHA256 5a41417c147d8fee71b4e9d740a1abe6cee43fcd101a74082ea33c8317eee896 bison-2.1.ebuild 1414
+EBUILD bison-2.2.ebuild 1426 RMD160 d838fc7a0cc40f05bdca42c954afeeca8d0e1946 SHA1 7c0af5a34796a479362532f71bbbe43cb328d0cd SHA256 4475ea42a1468d42500e1a11fec9cfbd69b28b234a40e8aef5e7424e74d15790
+MD5 455b63ebd5652036baa3f08967ded600 bison-2.2.ebuild 1426
+RMD160 d838fc7a0cc40f05bdca42c954afeeca8d0e1946 bison-2.2.ebuild 1426
+SHA256 4475ea42a1468d42500e1a11fec9cfbd69b28b234a40e8aef5e7424e74d15790 bison-2.2.ebuild 1426
+MISC ChangeLog 7308 RMD160 fcca9a355ab240026bf43cc954624d795458a17a SHA1 f0fd9b84f5dc3fb1b27cd621d03d4770ec4e99bd SHA256 4b1acc8bbea3ceb761abea973278ef1c913e6fa91b9e3b49a1b3ab9396358b0e
+MD5 a41867ea2fd5098e4a49a3dc45444ac0 ChangeLog 7308
+RMD160 fcca9a355ab240026bf43cc954624d795458a17a ChangeLog 7308
+SHA256 4b1acc8bbea3ceb761abea973278ef1c913e6fa91b9e3b49a1b3ab9396358b0e ChangeLog 7308
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
@@ -55,16 +52,9 @@ SHA256 0deb244adda1556b060e941639187abf002e67f509dfdd731ad31b6056828d4c files/di
 MD5 4ac198b61c1a87f5070a32369477eda0 files/digest-bison-2.0 62
 RMD160 f8bb8d829b1e2c381eaadd0b51a0c27db429702f files/digest-bison-2.0 62
 SHA256 53b06127e183a00f4db6eb0b5c897709a0a503caf050f9943de586ed6fa30a72 files/digest-bison-2.0 62
-MD5 de372a3e3ac4588a2322ac386997d8c9 files/digest-bison-2.1 63
-RMD160 0fdd6a5ae0bd05d70728505711fe39759c7148a4 files/digest-bison-2.1 63
-SHA256 af8ed2bf8f0e956ca8261204a0ce67dd7d37e25acc314e65438eeef887218d8f files/digest-bison-2.1 63
+MD5 4398b16fc5cb450e7c97bde90ed1f245 files/digest-bison-2.1 235
+RMD160 3fdddb3d4db05001b49a2e789062a45cad9f460e files/digest-bison-2.1 235
+SHA256 0beec16a63c30894cef0c74deebce00ffc072268bb5f9f94c39ef49a73c7a679 files/digest-bison-2.1 235
 MD5 6406d1b37405529ba1156ed669e137f5 files/digest-bison-2.2 235
 RMD160 126d9977c63fdbad5e0404ef0a79e8a3280ef636 files/digest-bison-2.2 235
 SHA256 1241a419306087659a79630f1cea4139bf1971e37ec5bda9dcd3570a74d6fc88 files/digest-bison-2.2 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEcrEd2+ySkm8kpY0RAnMPAJ9u1dhh1sBWbe4oie8/wvbJruXDmACbBfas
-qgbjEQLevhPBJri9Yv2tkpc=
-=4rpR
------END PGP SIGNATURE-----
diff --git a/sys-devel/bison/bison-2.1.ebuild b/sys-devel/bison/bison-2.1.ebuild
index bb57a1de5b95..1eae169872d3 100644
--- a/sys-devel/bison/bison-2.1.ebuild
+++ b/sys-devel/bison/bison-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.1.ebuild,v 1.11 2006/04/24 01:06:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.1.ebuild,v 1.12 2006/05/31 21:28:03 kumba Exp $
 
 inherit toolchain-funcs flag-o-matic eutils gnuconfig
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="nls static"
 
-DEPEND="sys-devel/m4
-	nls? ( sys-devel/gettext )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+RDEPEND="sys-devel/m4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-devel/bison/bison-2.2.ebuild b/sys-devel/bison/bison-2.2.ebuild
index 1dc0934c8dcb..4859a15faff2 100644
--- a/sys-devel/bison/bison-2.2.ebuild
+++ b/sys-devel/bison/bison-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.2.ebuild,v 1.1 2006/05/23 06:49:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.2.ebuild,v 1.2 2006/05/31 21:28:03 kumba Exp $
 
 inherit toolchain-funcs flag-o-matic eutils gnuconfig
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="nls static"
 
-DEPEND="sys-devel/m4
-	nls? ( sys-devel/gettext )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+RDEPEND="sys-devel/m4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-devel/bison/files/digest-bison-2.1 b/sys-devel/bison/files/digest-bison-2.1
index de411061a568..894a55d2542e 100644
--- a/sys-devel/bison/files/digest-bison-2.1
+++ b/sys-devel/bison/files/digest-bison-2.1
@@ -1 +1,3 @@
 MD5 ef3110077462b1140b2ae612626e8486 bison-2.1.tar.bz2 1005925
+RMD160 43967931eb04635547277bbd0152b45414420299 bison-2.1.tar.bz2 1005925
+SHA256 cb960197a77cfe8d36a969daa6eec577e22ca3d8fbae852b2cee5248bf6ae8ec bison-2.1.tar.bz2 1005925