change glibc to libc and other magical things !

48 files changed, 284 insertions, 304 deletions

diff --git a/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild
index bf29374b5667..ce0deb51e826 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild
@@ -1,40 +1,37 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild,v 1.4 2004/06/24 22:50:19 agriffis Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild,v 1.5 2004/06/30 17:07:34 vapier Exp $
 
 inherit eutils flag-o-matic
 
-S="${WORKDIR}/${PN}"
 DESCRIPTION="Daemon for the Linux Device Filesystem"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
-
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
+IUSE=""
 
+DEPEND="virtual/libc"
 PROVIDE="virtual/dev-manager"
 
+S="${WORKDIR}/${PN}"
+
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	cp GNUmakefile GNUmakefile.orig
-	sed -e "s:-O2:${CFLAGS}:g" \
+	filter-flags -fPIC
+	sed -i \
+		-e "s:-O2:${CFLAGS}:g" \
 		-e 's:/usr/man:/usr/share/man:' \
 		-e '29,31d;11,16d' -e '6c\' \
 		-e 'DEFINES	:= -DLIBNSL="\\"/lib/libnsl.so.1\\""' \
-		GNUmakefile.orig > GNUmakefile
+		GNUmakefile
 }
 
 src_compile() {
-
-	filter-flags -fPIC
-
 	make || die
 }
 
@@ -45,5 +42,5 @@ src_install() {
 	#config file is handled in baselayout
 	rm -f ${D}/etc/devfsd.conf
 
-	dodoc devfsd.conf COPYING* INSTALL
+	dodoc devfsd.conf INSTALL
 }
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild
index d402544ca534..40c9952295f0 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild,v 1.4 2004/06/24 22:50:19 agriffis Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild,v 1.5 2004/06/30 17:07:34 vapier Exp $
 
 inherit eutils flag-o-matic
 
-S="${WORKDIR}/${PN}"
 DESCRIPTION="Daemon for the Linux Device Filesystem"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ia64"
-
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ia64"
+IUSE=""
 
+DEPEND="virtual/libc"
 PROVIDE="virtual/dev-manager"
 
+S="${WORKDIR}/${PN}"
+
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-kernel-2.5.patch.bz2
 
+	filter-flags -fPIC
 	sed -e "s:-O2:${CFLAGS}:g" \
 		-e 's:/usr/man:/usr/share/man:' \
 		-e '32,34d;11,16d' -e '6c\' \
@@ -33,9 +33,6 @@ src_unpack() {
 }
 
 src_compile() {
-
-	filter-flags -fPIC
-
 	make || die
 }
 
@@ -46,5 +43,5 @@ src_install() {
 	#config file is handled in baselayout
 	rm -f ${D}/etc/devfsd.conf
 
-	dodoc devfsd.conf COPYING* INSTALL
+	dodoc devfsd.conf INSTALL
 }
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
index ee49307c7b04..6f5a62595caf 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r8.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/devfsd/devfsd-1.3.25-r8.ebuild,v 1.5 2004/06/30 13:20:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild,v 1.6 2004/06/30 17:07:34 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,9 +10,10 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~mips hppa ~amd64 ia64 ppc64 s390"
+KEYWORDS="~x86 ~ppc ~sparc ~mips alpha hppa ~amd64 ia64 ppc64 s390"
 IUSE="uclibc"
-DEPEND="virtual/glibc"
+
+DEPEND="virtual/libc"
 PROVIDE="virtual/dev-manager"
 
 S=${WORKDIR}/${PN}
diff --git a/sys-fs/dosfstools/dosfstools-2.10.ebuild b/sys-fs/dosfstools/dosfstools-2.10.ebuild
index 248b059b1be5..84997d08a08a 100644
--- a/sys-fs/dosfstools/dosfstools-2.10.ebuild
+++ b/sys-fs/dosfstools/dosfstools-2.10.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.10.ebuild,v 1.10 2004/06/24 22:50:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.10.ebuild,v 1.11 2004/06/30 17:07:56 vapier Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="dos filesystem tools"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
 HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/"
+SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~alpha hppa amd64 ia64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}; cd ${S}
diff --git a/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild b/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild
index d61e49376ef1..6e1edfa44131 100644
--- a/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild
+++ b/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild,v 1.3 2004/06/24 22:50:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild,v 1.4 2004/06/30 17:07:56 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="dos filesystem tools"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
 HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/"
+SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	epatch ${FILESDIR}/errno.patch
-	mv Makefile Makefile.orig
-	sed -e "s:PREFIX\ \=:PREFIX\ \=\ \/usr:" \
+	sed -i \
+		-e "s:PREFIX\ \=:PREFIX\ \=\ \/usr:" \
 		-e "s:\/usr\/man:\/share\/man:" \
-		Makefile.orig > Makefile
+		Makefile
 }
 
 src_compile() {
diff --git a/sys-fs/dosfstools/dosfstools-2.9.ebuild b/sys-fs/dosfstools/dosfstools-2.9.ebuild
index efb092111dfe..a214e67dea43 100644
--- a/sys-fs/dosfstools/dosfstools-2.9.ebuild
+++ b/sys-fs/dosfstools/dosfstools-2.9.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.9.ebuild,v 1.5 2004/06/24 22:50:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.9.ebuild,v 1.6 2004/06/30 17:07:56 vapier Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="dos filesystem tools"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
 HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/"
+SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.32-r2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.32-r2.ebuild
index 192624754794..05b2ad2abb1d 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.32-r2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.32-r2.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.32-r2.ebuild,v 1.5 2004/06/24 22:50:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.32-r2.ebuild,v 1.6 2004/06/30 17:08:25 vapier Exp $
 
 inherit eutils
 
@@ -8,18 +8,18 @@ DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 ppc sparc alpha hppa mips"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
 IUSE="nls"
 
 #debianutils is for 'readlink'
 DEPEND="${DEPEND}
-	virtual/glibc
+	virtual/libc
 	nls? ( sys-devel/gettext )
 	sys-apps/debianutils
 	sys-apps/texinfo"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -35,7 +35,7 @@ src_compile() {
 		|| die
 
 	# Parallel make sometimes fails
-	MAKEOPTS="-j1" emake || die
+	emake -j1 || die
 }
 
 src_install() {
@@ -49,7 +49,7 @@ src_install() {
 		make -C po DESTDIR=${D} install || die
 	fi
 
-	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
+	dodoc ChangeLog README RELEASE-NOTES SHLIBS
 	docinto e2fsck
 	dodoc e2fsck/ChangeLog e2fsck/CHANGES
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.33.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.33.ebuild
index ff3ff686b0a2..876d8b16b2d7 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.33.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.33.ebuild
@@ -1,26 +1,25 @@
 # 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.33.ebuild,v 1.7 2004/06/24 22:50:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.33.ebuild,v 1.8 2004/06/30 17:08:25 vapier Exp $
 
 inherit eutils
 
-IUSE="nls static"
-
 DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 hppa ppc"
+SLOT="0"
+KEYWORDS="x86 ppc hppa amd64"
+IUSE="nls static"
 
 #debianutils is for 'readlink'
 DEPEND="${DEPEND}
-	virtual/glibc
+	virtual/libc
 	nls? ( sys-devel/gettext )
 	sys-apps/debianutils
 	sys-apps/texinfo"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -40,7 +39,7 @@ src_compile() {
 		${myconf} || die
 
 	# Parallel make sometimes fails
-	MAKEOPTS="-j1" emake || die
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild
index b6607ecc83d7..0b610cfbd973 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild
@@ -1,26 +1,25 @@
 # 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.34-r1.ebuild,v 1.6 2004/06/24 22:50:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild,v 1.7 2004/06/30 17:08:26 vapier Exp $
 
 inherit eutils
 
-IUSE="nls static"
-
 DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~hppa ppc ia64 ~sparc ~mips ~ppc64 s390"
+SLOT="0"
+KEYWORDS="~x86 ppc ~sparc ~mips ~hppa ~amd64 ia64 ~ppc64 s390"
+IUSE="nls static"
 
 #debianutils is for 'readlink'
 DEPEND="${DEPEND}
-	virtual/glibc
+	virtual/libc
 	nls? ( sys-devel/gettext )
 	sys-apps/debianutils
 	sys-apps/texinfo"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -49,7 +48,7 @@ src_compile() {
 		${myconf} || die
 
 	# Parallel make sometimes fails
-	MAKEOPTS="-j1" emake || die
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
index 37fdc4ef1438..7cd0e0d3951c 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
@@ -1,26 +1,25 @@
 # 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.34.ebuild,v 1.19 2004/06/24 22:50:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild,v 1.20 2004/06/30 17:08:26 vapier Exp $
 
 inherit eutils
 
-IUSE="nls static"
-
 DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 hppa ppc ia64 sparc mips ppc64 alpha"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64 ppc64"
+IUSE="nls static"
 
 #debianutils is for 'readlink'
 DEPEND="${DEPEND}
-	virtual/glibc
+	virtual/libc
 	nls? ( sys-devel/gettext )
 	sys-apps/debianutils
 	sys-apps/texinfo"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -47,7 +46,7 @@ src_compile() {
 		${myconf} || die
 
 	# Parallel make sometimes fails
-	MAKEOPTS="-j1" emake || die
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild
index 2d97a931068c..87dd1dc715ae 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.11 2004/06/30 13:23:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35.ebuild,v 1.12 2004/06/30 17:08:26 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,13 +10,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc mips arm ~hppa amd64 -ia64 ~ppc64 s390 alpha"
+KEYWORDS="x86 ~ppc sparc mips alpha arm ~hppa amd64 -ia64 ~ppc64 s390"
 IUSE="nls static"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
 	sys-apps/texinfo"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-fs/efsd/efsd-0.0.1.20031013.ebuild b/sys-fs/efsd/efsd-0.0.1.20031013.ebuild
index d994775a5710..4e4c0988407e 100644
--- a/sys-fs/efsd/efsd-0.0.1.20031013.ebuild
+++ b/sys-fs/efsd/efsd-0.0.1.20031013.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/efsd/efsd-0.0.1.20031013.ebuild,v 1.4 2004/06/24 22:50:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/efsd/efsd-0.0.1.20031013.ebuild,v 1.5 2004/06/30 17:08:45 vapier Exp $
 
 inherit enlightenment
 
 DESCRIPTION="daemon that provides commonly needed file system functionality to clients"
 HOMEPAGE="http://www.enlightenment.org/pages/efsd.html"
 
-DEPEND="${DEPEND}
-	dev-lang/perl"
-RDEPEND="${DEPEND}
-	app-admin/fam
+DEPEND="dev-lang/perl"
+RDEPEND="app-admin/fam
 	>=dev-libs/libxml2-2.3.10
 	>=dev-db/edb-1.0.4.20031013"
diff --git a/sys-fs/evms/evms-1.2.1-r1.ebuild b/sys-fs/evms/evms-1.2.1-r1.ebuild
index ddf94f76c4f6..f929d36b89e6 100644
--- a/sys-fs/evms/evms-1.2.1-r1.ebuild
+++ b/sys-fs/evms/evms-1.2.1-r1.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-1.2.1-r1.ebuild,v 1.4 2004/06/28 01:53:12 agriffis Exp $
-
-IUSE="ncurses gtk"
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-1.2.1-r1.ebuild,v 1.5 2004/06/30 17:09:09 vapier Exp $
 
 inherit eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc amd64"
+IUSE="ncurses gtk"
 
 #EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-fs/e2fsprogs
 	gtk? ( =x11-libs/gtk+-1* )
 	ncurses? ( sys-libs/ncurses )"
diff --git a/sys-fs/evms/evms-2.2.2.ebuild b/sys-fs/evms/evms-2.2.2.ebuild
index 0e4fe185f934..81e70fa77d03 100644
--- a/sys-fs/evms/evms-2.2.2.ebuild
+++ b/sys-fs/evms/evms-2.2.2.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.2.2.ebuild,v 1.7 2004/06/28 01:53:12 agriffis Exp $
-
-IUSE="ncurses gtk"
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.2.2.ebuild,v 1.8 2004/06/30 17:09:09 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 -ppc -sparc -alpha -hppa -mips"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="ncurses gtk"
 
 #EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-fs/e2fsprogs
 	gtk? ( =x11-libs/gtk+-1* )
 	ncurses? ( sys-libs/ncurses )"
diff --git a/sys-fs/evms/evms-2.3.2-r1.ebuild b/sys-fs/evms/evms-2.3.2-r1.ebuild
index 556a3f120b78..96826b9d9c48 100644
--- a/sys-fs/evms/evms-2.3.2-r1.ebuild
+++ b/sys-fs/evms/evms-2.3.2-r1.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.2-r1.ebuild,v 1.4 2004/06/28 01:53:12 agriffis Exp $
-
-IUSE="ncurses gtk"
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.2-r1.ebuild,v 1.5 2004/06/30 17:09:09 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 -ppc -sparc -alpha -hppa -mips"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="ncurses gtk"
 
 #EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-fs/e2fsprogs
 	gtk? ( =x11-libs/gtk+-1* )
 	ncurses? ( sys-libs/ncurses )"
diff --git a/sys-fs/evms/evms-2.3.4-r1.ebuild b/sys-fs/evms/evms-2.3.4-r1.ebuild
index d09fb7bf9b6f..a71e2a94fd5c 100644
--- a/sys-fs/evms/evms-2.3.4-r1.ebuild
+++ b/sys-fs/evms/evms-2.3.4-r1.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.4-r1.ebuild,v 1.3 2004/06/28 01:53:12 agriffis Exp $
-
-IUSE="ncurses gtk"
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.4-r1.ebuild,v 1.4 2004/06/30 17:09:09 vapier Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 -ppc -sparc -alpha -hppa -mips"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ncurses gtk"
 
 #EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-fs/e2fsprogs
 	sys-libs/device-mapper
 	gtk? ( =x11-libs/gtk+-1* )
diff --git a/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild b/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild
index f811d7e02259..da568f6128ac 100644
--- a/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild
+++ b/sys-fs/ext2resize/ext2resize-1.1.17-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/ext2resize/ext2resize-1.1.17-r1.ebuild,v 1.7 2004/06/25 03:17:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild,v 1.8 2004/06/30 17:09:29 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha arm amd64"
 IUSE="static"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	use static && append-ldflags -static
diff --git a/sys-fs/ext2resize/ext2resize-1.1.17-r2.ebuild b/sys-fs/ext2resize/ext2resize-1.1.17-r2.ebuild
index 18b53c2c4cc1..432e3a088dde 100644
--- a/sys-fs/ext2resize/ext2resize-1.1.17-r2.ebuild
+++ b/sys-fs/ext2resize/ext2resize-1.1.17-r2.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/ext2resize/ext2resize-1.1.17-r2.ebuild,v 1.2 2004/06/25 03:17:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.17-r2.ebuild,v 1.3 2004/06/30 17:09:30 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha arm amd64"
 IUSE="static"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-fs/ext2resize/ext2resize-1.1.17.ebuild b/sys-fs/ext2resize/ext2resize-1.1.17.ebuild
index 7e16ede6d4ff..638f948c5ce4 100644
--- a/sys-fs/ext2resize/ext2resize-1.1.17.ebuild
+++ b/sys-fs/ext2resize/ext2resize-1.1.17.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.17.ebuild,v 1.3 2004/06/25 03:17:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.17.ebuild,v 1.4 2004/06/30 17:09:30 vapier Exp $
 
 DESCRIPTION="EXT2 and EXT3 filesystem resizing utilities"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://ext2resize.sourceforge.net/"
-KEYWORDS="x86 amd64 ppc sparc "
-SLOT="0"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	./configure --host=${CHOST} \
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
index 5aa8d07551ea..db675103ec11 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-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/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild,v 1.5 2004/06/24 22:51:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild,v 1.6 2004/06/30 17:09:48 vapier Exp $
 
 inherit eutils
 
@@ -12,6 +12,7 @@ SRC_URI="http://ftp.penguinppc.org/users/hasi/${MY_P}.src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ppc64"
+IUSE=""
 
 DEPEND="sys-devel/autoconf
 	sys-devel/automake
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4.ebuild
index a4bd8e82fa60..034b2da13d0b 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/hfsplusutils-1.0.4.ebuild,v 1.3 2004/06/24 22:51:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/hfsplusutils-1.0.4.ebuild,v 1.4 2004/06/30 17:09:48 vapier Exp $
 
 MY_P="hfsplus_${PV}"
-DESCRIPTION="HFS+ Filesystem Access Utilities (PPC Only)"
-SRC_URI="http://ftp.penguinppc.org/users/hasi/${MY_P}.src.tar.bz2"
+DESCRIPTION="HFS+ Filesystem Access Utilities"
 HOMEPAGE="http://ftp.penguinppc.org/users/hasi/"
+SRC_URI="http://ftp.penguinppc.org/users/hasi/${MY_P}.src.tar.bz2"
 
-KEYWORDS="ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86 ppc"
+IUSE=""
 
 DEPEND="sys-devel/autoconf
 	sys-devel/automake
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild
index 8d83cf626486..09ad39a5a82e 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild,v 1.3 2004/06/24 22:51:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r1.ebuild,v 1.4 2004/06/30 17:10:12 vapier Exp $
 
 DESCRIPTION="HFS FS Access utils"
-SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
-IUSE="tcltk"
+SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 
-KEYWORDS="ppc ~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ppc"
+IUSE="tcltk"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	tcltk? ( dev-lang/tcl dev-lang/tk )"
 RDEPEND=""
 
-MAKEOPTS='PREFIX=/usr MANDIR=/usr/share/man'
-
 src_compile() {
 	local myconf
 	use tcltk && myconf="--with-tcl --with-tk"
 
 	econf ${myconf} || die
-	emake || die
+	emake PREFIX=/usr MANDIR=/usr/share/man || die
 }
 
 src_install() {
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild
index 9b1cd12320a0..ee3c1f0d83be 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild,v 1.4 2004/06/24 22:51:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r2.ebuild,v 1.5 2004/06/30 17:10:12 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="HFS FS Access utils"
-SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
-IUSE="tcltk"
+SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 
-KEYWORDS="ppc ~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc ~x86"
+IUSE="tcltk"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	tcltk? ( dev-lang/tcl dev-lang/tk )"
 RDEPEND=""
 
-MAKEOPTS='PREFIX=/usr MANDIR=/usr/share/man'
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -30,7 +28,7 @@ src_compile() {
 	use tcltk && myconf="--with-tcl --with-tk"
 
 	econf ${myconf} || die
-	emake || die
+	emake PREFIX=/usr MANDIR=/usr/share/man || die
 }
 
 src_install() {
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild
index 46497a05d834..7e19623205be 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild,v 1.5 2004/06/24 22:51:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r3.ebuild,v 1.6 2004/06/30 17:10:12 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="HFS FS Access utils"
-SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
-IUSE="tcltk"
+SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 
-KEYWORDS="ppc ~x86 ppc64 ~sparc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ppc ~sparc ppc64"
+IUSE="tcltk"
 
 DEPEND="virtual/glibc
 	tcltk? ( dev-lang/tcl dev-lang/tk )"
 RDEPEND=""
 
-MAKEOPTS='PREFIX=/usr MANDIR=/usr/share/man'
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -30,10 +28,9 @@ src_compile() {
 	use tcltk && myconf="--with-tcl --with-tk"
 
 	econf ${myconf} || die
-	emake || die
+	emake PREFIX=/usr MANDIR=/usr/share/man || die
 	cd ${S}/hfsck
-	emake || die
-	cd ${S}
+	emake PREFIX=/usr MANDIR=/usr/share/man || die
 }
 
 src_install() {
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6.ebuild
index 02174d4c9870..cc7b59b507f5 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6.ebuild,v 1.3 2004/06/24 22:51:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6.ebuild,v 1.4 2004/06/30 17:10:12 vapier Exp $
 
 DESCRIPTION="HFS FS Access utils"
-SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
+SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 
-KEYWORDS="ppc ~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ppc"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=""
 
-MAKEOPTS='PREFIX=/usr MANDIR=/usr/share/man'
-
 src_compile() {
 	econf || die
-	emake || die
+	emake PREFIX=/usr MANDIR=/usr/share/man || die
 }
 
 src_install() {
diff --git a/sys-fs/jfsutils/jfsutils-1.1.0-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.0-r1.ebuild
index 254979ef8074..5bf7afa4fdf9 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.0-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.0-r1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.0-r1.ebuild,v 1.3 2004/06/24 22:51:36 agriffis Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.0-r1.ebuild,v 1.4 2004/06/30 17:10:41 vapier Exp $
 
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
-SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
+SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/sbin || die
diff --git a/sys-fs/jfsutils/jfsutils-1.1.0-r2.ebuild b/sys-fs/jfsutils/jfsutils-1.1.0-r2.ebuild
index 084d25eece02..2abbadf5c102 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.0-r2.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.0-r2.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.0-r2.ebuild,v 1.4 2004/06/24 22:51:36 agriffis Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.0-r2.ebuild,v 1.5 2004/06/30 17:10:41 vapier Exp $
 
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
-SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
+SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf \
diff --git a/sys-fs/jfsutils/jfsutils-1.1.1-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.1-r1.ebuild
index 8e1d1a46c594..a2a843ab31f2 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.1-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.1-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.1-r1.ebuild,v 1.4 2004/06/24 22:51:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.1-r1.ebuild,v 1.5 2004/06/30 17:10:41 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
 SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz
 	mirror://gentoo/${P}-errno.diff.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 -ppc"
+SLOT="0"
+KEYWORDS="x86 -ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-fs/jfsutils/jfsutils-1.1.1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.1.ebuild
index 5bf886de7806..f5bd16640862 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.1.ebuild,v 1.4 2004/06/24 22:51:36 agriffis Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.1.ebuild,v 1.5 2004/06/30 17:10:41 vapier Exp $
 
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
-SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
+SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf \
diff --git a/sys-fs/jfsutils/jfsutils-1.1.2.ebuild b/sys-fs/jfsutils/jfsutils-1.1.2.ebuild
index a31704beac95..3f0bddd20b57 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.2.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.2.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.2.ebuild,v 1.4 2004/06/24 22:51:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.2.ebuild,v 1.5 2004/06/30 17:10:41 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
 SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 -ppc ~hppa"
-
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="x86 -ppc ~hppa amd64"
+IUSE=""
 
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf \
diff --git a/sys-fs/jfsutils/jfsutils-1.1.3.ebuild b/sys-fs/jfsutils/jfsutils-1.1.3.ebuild
index 8831f084e7dc..19968a2b278c 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.3.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.3.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.3.ebuild,v 1.9 2004/06/24 22:51:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.3.ebuild,v 1.10 2004/06/30 17:10:41 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
 SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64 ~ppc ~hppa ia64 ~sparc"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ia64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-fs/jfsutils/jfsutils-1.1.4.ebuild b/sys-fs/jfsutils/jfsutils-1.1.4.ebuild
index 3fb4cbb577c0..2bcb92f03f25 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.4.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.4.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.4.ebuild,v 1.6 2004/06/24 22:51:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.4.ebuild,v 1.7 2004/06/30 17:10:41 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
 SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~hppa ia64 ~sparc mips"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc mips ~hppa ~amd64 ia64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 #src_unpack() {
 #	unpack ${A}
diff --git a/sys-fs/jfsutils/jfsutils-1.1.5.ebuild b/sys-fs/jfsutils/jfsutils-1.1.5.ebuild
index d7a825178fac..9202d067b5cb 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.5.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.5.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.5.ebuild,v 1.3 2004/06/24 22:51:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.5.ebuild,v 1.4 2004/06/30 17:10:41 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 HOMEPAGE="http://www-124.ibm.com/developerworks/oss/jfs/index.html"
 SRC_URI="http://www10.software.ibm.com/developer/opensource/jfs/project/pub/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~hppa ~ia64 ~sparc"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~ia64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf \
diff --git a/sys-fs/lde/lde-2.6.0.ebuild b/sys-fs/lde/lde-2.6.0.ebuild
index 801cc79fe370..431252164549 100644
--- a/sys-fs/lde/lde-2.6.0.ebuild
+++ b/sys-fs/lde/lde-2.6.0.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/lde/lde-2.6.0.ebuild,v 1.5 2004/06/24 22:51:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lde/lde-2.6.0.ebuild,v 1.6 2004/06/30 17:10:58 vapier Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/lde/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 DEPEND="sys-libs/ncurses
 	dev-util/yacc"
diff --git a/sys-fs/linux-ntfs/linux-ntfs-1.6.0.ebuild b/sys-fs/linux-ntfs/linux-ntfs-1.6.0.ebuild
index 37e8c8c3e9f7..bddf09fb516d 100644
--- a/sys-fs/linux-ntfs/linux-ntfs-1.6.0.ebuild
+++ b/sys-fs/linux-ntfs/linux-ntfs-1.6.0.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/linux-ntfs/linux-ntfs-1.6.0.ebuild,v 1.4 2004/06/24 22:51:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/linux-ntfs/linux-ntfs-1.6.0.ebuild,v 1.5 2004/06/30 17:11:18 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="Old userland utilities for NTFS filesystems.  Better to use
-ntfsprogs instead"
+DESCRIPTION="Old userland utilities for NTFS filesystems (you should use ntfsprogs instead)"
 HOMEPAGE="http://linux-ntfs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
 
-DEPEND=">=sys-devel/gcc-2.95"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64"
+IUSE=""
+
+DEPEND=">=sys-devel/gcc-2.95"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-fs/lufs/lufs-0.7.0.ebuild b/sys-fs/lufs/lufs-0.7.0.ebuild
index d8a9b7946162..355166089162 100644
--- a/sys-fs/lufs/lufs-0.7.0.ebuild
+++ b/sys-fs/lufs/lufs-0.7.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.7.0.ebuild,v 1.3 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.7.0.ebuild,v 1.4 2004/06/30 17:11:44 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-#RDEPEND=""
-KEYWORDS="x86 amd64"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
+DEPEND="virtual/linux-sources"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-fs/lufs/lufs-0.8.0-r1.ebuild b/sys-fs/lufs/lufs-0.8.0-r1.ebuild
index dde1e487dfdb..e6ba88a7196d 100644
--- a/sys-fs/lufs/lufs-0.8.0-r1.ebuild
+++ b/sys-fs/lufs/lufs-0.8.0-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.8.0-r1.ebuild,v 1.3 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.8.0-r1.ebuild,v 1.4 2004/06/30 17:11:44 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-#RDEPEND
-KEYWORDS="x86 amd64"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
+DEPEND="virtual/linux-sources"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-fs/lufs/lufs-0.8.0.ebuild b/sys-fs/lufs/lufs-0.8.0.ebuild
index 5f51ba3fb5d4..524855aec414 100644
--- a/sys-fs/lufs/lufs-0.8.0.ebuild
+++ b/sys-fs/lufs/lufs-0.8.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.8.0.ebuild,v 1.3 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.8.0.ebuild,v 1.4 2004/06/30 17:11:44 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-#RDEPEND
-KEYWORDS="x86 amd64"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
+DEPEND="virtual/linux-sources"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-fs/lufs/lufs-0.9.3.ebuild b/sys-fs/lufs/lufs-0.9.3.ebuild
index aed4aa7fb883..85d1f903c50a 100644
--- a/sys-fs/lufs/lufs-0.9.3.ebuild
+++ b/sys-fs/lufs/lufs-0.9.3.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.3.ebuild,v 1.3 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.3.ebuild,v 1.4 2004/06/30 17:11:45 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-#RDEPEND
-KEYWORDS="x86 amd64"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
+DEPEND="virtual/linux-sources"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-fs/lufs/lufs-0.9.4.ebuild b/sys-fs/lufs/lufs-0.9.4.ebuild
index 7e3899eeb9cd..77109d977740 100644
--- a/sys-fs/lufs/lufs-0.9.4.ebuild
+++ b/sys-fs/lufs/lufs-0.9.4.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.4.ebuild,v 1.3 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.4.ebuild,v 1.4 2004/06/30 17:11:45 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-#RDEPEND
-KEYWORDS="x86 amd64"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
+DEPEND="virtual/linux-sources"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-fs/lufs/lufs-0.9.5.ebuild b/sys-fs/lufs/lufs-0.9.5.ebuild
index f3bc62edde72..bc0ff90a71d9 100644
--- a/sys-fs/lufs/lufs-0.9.5.ebuild
+++ b/sys-fs/lufs/lufs-0.9.5.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.5.ebuild,v 1.3 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.5.ebuild,v 1.4 2004/06/30 17:11:45 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-KEYWORDS="x86 amd64"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-fs/lufs/lufs-0.9.6.ebuild b/sys-fs/lufs/lufs-0.9.6.ebuild
index 5ecbfe342dd0..85f523404f0d 100644
--- a/sys-fs/lufs/lufs-0.9.6.ebuild
+++ b/sys-fs/lufs/lufs-0.9.6.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.6.ebuild,v 1.3 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.6.ebuild,v 1.4 2004/06/30 17:11:45 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-KEYWORDS="~x86 ~amd64"
 SLOT="0"
+KEYWORDS="~x86 ~amd64"
 IUSE="lufsusermount"
 
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-fs/lufs/lufs-0.9.7-r1.ebuild b/sys-fs/lufs/lufs-0.9.7-r1.ebuild
index e6cfdb5d95fa..1bb0c0dd10ae 100644
--- a/sys-fs/lufs/lufs-0.9.7-r1.ebuild
+++ b/sys-fs/lufs/lufs-0.9.7-r1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r1.ebuild,v 1.6 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r1.ebuild,v 1.7 2004/06/30 17:11:45 vapier Exp $
 
 inherit kmod eutils
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 KMOD_SOURCES="${P}.tar.gz"
+DESCRIPTION="User-mode filesystem implementation"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="lufsusermount"
+
 DEPEND="virtual/linux-sources
 	sys-kernel/config-kernel"
 RDEPEND=""
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="lufsusermount"
 
 src_unpack() {
 	kmod_src_unpack
diff --git a/sys-fs/lufs/lufs-0.9.7.ebuild b/sys-fs/lufs/lufs-0.9.7.ebuild
index c3adccac7ba1..0c39b31ba412 100644
--- a/sys-fs/lufs/lufs-0.9.7.ebuild
+++ b/sys-fs/lufs/lufs-0.9.7.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7.ebuild,v 1.3 2004/06/24 22:52:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7.ebuild,v 1.4 2004/06/30 17:11:45 vapier Exp $
 
 inherit eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
-SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-KEYWORDS="~x86 ~amd64"
 SLOT="0"
+KEYWORDS="~x86 ~amd64"
 IUSE="lufsusermount"
 
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
index 165e82a68197..26769dc80c06 100644
--- a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
+++ b/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild,v 1.5 2004/06/24 22:52:30 agriffis Exp $
-
-IUSE="static"
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild,v 1.6 2004/06/30 17:12:05 vapier Exp $
 
 inherit flag-o-matic eutils
 
 S=${WORKDIR}/LVM/${PV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-KEYWORDS="~x86 ~amd64 -ppc ~sparc ~hppa alpha"
+SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
+
+LICENSE="GPL-2 | LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 -ppc ~sparc alpha ~hppa ~amd64"
+IUSE="static"
 
 DEPEND=">=sys-apps/sed-4.0
 	virtual/linux-sources"
-
 RDEPEND="${DEPEND}
 	!sys-fs/lvm2"
 
-LICENSE="GPL-2 | LGPL-2"
-SLOT="0"
-
-KS=/usr/src/linux
-
 pkg_setup() {
 	check_KV
 }
@@ -42,7 +38,7 @@ src_compile() {
 
 	./configure --prefix=/ \
 		--mandir=/usr/share/man \
-		--with-kernel_dir="${KS}" ${myconf} || die "configure failed"
+		--with-kernel_dir="/usr/src/linux" ${myconf} || die "configure failed"
 
 	# Fix flags
 	sed -i -e "54,56d" -e "73d" make.tmpl
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
index 8d46ac07890b..cf7916cc65d8 100644
--- a/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
+++ b/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7.ebuild,v 1.4 2004/06/24 22:52:30 agriffis Exp $
-
-IUSE="static"
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7.ebuild,v 1.5 2004/06/30 17:12:05 vapier Exp $
 
 inherit flag-o-matic
 
-S=${WORKDIR}/LVM/${PV}
 DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-KEYWORDS="x86 amd64 -ppc sparc hppa"
-
-DEPEND=">=sys-apps/sed-4.0 virtual/linux-sources"
-RDEPEND="${DEPEND}
-	!sys-fs/lvm2"
+SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 
 LICENSE="GPL-2 | LGPL-2"
 SLOT="0"
+KEYWORDS="x86 -ppc sparc hppa amd64"
+IUSE="static"
+
+DEPEND=">=sys-apps/sed-4.0
+	virtual/linux-sources"
+RDEPEND="${DEPEND}
+	!sys-fs/lvm2"
 
-KS=/usr/src/linux
+S=${WORKDIR}/LVM/${PV}
 
 pkg_setup() {
 	check_KV
@@ -35,7 +34,7 @@ src_compile() {
 
 	./configure --prefix=/ \
 		--mandir=/usr/share/man \
-		--with-kernel_dir="${KS}" ${myconf} || die "configure failed"
+		--with-kernel_dir="/usr/src/linux" ${myconf} || die "configure failed"
 
 	# Fix flags
 	sed -i -e "54,56d" -e "73d" make.tmpl
diff --git a/sys-fs/lvm2/lvm2-2.00.08.ebuild b/sys-fs/lvm2/lvm2-2.00.08.ebuild
index 72ec6b434db7..e1d78076507a 100644
--- a/sys-fs/lvm2/lvm2-2.00.08.ebuild
+++ b/sys-fs/lvm2/lvm2-2.00.08.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.08.ebuild,v 1.10 2004/06/24 22:52:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.08.ebuild,v 1.11 2004/06/30 17:12:23 vapier Exp $
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
 SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 sparc ppc"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND=">=sys-libs/device-mapper-1.00.07"
 RDEPEND="${DEPEND}
diff --git a/sys-fs/lvm2/lvm2-2.00.15.ebuild b/sys-fs/lvm2/lvm2-2.00.15.ebuild
index aab2b6290aed..7eaf34c24afd 100644
--- a/sys-fs/lvm2/lvm2-2.00.15.ebuild
+++ b/sys-fs/lvm2/lvm2-2.00.15.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.15.ebuild,v 1.5 2004/06/24 22:52:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.15.ebuild,v 1.6 2004/06/30 17:12:23 vapier Exp $
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
 SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ppc64"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ppc64"
+IUSE=""
 
 DEPEND=">=sys-libs/device-mapper-1.00.17"
 RDEPEND="${DEPEND}