flex-2.5.22 fixes

diff --git a/sys-devel/bc/ChangeLog b/sys-devel/bc/ChangeLog
index 3f0dd6c54c33994fa7629a2402e2e0b86d0e626a..1e836ef990059bfbacd7c5decaca2da2b8938cbe 100644 (file)
--- a/sys-devel/bc/ChangeLog
+++ b/sys-devel/bc/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for sys-devel/bc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.2 2002/10/23 18:22:12 azarah Exp $
 
 *bc-1.06-r3 (1 Feb 2002)
 
+  23 Oct 2002; Martin Schlemmer <azarah@gentoo.org> bc-1.06-r3.ebuild :
+
+  Fix to work with flex-2.5.22 and up.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is

diff --git a/sys-devel/bc/bc-1.06-r3.ebuild b/sys-devel/bc/bc-1.06-r3.ebuild
index 8ef31af0109cf9d113ebb608088a077fb44d6212..283020f1446b14630025942e28aadedc6a423ad2 100644 (file)
--- a/sys-devel/bc/bc-1.06-r3.ebuild
+++ b/sys-devel/bc/bc-1.06-r3.ebuild
@@ -1,40 +1,63 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r3.ebuild,v 1.11 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r3.ebuild,v 1.12 2002/10/23 18:22:12 azarah Exp $
 
 IUSE="readline"
       
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 DESCRIPTION="Handy console-based calculator utility"
-HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
 SRC_URI="ftp://prep.ai.mit.edu/pub/gnu/bc/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
+
 LICENSE="GPL-2 & LGPL-2.1"
 SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+
 RDEPEND="readline? ( >=sys-libs/readline-4.1 
        >=sys-libs/ncurses-5.2 )"
 DEPEND="$RDEPEND sys-devel/flex"
-KEYWORDS="x86 ppc sparc sparc64 alpha"
 
 src_unpack() {
 
        unpack ${A} ; cd ${S}
+
        patch -p1 < ${FILESDIR}/bc-1.06-info-fix.diff || die
        patch -p1 < ${FILESDIR}/bc-1.06-readline42.diff || die
+
+       # Command line arguments for flex changed from the old
+       # 2.5.4 to 2.5.22, so fix configure if we are using the
+       # new flex.
+       # <azarah@gentoo.org> (23 Oct 2002)
+       local flmajor="`flex --version | cut -d. -f1`"
+       local flminor="`flex --version | cut -d. -f2`"
+       local flmicro="`flex --version | cut -d. -f3`"
+       if [ "${flmajor/flex }" -ge 2 -a \
+            "${flminor/flex }" -ge 5 -a \
+            "${flmicro/flex }" -ge 22 ]
+       then
+               cd ${S}; cp configure configure.orig
+               sed -e 's:flex -I8:flex -I:g' \
+                       configure.orig > configure
+       fi
 }
 
 src_compile() {
 
-       local myconf
+       local myconf=""
        use readline && myconf="--with-readline"
-       ./configure ${myconf} --host=${CHOST} --prefix=/usr || die
+
+       econf ${myconf} || die
+
        emake || die
 }
 
 src_install() {
 
        into /usr
-       doinfo doc/*.info
        dobin bc/bc dc/dc
+
+       doinfo doc/*.info
        doman doc/*.1
        dodoc AUTHORS COPYING* FAQ NEWS README ChangeLog
 }
+