bootstrap fixes; cleanup

9 files changed, 11 insertions, 201 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 544fcb7bdbf3..8238e348a6e1 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/m4
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.14 2003/06/05 07:08:10 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.15 2003/09/08 02:13:16 azarah Exp $
+
+  08 Sep 2003; Martin Schlemmer <azarah@gentoo.org> m4-1.4.ebuild,
+  m4-1.4o-r2.ebuild, m4-1.4p-r1.ebuild, m4-1.4p.ebuild:
+  Bootstrap fixups; cleanup old ebuilds.
 
   05 Jun 2003; Daniel Robbins <drobbins@gentoo.org> m4-1.4.ebuild:
   removed perl dependency. Not required.
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index d7a26658936a..5ebdffda725b 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,9 +1,3 @@
-MD5 45f1eac72b4f9c81f6419b649302cbd9 ChangeLog 1796
-MD5 c06a03afd689cdc67c6b7a84166b6edf m4-1.4.ebuild 1193
-MD5 b33c32e0dba826ef64ae97f086ffa9d1 m4-1.4o-r2.ebuild 1142
-MD5 87d74d52dce6222d7e15acaa42aa65cc m4-1.4p-r1.ebuild 1540
-MD5 5eb850fad04a28f579500e015309f71b m4-1.4p.ebuild 1529
+MD5 880bac009d9898004e76f34f1c4bdb0d ChangeLog 1959
+MD5 b029a2122e7bd6383147b87f3fa66808 m4-1.4.ebuild 1208
 MD5 bb66a9e8ca60b752e95b5234d7f7b0b0 files/digest-m4-1.4 118
-MD5 fd56a0a7848beda0e23b0c9efdb286df files/digest-m4-1.4o-r2 59
-MD5 df58525b27b74338c793376824215b78 files/digest-m4-1.4p 63
-MD5 df58525b27b74338c793376824215b78 files/digest-m4-1.4p-r1 63
diff --git a/sys-devel/m4/files/digest-m4-1.4o-r2 b/sys-devel/m4/files/digest-m4-1.4o-r2
deleted file mode 100644
index a9e36e480abd..000000000000
--- a/sys-devel/m4/files/digest-m4-1.4o-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99b833fc3d3aeb6621d9d00661b8abc7 m4-1.4o.tar.gz 700570
diff --git a/sys-devel/m4/files/digest-m4-1.4p b/sys-devel/m4/files/digest-m4-1.4p
deleted file mode 100644
index a8c5d9091fb0..000000000000
--- a/sys-devel/m4/files/digest-m4-1.4p
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a40e0a64e0c0128e38b7e4892beba2cb m4-1.4ppre2.tar.gz 689255
diff --git a/sys-devel/m4/files/digest-m4-1.4p-r1 b/sys-devel/m4/files/digest-m4-1.4p-r1
deleted file mode 100644
index a8c5d9091fb0..000000000000
--- a/sys-devel/m4/files/digest-m4-1.4p-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a40e0a64e0c0128e38b7e4892beba2cb m4-1.4ppre2.tar.gz 689255
diff --git a/sys-devel/m4/m4-1.4.ebuild b/sys-devel/m4/m4-1.4.ebuild
index d747fe33a6ac..ef7b1e1943d2 100644
--- a/sys-devel/m4/m4-1.4.ebuild
+++ b/sys-devel/m4/m4-1.4.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/m4/m4-1.4.ebuild,v 1.7 2003/09/05 02:03:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.ebuild,v 1.8 2003/09/08 02:13:16 azarah Exp $
 
 IUSE="nls"
 
@@ -16,9 +16,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ppc sparc alpha mips hppa arm"
 
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )
-	>=sys-devel/libtool-1.3.5-r2"
+DEPEND="virtual/glibc 
+	!bootstrap? ( >=sys-devel/libtool-1.3.5-r2 )
+	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/glibc"
 
