summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-04-30 04:43:45 +0000
committerMike Frysinger <vapier@gentoo.org>2005-04-30 04:43:45 +0000
commitc390787fa8dc69d351a58ea3edfb2485185af97b (patch)
tree11c88d4580298f9123cae9d4940ad0b378979090 /sys-fs
parentMarked x86/ppc (diff)
downloadgentoo-2-c390787fa8dc69d351a58ea3edfb2485185af97b.tar.gz
gentoo-2-c390787fa8dc69d351a58ea3edfb2485185af97b.tar.bz2
gentoo-2-c390787fa8dc69d351a58ea3edfb2485185af97b.zip
Remove USE=diet since it causes stupid problems #81096.
(Portage version: 2.0.51.20-r5)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/e2fsprogs/ChangeLog5
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild13
2 files changed, 11 insertions, 7 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index d571a714dd85..f9018e4a25bd 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/e2fsprogs
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.54 2005/04/27 03:36:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.55 2005/04/30 04:43:45 vapier Exp $
+
+ 30 Apr 2005; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.37-r1.ebuild:
+ Remove USE=diet since it causes stupid problems #81096.
27 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+files/e2fsprogs-1.37-e2p-test.patch, e2fsprogs-1.37.ebuild,
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild
index 6a0916c54cff..efae17f6b164 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.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-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild,v 1.4 2005/04/27 03:36:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild,v 1.5 2005/04/30 04:43:45 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -11,10 +11,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls static diet uclibc"
+IUSE="nls static"
-RDEPEND="diet? ( dev-libs/dietlibc )
- >=sys-libs/com_err-${PV}
+# Dietlibc support is broken, see #81096
+#diet? ( dev-libs/dietlibc )
+RDEPEND=">=sys-libs/com_err-${PV}
>=sys-libs/ss-${PV}"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
@@ -61,7 +62,7 @@ src_unpack() {
src_compile() {
local myconf
- use diet && myconf="${myconf} --with-diet-libc"
+# use diet && myconf="${myconf} --with-diet-libc"
econf \
--bindir=/bin \
--sbindir=/sbin \
@@ -72,7 +73,7 @@ src_compile() {
$(use_enable nls) \
${myconf} \
|| die
- if ! use uclibc && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+ if [[ ${CTARGET} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
eerror "INTL sanity check failed, aborting build."
eerror "Please post your ${S}/config.log file as an"
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"