Punt eradicators stuff from our stable ebuild and make a new version with proper autoconf updates.

(Portage version: 2.0.51-r14)

5 files changed, 78 insertions, 27 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 3cfa4b86e848..49c4ec125776 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/flex
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.26 2005/01/20 08:25:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.27 2005/01/21 00:07:04 vapier Exp $
+
+*flex-2.5.4a-r6 (20 Jan 2005)
+
+  20 Jan 2005; Mike Frysinger <vapier@gentoo.org> flex-2.5.4a-r5.ebuild,
+  +flex-2.5.4a-r6.ebuild:
+  Punt eradicators stuff from our stable ebuild and make a new version with
+  proper autoconf updates.
 
   20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   flex-2.5.4a-r5.ebuild:
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index e04998dc1ab2..5d6f7e1730e0 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,10 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 92f01c1f4f17ca32af6d05e135791d17 ChangeLog 3669
 MD5 7f450ba3d60ff7e52f6ea764a994df09 flex-2.5.31-r1.ebuild 1002
-MD5 1c833ebad5eafca71b4b3a40308e0ffa flex-2.5.4a-r5.ebuild 1327
+MD5 c2c6dd9422c6e772e5d4ab851f816110 flex-2.5.4a-r5.ebuild 1318
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 010490a38fb466c55eeeaeea5208917f flex-2.5.4a-r6.ebuild 1465
+MD5 483b62e5eb13bbcf72e8ec7aaa34f554 files/digest-flex-2.5.4a-r6 137
 MD5 46a5f0c3323bbf9d46b3682cf9b39263 files/digest-flex-2.5.31-r1 64
 MD5 a50411d58e9407414db98087253bdacd files/digest-flex-2.5.4a-r5 63
 MD5 b15be3f047c018fe805fe4c5b4243b93 files/flex-2.5.31-yytext_ptr.patch 265
@@ -12,10 +11,3 @@ MD5 06f3fd21134a6d82073ce64e2ad60274 files/flex-2.5.4-glibc22.patch 2241
 MD5 497470663c67fc14a2eb95b51f7f9614 files/flex-2.5.4a-gcc3.patch 277
 MD5 de46348f431a1b72e51b8f2253ebcaf3 files/flex-2.5.4a-gcc31.patch 3189
 MD5 28010d818ed73f21c9d37fd955c9f25b files/flex-2.5.4a-skel.patch 350
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB8DwVroRuSHgZdywRAtGRAJ9AOjabKD5EDr42Ab0QCTLaJpZEsACfeafk
-Q+nIV6Y+6K7KOwHfTCH4p10=
-=D0rJ
------END PGP SIGNATURE-----
diff --git a/sys-devel/flex/files/digest-flex-2.5.4a-r6 b/sys-devel/flex/files/digest-flex-2.5.4a-r6
new file mode 100644
index 000000000000..679ba09b5190
--- /dev/null
+++ b/sys-devel/flex/files/digest-flex-2.5.4a-r6
@@ -0,0 +1,2 @@
+MD5 bd8753d0b22e1f4ec87a553a73021adf flex-2.5.4a.tar.gz 380995
+MD5 396f08cba3e1a3425071a7fee397cce4 flex-2.5.4a-autoconf.patch.bz2 13710
diff --git a/sys-devel/flex/flex-2.5.4a-r5.ebuild b/sys-devel/flex/flex-2.5.4a-r5.ebuild
index b1d627e8b4d6..4df8cd65a917 100644
--- a/sys-devel/flex/flex-2.5.4a-r5.ebuild
+++ b/sys-devel/flex/flex-2.5.4a-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r5.ebuild,v 1.31 2005/01/20 08:25:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r5.ebuild,v 1.32 2005/01/21 00:07:04 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -15,9 +15,6 @@ IUSE="build static"
 
 RDEPEND="virtual/libc"
 
-DEPEND="virtual/libc
-	sys-devel/autoconf"
-
 S="${WORKDIR}/${P/a/}"
 
 src_unpack() {
@@ -29,31 +26,26 @@ src_unpack() {
 	epatch ${FILESDIR}/flex-2.5.4a-gcc3.patch
 	epatch ${FILESDIR}/flex-2.5.4a-gcc31.patch
 	epatch ${FILESDIR}/flex-2.5.4a-skel.patch
-
-	# We need --libdir for econf
-	export WANT_AUTOCONF=2.1
-	autoconf
 }
 
 src_compile() {
 	export CC="$(tc-getCC)"
-
-	econf
+	./configure --prefix=/usr --host=${CHOST} || die "configure failed"
 	use static && append-ldflags -static
 	emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_test() {
-	cd ${S}
 	make bigcheck || die "Test phase failed"
 }
 
 src_install() {
-	einstall || die "make install failed"
+	make -j1 prefix=${D}/usr \
+		mandir=${D}/usr/share/man/man1 \
+		install || die "make install failed"
 
-	if use build
-	then
-		rm -rf ${D}/usr/share ${D}/usr/include ${D}/usr/lib
+	if use build ; then
+		rm -r "${D}"/usr/{include,lib,share}
 	else
 		dodoc NEWS README
 	fi
diff --git a/sys-devel/flex/flex-2.5.4a-r6.ebuild b/sys-devel/flex/flex-2.5.4a-r6.ebuild
new file mode 100644
index 000000000000..fd9694f95447
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.4a-r6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r6.ebuild,v 1.1 2005/01/21 00:07:04 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU lexical analyser generator"
+HOMEPAGE="http://lex.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	http://dev.gentoo.org/~vapier/dist/${P}-autoconf.patch.bz2
+	mirror://gentoo/${P}-autoconf.patch.bz2"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="build static"
+
+RDEPEND="virtual/libc"
+
+S=${WORKDIR}/${P/a/}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Some Redhat patches to fix various problems
+	epatch ${FILESDIR}/flex-2.5.4-glibc22.patch
+	epatch ${FILESDIR}/flex-2.5.4a-gcc3.patch
+	epatch ${FILESDIR}/flex-2.5.4a-gcc31.patch
+	epatch ${FILESDIR}/flex-2.5.4a-skel.patch
+
+	# included autotools are crusty, lets polish em up
+	epatch ${WORKDIR}/${P}-autoconf.patch
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+	use static && append-ldflags -static
+	econf || die "econf failed"
+	emake -j1 .bootstrap || die "emake bootstrap failed"
+	emake || die "emake failed"
+}
+
+src_test() {
+	make bigcheck || die "Test phase failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+
+	if use build ; then
+		rm -r "${D}"/usr/{include,lib,share}
+	else
+		dodoc NEWS README
+	fi
+
+	dosym flex /usr/bin/lex
+}