bootstrap fixes (bug #28119); cleanup

6 files changed, 30 insertions, 33 deletions

diff --git a/sys-devel/bison/ChangeLog b/sys-devel/bison/ChangeLog
index 341a467c8ee8..5f1cc79f4f25 100644
--- a/sys-devel/bison/ChangeLog
+++ b/sys-devel/bison/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/bison
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.18 2003/09/06 22:31:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.19 2003/09/08 02:14:58 azarah Exp $
+
+  08 Sep 2003; Martin Schlemmer <azarah@gentoo.org> bison-1.34-r1.ebuild,
+  bison-1.35.ebuild, bison-1.75.ebuild, bison-1.875.ebuild:
+  Add m4 DEPEND (bug #28119), with some other cleanups to older
+  ebuilds than 1.875.
 
   07 Sep 2003; Martin Schlemmer <azarah@gentoo.org> bison-1.875.ebuild:
   Fix DEPEND for when we have 'build' in USE.
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index c1889d24ba04..dc29a934bec4 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,8 +1,8 @@
-MD5 d5c8185871d1fb88a98f59353ad7aa25 bison-1.75.ebuild 1122
-MD5 7b52c81684fa7b02033abe5d0c3d157b ChangeLog 2947
-MD5 6237bb7c742aaabfba528d8521f856da bison-1.34-r1.ebuild 1190
-MD5 cabead588b35fd0ef81765e0db4d9cf2 bison-1.35.ebuild 1297
-MD5 a114e9f064d406a46184a4575c4cece6 bison-1.875.ebuild 1442
+MD5 0cac16652850dfa1153e22bccf9acbf5 bison-1.75.ebuild 1118
+MD5 28d991200f2614e3d9bb0886cf87bbc6 ChangeLog 3168
+MD5 a34d25d7b5864698403c8c03bcec6cb4 bison-1.34-r1.ebuild 1170
+MD5 362a2a676eb61507ecc0cb7ee8847fcf bison-1.35.ebuild 1275
+MD5 4d847ff7fbebcc64f8a65b0c0161a3af bison-1.875.ebuild 1352
 MD5 4a875793f3bd808692002c152e5e26c4 files/digest-bison-1.875 64
 MD5 9c4ca0c28c5762cc799cc3e56f51d54e files/digest-bison-1.35 63
 MD5 644a4912da3e5107f509022f173ec146 files/bison-1.875-gccerror.patch 1538
diff --git a/sys-devel/bison/bison-1.34-r1.ebuild b/sys-devel/bison/bison-1.34-r1.ebuild
index fc13ddf8e563..27c70fcb0a2f 100644
--- a/sys-devel/bison/bison-1.34-r1.ebuild
+++ b/sys-devel/bison/bison-1.34-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.34-r1.ebuild,v 1.11 2003/09/06 08:09:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.34-r1.ebuild,v 1.12 2003/09/08 02:14:58 azarah Exp $
 
 IUSE="nls static build"
 
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 DESCRIPTION="A yacc-compatible parser generator"
 SRC_URI="mirror://gnu/bison/${P}.tar.bz2"
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
@@ -16,11 +16,9 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 
-	local myconf
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
+	local myconf=
+	
+	use nls || myconf="--disable-nls"
 
 	./configure --prefix=/usr \
 		--datadir=/usr/share \
diff --git a/sys-devel/bison/bison-1.35.ebuild b/sys-devel/bison/bison-1.35.ebuild
index b8f734ee9f71..5fea9c0e8eb5 100644
--- a/sys-devel/bison/bison-1.35.ebuild
+++ b/sys-devel/bison/bison-1.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.35.ebuild,v 1.16 2003/09/06 08:09:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.35.ebuild,v 1.17 2003/09/08 02:14:58 azarah Exp $
 
 IUSE="nls static build" # icc"
 
@@ -18,11 +18,9 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 
-	local myconf
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
+	local myconf=
+	
+	use nls || myconf="--disable-nls"
 #	use icc && CC="iccbin" CXX="iccbin" LD="iccbin"
 
 	./configure --prefix=/usr \
diff --git a/sys-devel/bison/bison-1.75.ebuild b/sys-devel/bison/bison-1.75.ebuild
index a18968856135..d2860bc3bac1 100644
--- a/sys-devel/bison/bison-1.75.ebuild
+++ b/sys-devel/bison/bison-1.75.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.75.ebuild,v 1.10 2003/09/06 08:09:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.75.ebuild,v 1.11 2003/09/08 02:14:58 azarah Exp $
 
 IUSE="nls static build" # icc"
 
@@ -19,10 +19,10 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 
-#	use icc && CC="iccbin" CXX="iccbin" LD="iccbin"
-	local myconf=""
+	local myconf=
 
 	use nls || myconf="--disable-nls"
+#	use icc && CC="iccbin" CXX="iccbin" LD="iccbin"
 
 	econf ${myconf} || die
 
diff --git a/sys-devel/bison/bison-1.875.ebuild b/sys-devel/bison/bison-1.875.ebuild
index b693fd49176e..9096a390cc03 100644
--- a/sys-devel/bison/bison-1.875.ebuild
+++ b/sys-devel/bison/bison-1.875.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.875.ebuild,v 1.2 2003/09/06 22:31:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.875.ebuild,v 1.3 2003/09/08 02:14:58 azarah Exp $
 
 IUSE="nls static build" # icc"
 
@@ -14,7 +14,8 @@ SLOT="0"
 # do not compile xfree
 KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
-DEPEND="!build? ( nls? ( sys-devel/gettext ) )"
+DEPEND="sys-devel/m4
+	nls? ( sys-devel/gettext )"
 #	icc? ( dev-lang/icc )"
 
 
@@ -28,10 +29,10 @@ src_unpack() {
 
 src_compile() {
 
-#	use icc && CC="iccbin" CXX="iccbin" LD="iccbin"
 	local myconf=
 
 	use nls || myconf="--disable-nls"
+#	use icc && CC="iccbin" CXX="iccbin" LD="iccbin"
 
 	econf ${myconf} || die
 
@@ -57,13 +58,8 @@ src_install() {
 	# We do not need this.
 	rm -f ${D}/usr/lib/liby.a
 
-	if [ -z "`use build`" ]
-	then
-		dodoc COPYING AUTHORS NEWS ChangeLog README REFERENCES OChangeLog
-		docinto txt
-		dodoc doc/FAQ
-	else
-		rm -rf ${D}/usr/share/man ${D}/usr/share/info
-	fi
+	dodoc COPYING AUTHORS NEWS ChangeLog README REFERENCES OChangeLog
+	docinto txt
+	dodoc doc/FAQ
 }