diff --git a/sys-devel/m4/m4-1.4o-r2.ebuild b/sys-devel/m4/m4-1.4o-r2.ebuild
deleted file mode 100644
index 7a821c52289a..000000000000
--- a/sys-devel/m4/m4-1.4o-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4o-r2.ebuild,v 1.14 2003/09/05 02:03:56 msterret Exp $
-
-IUSE="nls"
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU macro processor"
-SRC_URI="ftp://ftp.seindal.dk/gnu/${A}"
-HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )
-	>=sys-devel/libtool-1.3.5-r2"
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	local myconf
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
-	try ./configure --prefix=/usr --libexecdir=/usr/lib \
-		--mandir=/usr/share/man --infodir=/usr/share/info \
-		--with-modules --host=${CHOST} ${myconf}
-	try make ${MAKEOPTS}
-}
-
-src_install() {
-	cd ${S}
-
-	try make prefix=${D}/usr libexecdir=${D}/usr/lib \
-		mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-
-	rm -rf ${D}/usr/include
-
-	dodoc AUTHORS BACKLOG ChangeLog COPYING NEWS README* THANKS TODO
-	docinto modules
-	dodoc modules/README modules/TODO
-	docinto html
-	dodoc examples/WWW/*.htm
-}
diff --git a/sys-devel/m4/m4-1.4p-r1.ebuild b/sys-devel/m4/m4-1.4p-r1.ebuild
deleted file mode 100644
index 283d168b5a66..000000000000
--- a/sys-devel/m4/m4-1.4p-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4p-r1.ebuild,v 1.7 2003/09/05 02:03:56 msterret Exp $
-
-inherit gnuconfig
-
-IUSE="nls"
-
-MY_P="${P/p/ppre2}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="GNU macro processor"
-SRC_URI="ftp://ftp.seindal.dk/gnu/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa arm"
-
-DEPEND="virtual/glibc
-	dev-lang/perl
-	nls? ( sys-devel/gettext )
-	>=sys-devel/libtool-1.3.5-r2"
-
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	cp ${S}/tests/mkconfig.sh ${S}/tests/mkconfig.sh.orig
-	sed '2s:^:#:' < ${S}/tests/mkconfig.sh.orig > ${S}/tests/mkconfig.sh
-
-	use alpha && gnuconfig_update
-}
-
-src_compile() {
-	local myconf=
-
-	use nls || myconf="--disable-nls"
-
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-modules \
-		--host=${CHOST} \
-		${myconf} || die
-
-	make ${MAKEOPTS} || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		libexecdir=${D}/usr/lib \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-#	rm -rf ${D}/usr/include
-
-	dodoc AUTHORS BACKLOG ChangeLog COPYING NEWS README* THANKS TODO
-	docinto modules
-	dodoc modules/README modules/TODO
-	docinto html
-	dohtml examples/WWW/*.htm
-
-	# mkconfig.sh creates this file in other revisions...
-	# It shouldn't be there, so we delete it.
-	rm -f /tmp/env
-}
diff --git a/sys-devel/m4/m4-1.4p.ebuild b/sys-devel/m4/m4-1.4p.ebuild
deleted file mode 100644
index 4086fdaee442..000000000000
--- a/sys-devel/m4/m4-1.4p.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4p.ebuild,v 1.16 2003/09/05 02:03:56 msterret Exp $
-
-inherit gnuconfig
-
-IUSE="nls"
-
-MY_P=${P/p/ppre2}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="GNU macro processor"
-SRC_URI="ftp://ftp.seindal.dk/gnu/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )
-	>=sys-devel/libtool-1.3.5-r2"
-
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	cp ${S}/tests/mkconfig.sh ${S}/tests/mkconfig.sh.orig
-	sed '2s:^:#:' < ${S}/tests/mkconfig.sh.orig > ${S}/tests/mkconfig.sh
-
-	use alpha && gnuconfig_update
-}
-
-src_compile() {
-	local myconf
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
-
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-modules \
-		--host=${CHOST} \
-		${myconf} || die
-
-	make ${MAKEOPTS} || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		libexecdir=${D}/usr/lib \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-#	rm -rf ${D}/usr/include
-
-	dodoc AUTHORS BACKLOG ChangeLog COPYING NEWS README* THANKS TODO
-	docinto modules
-	dodoc modules/README modules/TODO
-	docinto html
-	dohtml examples/WWW/*.htm
-
-	# mkconfig.sh creates this file in other revisions...
-	# It shouldn't be there, so we delete it.
-	rm -f /tmp/env
-}