Punt USE=diet.

Package-Manager: portage-2.0.51.22-r2

8 files changed, 44 insertions, 48 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/Manifest b/sys-fs/e2fsprogs/Manifest
index 63675878cead..72c96bfcb95b 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,20 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fa9189b7073d4c93726ab05bfa396db4 e2fsprogs-1.37-r1.ebuild 3297
+MD5 85f36b5553a8d70e2fea0709edbc74f1 e2fsprogs-1.35-r1.ebuild 3271
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 b12fa6f9229d89d6f50931e6a294acde ChangeLog 12635
-MD5 92cb7d0ad3274ae7ecae662e1cd428c3 e2fsprogs-1.37.ebuild 3087
-MD5 54432110b1e54ba458f618f72d355216 e2fsprogs-1.36.ebuild 3400
-MD5 37cb0ccd95b17f3838109fb5c07bdd5c e2fsprogs-1.35-r1.ebuild 3377
-MD5 ebc8234a7bc9fc34fffbba6ecc5c3487 e2fsprogs-1.37-r1.ebuild 3446
-MD5 3175f69bbef8d8d5b28da5e04acf22e6 e2fsprogs-1.36-r2.ebuild 2626
-MD5 13838107da2ffa5b49c0da9078c240a6 e2fsprogs-1.38.ebuild 3395
-MD5 4a7d54ccac4002d10462c40660712a72 files/e2fsprogs-1.36-sed-locale.patch 2142
-MD5 e86bf4d241506baff5f647cbd30ae7a0 files/digest-e2fsprogs-1.36-r2 67
+MD5 0577d34f83fb9b4c593ed88ff96edf02 e2fsprogs-1.36.ebuild 3294
+MD5 27ea5a2bd1db17929c848a0cc57c1f8a e2fsprogs-1.38.ebuild 3245
+MD5 7110400b8107690e0f1ec51538148f9b e2fsprogs-1.36-r2.ebuild 2519
+MD5 974f29e4df4e78976ed7bb465fba9c47 ChangeLog 12852
+MD5 1204b9ef213580d5e95cc699846fcdc4 e2fsprogs-1.37.ebuild 2978
 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
-MD5 65689a8be4c1b58f8e64f22165313292 files/digest-e2fsprogs-1.37-r1 67
+MD5 e86bf4d241506baff5f647cbd30ae7a0 files/digest-e2fsprogs-1.36-r2 67
 MD5 e49935e8abf94d6e906bad2d068d43c3 files/e2fsprogs-1.37-e2p-test.patch 380
-MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
 MD5 65689a8be4c1b58f8e64f22165313292 files/digest-e2fsprogs-1.37 67
+MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67
+MD5 4a7d54ccac4002d10462c40660712a72 files/e2fsprogs-1.36-sed-locale.patch 2142
 MD5 0911aedd4968aa4053139791a961e2a2 files/digest-e2fsprogs-1.38 67
-MD5 c5e6ed46f8a6b9f75273863110887b22 files/e2fsprogs-1.36-makefile.patch 3546
+MD5 65689a8be4c1b58f8e64f22165313292 files/digest-e2fsprogs-1.37-r1 67
 MD5 e85d057f99af6c980acf9a8697da9dd7 files/e2fsprogs-1.38-disconnected-inodes.patch 2881
+MD5 c5e6ed46f8a6b9f75273863110887b22 files/e2fsprogs-1.36-makefile.patch 3546
+MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
 MD5 e86bf4d241506baff5f647cbd30ae7a0 files/digest-e2fsprogs-1.36 67
-MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDEVO5gIKl8Uu19MoRAgPNAJsGEjmwxegA4aJmR8kj8k3AUH96YQCfcOse
+yS49MZJdRM/+mbbDB6M0n2M=
+=kxyn
+-----END PGP SIGNATURE-----
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."