Punt USE=diet.

(Portage version: 2.0.51.22-r2)

7 files changed, 21 insertions, 35 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index d6c2b13d7aa2..a71fda68f483 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.72 2005/08/23 20:34:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.73 2005/08/28 06:03:14 vapier Exp $
+
+  28 Aug 2005; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild,
+  e2fsprogs-1.36.ebuild, e2fsprogs-1.36-r2.ebuild, e2fsprogs-1.37.ebuild,
+  e2fsprogs-1.37-r1.ebuild, e2fsprogs-1.38.ebuild:
+  Punt USE=diet.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> e2fsprogs-1.38.ebuild:
   stable on ia64
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild
index ced3db9aad94..93aa323b86f9 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-2005 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.17 2005/02/06 22:48:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.18 2005/08/28 06:03:14 vapier Exp $
 
 inherit eutils flag-o-matic gnuconfig toolchain-funcs
 
@@ -11,10 +11,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls static diet"
+IUSE="nls static"
 
-RDEPEND="!diet? ( virtual/libc )
-	diet? ( dev-libs/dietlibc )"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	sys-apps/texinfo"
@@ -55,7 +54,6 @@ src_compile() {
 	use static \
 		&& myconf="${myconf} --with-ldopts=-static" \
 		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
-	use diet && myconf="${myconf} --with-diet-libc"
 	econf \
 		$(use_enable nls) \
 		${myconf} || die
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.36-r2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.36-r2.ebuild
index bb6b5054a7b4..14e7710890aa 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.36-r2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.36-r2.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.36-r2.ebuild,v 1.2 2005/03/22 17:22:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.36-r2.ebuild,v 1.3 2005/08/28 06:03:14 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,9 +11,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls static diet"
+IUSE="nls static"
 
-RDEPEND="diet? ( dev-libs/dietlibc )"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	sys-apps/texinfo"
@@ -46,8 +46,6 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-	use diet && myconf="${myconf} --with-diet-libc"
 	econf \
 		--bindir=/bin \
 		--sbindir=/sbin \
@@ -55,7 +53,7 @@ src_compile() {
 		--with-ldopts="${LDFLAGS}" \
 		$(use_enable !static dynamic-e2fsck) \
 		$(use_enable nls) \
-		${myconf} || die
+		|| die
 	# Parallel make sometimes fails
 	emake -j1 || die
 }
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild
index dc208954a8e0..82649702b6ac 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.36.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.36.ebuild,v 1.2 2005/02/06 23:17:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild,v 1.3 2005/08/28 06:03:14 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,10 +11,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls static diet"
+IUSE="nls static"
 
-RDEPEND="!diet? ( virtual/libc )
-	diet? ( dev-libs/dietlibc )"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	sys-apps/texinfo"
@@ -54,7 +53,6 @@ src_compile() {
 	use static \
 		&& myconf="${myconf} --with-ldopts=-static" \
 		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
-	use diet && myconf="${myconf} --with-diet-libc"
 	econf \
 		$(use_enable nls) \
 		${myconf} || die
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild
index 077aeb8c1b5e..2fdd5e06bddb 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.15 2005/07/08 08:42:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild,v 1.16 2005/08/28 06:03:14 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -13,8 +13,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls static"
 
-# Dietlibc support is broken, see #81096
-#diet? ( dev-libs/dietlibc )
 RDEPEND=">=sys-libs/com_err-${PV}
 	>=sys-libs/ss-${PV}"
 DEPEND="${RDEPEND}
@@ -61,8 +59,6 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-#	use diet && myconf="${myconf} --with-diet-libc"
 	econf \
 		--bindir=/bin \
 		--sbindir=/sbin \
@@ -71,7 +67,6 @@ src_compile() {
 		$(use_enable !static dynamic-e2fsck) \
 		--without-included-gettext \
 		$(use_enable nls) \
-		${myconf} \
 		|| die
 	if [[ ${CTARGET} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
 		eerror "INTL sanity check failed, aborting build."
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild
index c611efdeb3d2..917faf4d9647 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.37.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.ebuild,v 1.6 2005/06/11 01:19:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild,v 1.7 2005/08/28 06:03:14 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,9 +11,9 @@ 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"
+IUSE="nls static"
 
-RDEPEND="diet? ( dev-libs/dietlibc )"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	sys-apps/texinfo"
@@ -48,8 +48,6 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-	use diet && myconf="${myconf} --with-diet-libc"
 	econf \
 		--bindir=/bin \
 		--sbindir=/sbin \
@@ -58,7 +56,6 @@ src_compile() {
 		$(use_enable !static dynamic-e2fsck) \
 		--without-included-gettext \
 		$(use_enable nls) \
-		${myconf} \
 		|| die
 	if ! use elibc_uclibc && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
 		eerror "INTL sanity check failed, aborting build."
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild
index 17334d3d8dce..8a607cf04bc9 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.38.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.38.ebuild,v 1.11 2005/08/23 20:34:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild,v 1.12 2005/08/28 06:03:14 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -13,8 +13,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls static"
 
-# Dietlibc support is broken, see #81096
-#diet? ( dev-libs/dietlibc )
 RDEPEND="~sys-libs/com_err-${PV}
 	~sys-libs/ss-${PV}"
 DEPEND="${RDEPEND}
@@ -58,8 +56,6 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-#	use diet && myconf="${myconf} --with-diet-libc"
 	econf \
 		--bindir=/bin \
 		--sbindir=/sbin \
@@ -68,7 +64,6 @@ src_compile() {
 		$(use_enable !static dynamic-e2fsck) \
 		--without-included-gettext \
 		$(use_enable nls) \
-		${myconf} \
 		|| die
 	if [[ ${CTARGET:-${CHOST}} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
 		eerror "INTL sanity check failed, aborting build."