Set $LDCONFIG so stupid configure script doesnt try to run /sbin/ldconfig for us.

4 files changed, 19 insertions, 12 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 7d0ae06a5cf5..22255860a57c 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.36 2004/10/05 01:59:52 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.37 2004/11/12 03:21:16 vapier Exp $
+
+  11 Nov 2004; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild,
+  e2fsprogs-1.35.ebuild:
+  Set $LDCONFIG so stupid configure script doesnt try to run /sbin/ldconfig
+  for us.
 
 *e2fsprogs-1.35-r2 (04 Oct 2004)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 870c113e100f..86f040a40ae7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,9 +1,9 @@
-MD5 eb5e304aadc8e6dc037b6b87510b1a3f ChangeLog 8674
+MD5 e1e00f9b6c50dac64c39c550674c9f2a ChangeLog 8866
 MD5 11f6d7ba53227f4104cf0c76fc29d554 e2fsprogs-1.34.ebuild 2768
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 2edb0d073060c192284a71d32d02adcc e2fsprogs-1.34-r1.ebuild 2884
-MD5 2ee511ac5e5941604b071c9a3ff3c916 e2fsprogs-1.35.ebuild 2794
-MD5 aa948c065bfdd5397dd1e4edf8d4cf9d e2fsprogs-1.35-r1.ebuild 3080
+MD5 3a25e968d4e9df1c0942bbd5ecc54c5a e2fsprogs-1.35.ebuild 2821
+MD5 a687b0b49d2c9c61ef4c063bbf907592 e2fsprogs-1.35-r1.ebuild 3109
 MD5 83fead0fbd1ea1c0ec216479b3577af9 e2fsprogs-1.35-r2.ebuild 3170
 MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34 67
 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild
index b3de1b5d7a3d..b72921f01b95 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.4 2004/10/03 15:57:15 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.5 2004/11/12 03:21:16 vapier Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -35,17 +35,17 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
 	# building e2fsprogs on sparc results in silo breaking
-	[ "${ARCH}" = "sparc" ] && filter-flags "-fstack-protector"
+	[ "${ARCH}" = "sparc" ] && filter-flags -fstack-protector
+
+	export LDCONFIG=/bin/true
 
+	local myconf
 	use static \
 		&& myconf="${myconf} --with-ldopts=-static" \
 		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
-
 	econf \
-		`use_enable nls` \
+		$(use_enable nls) \
 		${myconf} || die
 
 	# Parallel make sometimes fails
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild
index bdc8a85b42a6..1ba76f55774f 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild,v 1.16 2004/09/07 22:55:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild,v 1.17 2004/11/12 03:21:16 vapier Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ~ia64 ~ppc64 s390"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ~ppc64 s390"
 IUSE="nls static"
 
 DEPEND="virtual/libc
@@ -34,6 +34,8 @@ src_unpack() {
 src_compile() {
 	local myconf
 
+	export LDCONFIG=/bin/true
+
 	# building e2fsprogs on sparc results in silo breaking
 	[ "${ARCH}" = "sparc" ] && filter-flags "-fstack-protector"