summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-10-03 15:57:15 +0000
committerTravis Tilley <lv@gentoo.org>2004-10-03 15:57:15 +0000
commit7c9f51b8e11805a3f4bff276091d9e8d66567779 (patch)
treec6be6f9c867b6f5afb1cc1ee95729745eb32dd38 /sys-fs/e2fsprogs
parentStable on sparc. (Manifest recommit) (diff)
downloadgentoo-2-7c9f51b8e11805a3f4bff276091d9e8d66567779.tar.gz
gentoo-2-7c9f51b8e11805a3f4bff276091d9e8d66567779.tar.bz2
gentoo-2-7c9f51b8e11805a3f4bff276091d9e8d66567779.zip
revert dietlibc changes so that the amd64 stable version of e2fsprogs actually compiles again
Diffstat (limited to 'sys-fs/e2fsprogs')
-rw-r--r--sys-fs/e2fsprogs/ChangeLog6
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild12
2 files changed, 10 insertions, 8 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 329389881b42..1377c88cb740 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
# 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.34 2004/10/03 06:53:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.35 2004/10/03 15:57:15 lv Exp $
+
+ 03 Oct 2004; Travis Tilley <lv@gentoo.org> e2fsprogs-1.35-r1.ebuild:
+ revert dietlibc changes so that the amd64 stable version of e2fsprogs actually
+ compiles again
03 Oct 2004; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild:
Support dietlibc #36306 by Adam.
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild
index 3b6c18b1144b..b3de1b5d7a3d 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.3 2004/10/03 06:53:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.4 2004/10/03 15:57:15 lv Exp $
inherit eutils flag-o-matic gnuconfig
@@ -11,13 +11,12 @@ 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"
-IUSE="nls static diet"
+IUSE="nls static"
-RDEPEND="!diet? ( virtual/libc )
- diet? ( dev-libs/dietlibc )"
-DEPEND="${RDEPEND}
+DEPEND="virtual/libc
nls? ( sys-devel/gettext )
sys-apps/texinfo"
+RDEPEND="virtual/libc"
src_unpack() {
unpack ${A}
@@ -46,8 +45,7 @@ src_compile() {
|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
econf \
- $(use_enable nls) \
- $(use_with diet diet-libc) \
+ `use_enable nls` \
${myconf} || die
# Parallel make sometimes fails