Install to the proper libdir.

Package-Manager: portage-2.0.51-r13

6 files changed, 33 insertions, 28 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 9810df2fb90e..3cfa4b86e848 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/flex
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.25 2004/11/09 21:32:58 robmoss Exp $
+# 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 $
+
+  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  flex-2.5.4a-r5.ebuild:
+  Install to the proper libdir.
 
   09 Nov 2004; <robmoss@gentoo.org> flex-2.5.4a-r5.ebuild:
   Fixing a very silly typo. I meant "bigcheck", not "bigtest". Sorry. Fixes
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 63a87b91cb2b..69c7bdc61cf0 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 aa1e02551779a5c578b1faaf276fbd34 ChangeLog 3551
-MD5 6a45d0d1828c3ff353754c063bcb89ed flex-2.5.23.ebuild 878
-MD5 2f55bc370166bf2ec5b18b48ba9e48ed flex-2.5.31-r1.ebuild 1000
-MD5 25799d8ada23e8c0060e67d9dd18e506 flex-2.5.31.ebuild 894
-MD5 767aacf3572632ea3a090e9abb0aca8b flex-2.5.4a-r5.ebuild 1331
+MD5 92f01c1f4f17ca32af6d05e135791d17 ChangeLog 3669
+MD5 bf7ad8342c8a4a2ebbf978a85f884b3b flex-2.5.23.ebuild 880
+MD5 7f450ba3d60ff7e52f6ea764a994df09 flex-2.5.31-r1.ebuild 1002
+MD5 4688ae9156a18f877a3329ad07f1a1bb flex-2.5.31.ebuild 897
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 1c833ebad5eafca71b4b3a40308e0ffa flex-2.5.4a-r5.ebuild 1327
 MD5 16e4a9013f877177d2fc9ba784ae9959 files/digest-flex-2.5.23 63
 MD5 46a5f0c3323bbf9d46b3682cf9b39263 files/digest-flex-2.5.31 64
 MD5 46a5f0c3323bbf9d46b3682cf9b39263 files/digest-flex-2.5.31-r1 64
@@ -17,9 +17,9 @@ 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.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBs/8eroRuSHgZdywRApExAKCI8j/QOwwTtZZ66D+5HbzAHN6bngCfZtbh
-M5O5nLugHCdnfitvP9nsUsA=
-=C5AF
+iD8DBQFB72r8ArHZZzCEUG0RAh3pAJ9FHAV2hLQ162G17N3ylOq4brdY0gCfbc9N
+MiQk11pN1GA+iytLQGwuJgo=
+=wkeK
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/flex-2.5.23.ebuild b/sys-devel/flex/flex-2.5.23.ebuild
index a068d29bd4ef..f0f2a99bf6c0 100644
--- a/sys-devel/flex/flex-2.5.23.ebuild
+++ b/sys-devel/flex/flex-2.5.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.23.ebuild,v 1.14 2004/07/15 03:13:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.23.ebuild,v 1.15 2005/01/20 08:25:23 eradicator Exp $
 
 DESCRIPTION="GNU lexical analyser generator"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
diff --git a/sys-devel/flex/flex-2.5.31-r1.ebuild b/sys-devel/flex/flex-2.5.31-r1.ebuild
index 78401b158d8d..3971dbf04845 100644
--- a/sys-devel/flex/flex-2.5.31-r1.ebuild
+++ b/sys-devel/flex/flex-2.5.31-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.31-r1.ebuild,v 1.7 2004/07/15 03:13:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.31-r1.ebuild,v 1.8 2005/01/20 08:25:23 eradicator Exp $
 
 inherit eutils
 
diff --git a/sys-devel/flex/flex-2.5.31.ebuild b/sys-devel/flex/flex-2.5.31.ebuild
index 6f901b5711c1..2e97c219e0ab 100644
--- a/sys-devel/flex/flex-2.5.31.ebuild
+++ b/sys-devel/flex/flex-2.5.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.31.ebuild,v 1.9 2004/07/15 03:13:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.31.ebuild,v 1.10 2005/01/20 08:25:23 eradicator Exp $
 
 DESCRIPTION="GNU lexical analyser generator"
 SRC_URI="mirror://sourceforge/lex/${P}.tar.bz2"
diff --git a/sys-devel/flex/flex-2.5.4a-r5.ebuild b/sys-devel/flex/flex-2.5.4a-r5.ebuild
index e38553cbe157..b1d627e8b4d6 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-2004 Gentoo Foundation
+# 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.30 2004/12/06 06:41:08 vapier Exp $
+# $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 $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="build static"
 
-DEPEND="virtual/libc"
+RDEPEND="virtual/libc"
+
+DEPEND="virtual/libc
+	sys-devel/autoconf"
 
 S="${WORKDIR}/${P/a/}"
 
@@ -26,16 +29,16 @@ 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)"
 
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		|| die
-
+	econf
 	use static && append-ldflags -static
 	emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
@@ -46,9 +49,7 @@ src_test() {
 }
 
 src_install() {
-	make -j1 prefix=${D}/usr \
-		mandir=${D}/usr/share/man/man1 \
-		install || die "make install failed"
+	einstall || die "make install failed"
 
 	if use build
 	then