you fools need to learn how to inherit eutils for epatch

38 files changed, 193 insertions, 163 deletions

diff --git a/app-admin/grubconf/grubconf-0.5.1.ebuild b/app-admin/grubconf/grubconf-0.5.1.ebuild
index 014cef8af447..76b33cef01dc 100644
--- a/app-admin/grubconf/grubconf-0.5.1.ebuild
+++ b/app-admin/grubconf/grubconf-0.5.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconf/grubconf-0.5.1.ebuild,v 1.2 2004/05/19 04:22:36 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconf/grubconf-0.5.1.ebuild,v 1.3 2004/05/28 15:40:59 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome2 based GRUB configuration editor"
-HOMEPAGE="http://grubconf.sf.net/"
+HOMEPAGE="http://grubconf.sourceforge.net/"
 SRC_URI="mirror://sourceforge/grubconf/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -17,13 +17,11 @@ RDEPEND=">=app-text/scrollkeeper-0.3.11
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/gconf-1.2"
-
 DEPEND="${RDEPEND}
 	sys-boot/grub
 	>=dev-util/pkgconfig-0.12.0"
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
 	cd ${S}/po
 	epatch ${FILESDIR}/Makefile.in.in.patch
diff --git a/app-arch/cksfv/cksfv-1.3.ebuild b/app-arch/cksfv/cksfv-1.3.ebuild
index 42a40367f862..7312892b5830 100644
--- a/app-arch/cksfv/cksfv-1.3.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cksfv/cksfv-1.3.ebuild,v 1.11 2004/05/25 20:41:22 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cksfv/cksfv-1.3.ebuild,v 1.12 2004/05/28 15:40:59 vapier Exp $
 
-DESCRIPTION="cksfv: SFV checksum utility (simple file verification)"
-SRC_URI="http://www.fodder.org/cksfv/${P}.tar.gz"
+inherit eutils
+
+DESCRIPTION="SFV checksum utility (simple file verification)"
 HOMEPAGE="http://www.fodder.org/cksfv/"
+SRC_URI="http://www.fodder.org/cksfv/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ~amd64"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
 src_compile() {
 	# patch for int size problems on 64bit systems
 	use amd64 && epatch ${FILESDIR}/${P}-64bit-fix.patch
-
 	emake || die
 }
 
 src_install() {
-	dobin src/cksfv
-	dodoc COPYING ChangeLog INSTALL README TODO
+	dobin src/cksfv || die
+	dodoc ChangeLog INSTALL README TODO
 }
diff --git a/app-crypt/cryptplug/cryptplug-0.3.16.ebuild b/app-crypt/cryptplug/cryptplug-0.3.16.ebuild
index 96464fe872ee..f2ec9682ef1b 100644
--- a/app-crypt/cryptplug/cryptplug-0.3.16.ebuild
+++ b/app-crypt/cryptplug/cryptplug-0.3.16.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cryptplug/cryptplug-0.3.16.ebuild,v 1.1 2004/05/05 03:56:27 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cryptplug/cryptplug-0.3.16.ebuild,v 1.2 2004/05/28 15:40:59 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="GPG and S/MIME encryption plugins.  Use by KMail v1.5 (KDE 3.1) and Mutt"
 HOMEPAGE="http://www.gnupg.org/"
@@ -8,7 +10,8 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/cryptplug/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa amd64 ~alpha ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa amd64 ~ia64"
+IUSE=""
 
 DEPEND="=app-crypt/gpgme-0.3.14"
 
diff --git a/app-editors/emacs/emacs-18.59.ebuild b/app-editors/emacs/emacs-18.59.ebuild
index de31af6fcf4d..cc3a234d076e 100644
--- a/app-editors/emacs/emacs-18.59.ebuild
+++ b/app-editors/emacs/emacs-18.59.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59.ebuild,v 1.1 2004/05/13 15:27:43 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59.ebuild,v 1.2 2004/05/28 15:40:59 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="The extensible self-documenting text editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/patches/${P}-linux22x-elf-glibc2.diff.gz"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
 
+LICENSE="GPL-1"
 SLOT="1"
 KEYWORDS="~x86"
-LICENSE="GPL-1"
 IUSE="X"
+
 DEPEND="sys-libs/ncurses
 	X? ( virtual/x11 )"
 PROVIDE="virtual/editor"
diff --git a/app-editors/jedit/jedit-4.2_pre12.ebuild b/app-editors/jedit/jedit-4.2_pre12.ebuild
index 3a4bb91deac6..f8986653aba4 100644
--- a/app-editors/jedit/jedit-4.2_pre12.ebuild
+++ b/app-editors/jedit/jedit-4.2_pre12.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2_pre12.ebuild,v 1.1 2004/05/03 03:06:04 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2_pre12.ebuild,v 1.2 2004/05/28 15:40:59 vapier Exp $
+
+inherit eutils
 
 MY_PV="42pre12"
 
 DESCRIPTION="Programmer's editor written in Java"
-HOMEPAGE="http://www.jedit.org"
+HOMEPAGE="http://www.jedit.org/"
 SRC_URI="mirror://sourceforge/jedit/jedit${MY_PV}source.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE="jikes"
 
 RDEPEND=">=virtual/jdk-1.3"
diff --git a/app-emulation/mol/mol-0.9.70.ebuild b/app-emulation/mol/mol-0.9.70.ebuild
index 2f41def36eff..2bf4aae7a4ef 100644
--- a/app-emulation/mol/mol-0.9.70.ebuild
+++ b/app-emulation/mol/mol-0.9.70.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.70.ebuild,v 1.4 2004/05/14 00:50:24 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.70.ebuild,v 1.5 2004/05/28 15:40:59 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="MOL (Mac-on-Linux) lets PPC users run MacOS (X) under Linux"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
 HOMEPAGE="http://www.maconlinux.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ppc"
+IUSE="alsa oss fbcon X oldworld sheep debug"
 
 DEPEND=""
 RDEPEND="net-misc/dhcp
 	net-firewall/iptables
 	alsa? ( virtual/alsa )
 	X? ( virtual/x11 )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ppc -x86 -sparc -alpha -mips"
-IUSE="alsa oss fbcon X oldworld sheep debug"
 
 pkg_setup() {
 	echo
diff --git a/app-sci/mathomatic/mathomatic-11.1c.ebuild b/app-sci/mathomatic/mathomatic-11.1c.ebuild
index bcdda886b825..54e4290bfca9 100644
--- a/app-sci/mathomatic/mathomatic-11.1c.ebuild
+++ b/app-sci/mathomatic/mathomatic-11.1c.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/mathomatic/mathomatic-11.1c.ebuild,v 1.1 2004/05/20 13:31:38 xtv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/mathomatic/mathomatic-11.1c.ebuild,v 1.2 2004/05/28 15:40:59 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Mathomatic - Algebraic Manipulator"
 HOMEPAGE="http://www.mathomatic.com/"
 SRC_URI="http://www.panix.com/~gesslein/${P}.tgz"
-LICENSE="LGPL-2"
 
+LICENSE="LGPL-2"
 SLOT="0"
-
 KEYWORDS="~x86"
-
 IUSE="icc"
+
 DEPEND="sys-libs/readline \
 	sys-libs/ncurses \
 	icc? ( dev-lang/icc )"
diff --git a/app-shells/rrs/rrs-1.50.ebuild b/app-shells/rrs/rrs-1.50.ebuild
index b93d994ad838..d99b019f0dd1 100644
--- a/app-shells/rrs/rrs-1.50.ebuild
+++ b/app-shells/rrs/rrs-1.50.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.50.ebuild,v 1.2 2004/05/13 08:25:29 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.50.ebuild,v 1.3 2004/05/28 15:40:59 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Reverse Remote Shell"
 HOMEPAGE="http://www.cycom.se/dl/rrs"
 SRC_URI="http://www.cycom.se/uploads/36/17/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
@@ -16,7 +19,6 @@ DEPEND="ssl? ( dev-libs/openssl )
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	epatch ${FILESDIR}/${PV}-include-string.h.patch
 }
 
diff --git a/dev-cpp/libglademm/libglademm-2.4.0.ebuild b/dev-cpp/libglademm/libglademm-2.4.0.ebuild
index 08f1c7af4112..161062e566c7 100644
--- a/dev-cpp/libglademm/libglademm-2.4.0.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.4.0.ebuild,v 1.4 2004/05/22 15:26:31 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.4.0.ebuild,v 1.5 2004/05/28 15:40:59 vapier Exp $
+
+inherit gnome2 eutils
 
-inherit gnome2
-IUSE=""
 DESCRIPTION="C++ bindings for libglade"
 HOMEPAGE="http://gtkmm.sourceforge.net/"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/libglademm/2.4/${P}.tar.bz2"
@@ -11,6 +11,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/libglademm/2.4/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="2.4"
 KEYWORDS="~x86 ~amd64"
+IUSE=""
 
 RDEPEND=">=gnome-base/libglade-2
 	>=dev-cpp/gtkmm-2.4"
diff --git a/dev-java/systray4j/systray4j-2.4.ebuild b/dev-java/systray4j/systray4j-2.4.ebuild
index 1ad98f705279..c109d7d69d62 100644
--- a/dev-java/systray4j/systray4j-2.4.ebuild
+++ b/dev-java/systray4j/systray4j-2.4.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/systray4j/systray4j-2.4.ebuild,v 1.3 2004/05/13 18:28:21 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/systray4j/systray4j-2.4.ebuild,v 1.4 2004/05/28 15:40:59 vapier Exp $
 
-inherit kde java-pkg
-
-IUSE="jikes"
+inherit kde java-pkg eutils
 
 DESCRIPTION="Library and daemon to give java applications access to the KDE tray"
-HOMEPAGE="http://systray.sourceforge.net"
+HOMEPAGE="http://systray.sourceforge.net/"
 SRC_URI="mirror://sourceforge/systray/${P}-kde3-src.tar.bz2"
-RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64"
+IUSE="jikes"
+
 DEPEND="=kde-base/kdelibs-3*
 	dev-java/java-config
 	>=virtual/jdk-1.3
 	jikes? ( >=dev-java/jikes-1.15 )
 	sys-apps/sed"
-
 RDEPEND="=kde-base/kdelibs-3*
 	 >=virtual/jre-1.3"
 
diff --git a/dev-libs/libmcal/libmcal-0.7-r2.ebuild b/dev-libs/libmcal/libmcal-0.7-r2.ebuild
index 4a36ce5c052f..63a8b28b3a6e 100644
--- a/dev-libs/libmcal/libmcal-0.7-r2.ebuild
+++ b/dev-libs/libmcal/libmcal-0.7-r2.ebuild
@@ -1,17 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r2.ebuild,v 1.1 2004/05/20 06:22:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r2.ebuild,v 1.2 2004/05/28 15:40:59 vapier Exp $
+
+inherit eutils
 
-DESCRIPTION="Modular Calendar Access Libary"
-HOMEPAGE="http://mcal.chek.com/"
 DRIVERS="mcaldrivers-0.9"
 SRC_URI_BASE="mirror://sourceforge/libmcal"
+DESCRIPTION="Modular Calendar Access Libary"
+HOMEPAGE="http://mcal.chek.com/"
 SRC_URI="${SRC_URI_BASE}/${P}.tar.gz ${SRC_URI_BASE}/${DRIVERS}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~s390"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~s390"
 IUSE="pam"
+
 DEPEND="pam? ( sys-libs/pam )"
+
 S=${WORKDIR}/${PN}
 
 src_unpack() {
diff --git a/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040426.ebuild b/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040426.ebuild
index f6e2593050c7..b74d51e9e667 100644
--- a/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040426.ebuild
+++ b/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040426.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040426.ebuild,v 1.2 2004/05/09 14:53:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/cl-aserve-1.2.35.20040426.ebuild,v 1.3 2004/05/28 15:40:59 vapier Exp $
 
-inherit common-lisp
+inherit common-lisp eutils
 
 MY_PV=${PV:0:6}
 CVS_PV=${PV:7:4}.${PV:11:2}.${PV:13}
diff --git a/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild b/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
index 6ce6097389d3..f52018416380 100644
--- a/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
+++ b/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild,v 1.2 2004/05/19 16:42:31 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-bouquet/cl-bouquet-0.1.ebuild,v 1.3 2004/05/28 15:40:59 vapier Exp $
 
-inherit common-lisp
+inherit common-lisp eutils
 
 DESCRIPTION="BOUQUET is a graph generator for ANSI Common Lisp which produces Tulip graph description files."
 HOMEPAGE="http://sourceforge.net/projects/bouquet/"
diff --git a/dev-ml/ulex/ulex-0.2-r1.ebuild b/dev-ml/ulex/ulex-0.2-r1.ebuild
index 8e0cdf1ff7e7..ca480fd04b21 100644
--- a/dev-ml/ulex/ulex-0.2-r1.ebuild
+++ b/dev-ml/ulex/ulex-0.2-r1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.2-r1.ebuild,v 1.1 2004/05/10 21:42:31 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.2-r1.ebuild,v 1.2 2004/05/28 15:41:00 vapier Exp $
 
-IUSE=""
+inherit eutils
 
-DESCRIPTION="ulex: a lexer generator for unicode"
+DESCRIPTION="a lexer generator for unicode"
 HOMEPAGE="http://www.cduce.org"
 SRC_URI="http://www.cduce.org/download/${P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
+IUSE=""
 
 DEPEND=">=dev-lang/ocaml-3.06
 	>=dev-ml/findlib-0.8"
@@ -25,5 +27,5 @@ src_install() {
 	dodir ${destdir}
 	# dummy ld.conf, packages do not install C libraries
 	make OCAMLFIND_LDCONF=dummy OCAMLFIND_DESTDIR=${D}${destdir} install || die
-	dodoc README CHANGES LICENSE
+	dodoc README CHANGES
 }
diff --git a/dev-perl/AppConfig/AppConfig-1.56-r1.ebuild b/dev-perl/AppConfig/AppConfig-1.56-r1.ebuild
index 3e4894ef84e5..cffed0e55713 100644
--- a/dev-perl/AppConfig/AppConfig-1.56-r1.ebuild
+++ b/dev-perl/AppConfig/AppConfig-1.56-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/AppConfig-1.56-r1.ebuild,v 1.1 2004/05/27 00:10:59 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/AppConfig/AppConfig-1.56-r1.ebuild,v 1.2 2004/05/28 15:41:00 vapier Exp $
 
-inherit perl-module
+inherit perl-module eutils
 
 DESCRIPTION="Application config (from ARGV, file, ...)"
-SRC_URI="http://www.cpan.org/authors/id/ABW/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/ABW/AppConfig-1.55/"
+SRC_URI="http://www.cpan.org/authors/id/ABW/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic | GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 sparc alpha ~ppc"
 
 DEPEND="dev-perl/Test-Simple"
@@ -19,4 +19,3 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/blockwhitespace.patch
 }
-
diff --git a/dev-python/fxpy/fxpy-1.0.5.ebuild b/dev-python/fxpy/fxpy-1.0.5.ebuild
index e23c84710193..0400457dca52 100644
--- a/dev-python/fxpy/fxpy-1.0.5.ebuild
+++ b/dev-python/fxpy/fxpy-1.0.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fxpy/fxpy-1.0.5.ebuild,v 1.2 2004/05/07 22:39:47 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fxpy/fxpy-1.0.5.ebuild,v 1.3 2004/05/28 15:41:00 vapier Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="FXPy-${PV}"
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyrex/pyrex-0.9.1.1.ebuild b/dev-python/pyrex/pyrex-0.9.1.1.ebuild
index 77c109a45a16..9c1e14c6b787 100644
--- a/dev-python/pyrex/pyrex-0.9.1.1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.1.1.ebuild,v 1.1 2004/05/03 20:47:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.1.1.ebuild,v 1.2 2004/05/28 15:41:00 vapier Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="Pyrex-${PV}"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild b/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild
index 200b0ebb452b..96512238c48d 100644
--- a/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild,v 1.1 2004/05/07 12:38:11 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/dejagnu-1.4.4-r1.ebuild,v 1.2 2004/05/28 15:41:00 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="DejaGnu is a framework for testing other programs"
 HOMEPAGE="http://www.gnu.org/software/dejagnu/"
@@ -8,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~mips ~ppc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips amd64"
 IUSE="doc"
 
 DEPEND="virtual/glibc
diff --git a/dev-util/spe/spe-0.5.1a.ebuild b/dev-util/spe/spe-0.5.1a.ebuild
index 44dffc13ae7a..fda38044e737 100644
--- a/dev-util/spe/spe-0.5.1a.ebuild
+++ b/dev-util/spe/spe-0.5.1a.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/spe/spe-0.5.1a.ebuild,v 1.2 2004/05/09 00:42:18 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/spe/spe-0.5.1a.ebuild,v 1.3 2004/05/28 15:41:04 vapier Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="SPE-0.5.1.a-wx2.4.2.4.-bl2.31"
 DESCRIPTION="Python IDE with Blender support"
 HOMEPAGE="http://spe.pycs.net/"
 SRC_URI="http://projects.blender.org/download.php/148/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-S="${WORKDIR}/${MY_P}"
 
 DEPEND=">=virtual/python-2.2.3-r1"
-
 RDEPEND=">=dev-python/wxPython-2.4.2.4
 	${DEPEND}"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/dev-util/visual-regexp/visual-regexp-3.0.ebuild b/dev-util/visual-regexp/visual-regexp-3.0.ebuild
index 695bf62bad59..cfe86f7a1c31 100644
--- a/dev-util/visual-regexp/visual-regexp-3.0.ebuild
+++ b/dev-util/visual-regexp/visual-regexp-3.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/visual-regexp-3.0.ebuild,v 1.2 2004/05/03 10:17:43 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/visual-regexp-3.0.ebuild,v 1.3 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
 DESCRIPTION="software that allows yoy ty type the regexp, and visualize it on a sample of your choice"
-SRC_URI="http://laurent.riesterer.free.fr/regexp/visual_regexp-${PV}.tar.gz"
 HOMEPAGE="http://laurent.riesterer.free.fr/regexp/"
-SLOT="0"
+SRC_URI="http://laurent.riesterer.free.fr/regexp/visual_regexp-${PV}.tar.gz"
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-lang/tcl-8.3
diff --git a/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild
index 6cd7cc7a286c..9983c3cc7927 100644
--- a/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild,v 1.5 2004/05/26 01:21:48 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild,v 1.6 2004/05/28 15:41:04 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 FDL-1.1"
 
-IUSE="guile"
+LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha ~sparc hppa ~amd64 ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha hppa ~amd64"
+IUSE="guile"
 
 RDEPEND=">=x11-libs/gtk+-2.3
 	>=gnome-base/gconf-1.2
@@ -19,17 +19,15 @@ RDEPEND=">=x11-libs/gtk+-2.3
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/librsvg-2
 	guile? ( dev-util/guile )"
-
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.29
 	>=sys-devel/gettext-0.10.40
 	>=app-text/scrollkeeper-0.3.8
 	${RDEPEND}"
 
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
+DOCS="AUTHORS ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
 
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}/aisleriot
diff --git a/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild
index 9cca75c4ff84..2fa2251f53c8 100644
--- a/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild,v 1.3 2004/05/16 14:10:53 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild,v 1.4 2004/05/28 15:41:04 vapier Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 FDL-1.1"
 
-IUSE="guile"
+LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
+IUSE="guile"
 
 RDEPEND=">=x11-libs/gtk+-2.3
 	>=gnome-base/gconf-1.2
@@ -19,17 +19,15 @@ RDEPEND=">=x11-libs/gtk+-2.3
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/librsvg-2
 	guile? ( dev-util/guile )"
-
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.29
 	>=sys-devel/gettext-0.10.40
 	>=app-text/scrollkeeper-0.3.8
 	${RDEPEND}"
 
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
+DOCS="AUTHORS ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
 
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}/aisleriot
diff --git a/media-gfx/sodipodi/sodipodi-0.34.ebuild b/media-gfx/sodipodi/sodipodi-0.34.ebuild
index 88dbbeefa9e4..9783a553637b 100644
--- a/media-gfx/sodipodi/sodipodi-0.34.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.34.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.34.ebuild,v 1.3 2004/05/12 00:58:09 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.34.ebuild,v 1.4 2004/05/28 15:41:04 vapier Exp $
 
-inherit gnome2 64-bit
+inherit gnome2 64-bit eutils
 
 DESCRIPTION="vector-based drawing program for GNOME"
 HOMEPAGE="http://sodipodi.sourceforge.net/"
diff --git a/media-gfx/yafray/yafray-0.0.6.ebuild b/media-gfx/yafray/yafray-0.0.6.ebuild
index ee12d8ee1785..117efa1a5e9d 100644
--- a/media-gfx/yafray/yafray-0.0.6.ebuild
+++ b/media-gfx/yafray/yafray-0.0.6.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.6.ebuild,v 1.4 2004/05/03 14:37:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/yafray/yafray-0.0.6.ebuild,v 1.5 2004/05/28 15:41:04 vapier Exp $
 
-inherit gcc
+inherit gcc eutils
 
 DESCRIPTION="Yet Another Free Raytracer"
-HOMEPAGE="http://www.yafray.org"
+HOMEPAGE="http://www.yafray.org/"
 SRC_URI="http://www.coala.uniovi.es/~jandro/noname/downloads/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc ~amd64"
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
 
 RDEPEND="media-libs/jpeg
-		sys-libs/zlib"
-
+	sys-libs/zlib"
 DEPEND="${RDEPEND}
-		=sys-devel/gcc-3*
-		>=sys-apps/sed-4
-		>=sys-devel/automake-1.7.2"
-
-IUSE=""
+	=sys-devel/gcc-3*
+	>=sys-apps/sed-4
+	>=sys-devel/automake-1.7.2"
 
 export WANT_GCC_3="yes"
 export WANT_AUTOMAKE="1.7"
diff --git a/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild
index e20dc0a64bd8..2456d38576d0 100644
--- a/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild,v 1.1 2004/05/21 18:48:52 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild,v 1.2 2004/05/28 15:41:04 vapier Exp $
 
-inherit gnuconfig flag-o-matic
+inherit gnuconfig flag-o-matic eutils
 
 DESCRIPTION="A library to play a wide range of module formats"
 HOMEPAGE="http://mikmod.raphnet.net/"
diff --git a/media-libs/tse3/tse3-0.2.7.ebuild b/media-libs/tse3/tse3-0.2.7.ebuild
index cc8d6a44d2d9..c4bdc8a788ce 100644
--- a/media-libs/tse3/tse3-0.2.7.ebuild
+++ b/media-libs/tse3/tse3-0.2.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/tse3-0.2.7.ebuild,v 1.6 2004/05/25 15:42:59 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/tse3-0.2.7.ebuild,v 1.7 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="TSE3 Sequencer library"
 HOMEPAGE="http://TSE3.sourceforge.net/"
diff --git a/net-dialup/slmodem/slmodem-2.9.7.ebuild b/net-dialup/slmodem/slmodem-2.9.7.ebuild
index e40fa8f23027..8d210efba01f 100644
--- a/net-dialup/slmodem/slmodem-2.9.7.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.7.ebuild,v 1.1 2004/05/23 07:16:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.7.ebuild,v 1.2 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Driver for Smart Link modem"
 HOMEPAGE="http://www.smlink.com/"
diff --git a/net-im/openc6/openc6-0.9.5_beta.ebuild b/net-im/openc6/openc6-0.9.5_beta.ebuild
index d84ccff4f525..31b295fa377b 100644
--- a/net-im/openc6/openc6-0.9.5_beta.ebuild
+++ b/net-im/openc6/openc6-0.9.5_beta.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/openc6-0.9.5_beta.ebuild,v 1.1 2004/05/12 10:04:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/openc6-0.9.5_beta.ebuild,v 1.2 2004/05/28 15:41:04 vapier Exp $
 
-inherit kde
+inherit kde eutils
 need-qt 3.1
 
 DESCRIPTION="An open source C6 client"
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
index d7e2e9557cb7..c74d80376eda 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild,v 1.2 2004/05/26 15:59:19 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild,v 1.3 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="SMTP Relaying Control designed for qmail & tcpserver."
-SRC_URI="http://untroubled.org/relay-ctrl/${P}.tar.gz"
 HOMEPAGE="http://untroubled.org/relay-ctrl/"
+SRC_URI="http://untroubled.org/relay-ctrl/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64"
 
 DEPEND="sys-devel/gcc-config"
diff --git a/net-misc/netsed/netsed-0.01b.ebuild b/net-misc/netsed/netsed-0.01b.ebuild
index e30ed76d6142..0e1553174c9d 100644
--- a/net-misc/netsed/netsed-0.01b.ebuild
+++ b/net-misc/netsed/netsed-0.01b.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netsed/netsed-0.01b.ebuild,v 1.1 2004/05/14 19:40:51 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netsed/netsed-0.01b.ebuild,v 1.2 2004/05/28 15:41:04 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="A small and handful utility designed to alter the contents of packets forwarded thru your network in real time"
-SRC_URI="http://dione.ids.pl/~lcamtuf/${PN}.tgz
-		http://http.us.debian.org/debian/pool/main/n/netsed/${PN}_0.01c-2.diff.gz"
-
 HOMEPAGE="http://freshmeat.net/projects/netsed"
+SRC_URI="http://dione.ids.pl/~lcamtuf/${PN}.tgz
+	http://http.us.debian.org/debian/pool/main/n/netsed/${PN}_0.01c-2.diff.gz"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
diff --git a/net-www/mod_ftpd/mod_ftpd-0.12.3.ebuild b/net-www/mod_ftpd/mod_ftpd-0.12.3.ebuild
index fe544df046b1..9719e59b8737 100644
--- a/net-www/mod_ftpd/mod_ftpd-0.12.3.ebuild
+++ b/net-www/mod_ftpd/mod_ftpd-0.12.3.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ftpd/mod_ftpd-0.12.3.ebuild,v 1.1 2004/05/14 17:01:36 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ftpd/mod_ftpd-0.12.3.ebuild,v 1.2 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Apache2 protocol module which provides an FTP server"
 HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_ftpd/"
 SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
+
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~x86"
diff --git a/net-www/mypictures/mypictures-20040202.ebuild b/net-www/mypictures/mypictures-20040202.ebuild
index 15a9b3a04ae6..e8cc282a70a4 100644
--- a/net-www/mypictures/mypictures-20040202.ebuild
+++ b/net-www/mypictures/mypictures-20040202.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mypictures/mypictures-20040202.ebuild,v 1.2 2004/05/03 10:20:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mypictures/mypictures-20040202.ebuild,v 1.3 2004/05/28 15:41:04 vapier Exp $
 
-inherit webapp
+inherit webapp eutils
 
 DESCRIPTION="Simple photo-gallery for websites"
 HOMEPAGE="http://www.splitbrain.org/Programming/PHP/mypictures/index.php"
 SRC_URI="http://www.splitbrain.org/Programming/PHP/mypictures/mypictures.tgz"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-DEPEND="$DEPEND
-	sys-apps/sed"
-RDEPEND="$RDEPEND
-	media-gfx/imagemagick"
+
+DEPEND="sys-apps/sed"
+RDEPEND="media-gfx/imagemagick"
+
 S=${WORKDIR}/${PN}
 
 src_unpack () {
diff --git a/sys-apps/air/air-1.2.3_beta3.ebuild b/sys-apps/air/air-1.2.3_beta3.ebuild
index 94b41c608f00..0efb268d2d91 100644
--- a/sys-apps/air/air-1.2.3_beta3.ebuild
+++ b/sys-apps/air/air-1.2.3_beta3.ebuild
@@ -1,29 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/air/air-1.2.3_beta3.ebuild,v 1.4 2004/05/23 20:11:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/air/air-1.2.3_beta3.ebuild,v 1.5 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A GUI front-end to dd/dcfldd"
 HOMEPAGE="http://air-imager.sourceforge.net/"
 MY_P=${P/_/-}
 SRC_URI="mirror://sourceforge/air-imager/${MY_P}.tar.gz"
-RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-# Only tested on x86
 KEYWORDS="~x86"
-
 IUSE=""
 
 DEPEND="dev-perl/perl-tk
 	app-arch/sharutils
 	>=sys-apps/sed-4"
-
 RDEPEND="app-arch/mt-st
 	dev-lang/perl"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	#The tarball doesn't have a directory
 	mkdir ${S}
diff --git a/sys-boot/palo/palo-1.5_pre20040515.ebuild b/sys-boot/palo/palo-1.5_pre20040515.ebuild
index f38cb22d16c4..8a9d528c368c 100644
--- a/sys-boot/palo/palo-1.5_pre20040515.ebuild
+++ b/sys-boot/palo/palo-1.5_pre20040515.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.5_pre20040515.ebuild,v 1.3 2004/05/19 01:00:14 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.5_pre20040515.ebuild,v 1.4 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
 MY_V=${PV/_pre/-CVS}
 DESCRIPTION="PALO : PArisc Linux Loader"
diff --git a/sys-fs/lufs/lufs-0.9.7-r2.ebuild b/sys-fs/lufs/lufs-0.9.7-r2.ebuild
index 5e0d80b4c6c9..0969cbe286d4 100644
--- a/sys-fs/lufs/lufs-0.9.7-r2.ebuild
+++ b/sys-fs/lufs/lufs-0.9.7-r2.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r2.ebuild,v 1.1 2004/05/19 23:53:18 steel300 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r2.ebuild,v 1.2 2004/05/28 15:41:04 vapier Exp $
 
-inherit kmod
+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="debug lufsusermount disablekernelsupport"
+
 DEPEND="virtual/linux-sources
 	sys-kernel/config-kernel"
 RDEPEND=""
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="debug lufsusermount disablekernelsupport"
 
 src_unpack() {
 	kmod_src_unpack
diff --git a/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild b/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild
index a49c461b4088..048850fadec6 100644
--- a/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild
+++ b/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild,v 1.5 2004/05/07 21:09:18 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild,v 1.6 2004/05/28 15:41:04 vapier Exp $
 
-IUSE=""
+inherit eutils
 
-DESCRIPTION="Goodies for aewm++."
+DESCRIPTION="Goodies for aewm++"
 HOMEPAGE="http://sapphire.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sapphire/${P/-/_}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64"
+IUSE=""
+
 DEPEND="virtual/x11"
 
 S="${WORKDIR}/${PN/-/_}"
diff --git a/x11-wm/ion/ion-20020207-r1.ebuild b/x11-wm/ion/ion-20020207-r1.ebuild
index fa5050a188d8..298f330f00d2 100644
--- a/x11-wm/ion/ion-20020207-r1.ebuild
+++ b/x11-wm/ion/ion-20020207-r1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ion-20020207-r1.ebuild,v 1.8 2004/05/07 21:16:21 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ion-20020207-r1.ebuild,v 1.9 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
-SRC_URI="http://www.students.tut.fi/~tuomov/dl/${P}.tar.gz"
 DESCRIPTION="A keyboard-based window manager"
 HOMEPAGE="http://www.students.tut.fi/~tuomov/ion/"
-IUSE=""
-SLOT="0"
+SRC_URI="http://www.students.tut.fi/~tuomov/dl/${P}.tar.gz"
+
 LICENSE="Clarified-Artistic"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="virtual/x11"
 
@@ -18,7 +21,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
-
 src_compile() {
 	# Edit system.mk
 	cp system.mk system.mk.new
diff --git a/x11-wm/openbox/openbox-3.2-r1.ebuild b/x11-wm/openbox/openbox-3.2-r1.ebuild
index 91a73e305a68..8ffd305c80e4 100644
--- a/x11-wm/openbox/openbox-3.2-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.2-r1.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.2-r1.ebuild,v 1.5 2004/05/11 00:17:41 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.2-r1.ebuild,v 1.6 2004/05/28 15:41:04 vapier Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
-
+HOMEPAGE="http://icculus.org/openbox/"
 SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz
-		mirror://gentoo/ob-themes-usability.tar.bz2"
+	mirror://gentoo/ob-themes-usability.tar.bz2"
 
-HOMEPAGE="http://icculus.org/openbox/"
-IUSE="nls"
+LICENSE="GPL-2"
 SLOT="3"
+KEYWORDS="x86 sparc ~alpha ~ppc ~amd64"
+IUSE="nls"
 
 RDEPEND="virtual/xft
 	virtual/x11
@@ -20,9 +23,6 @@ RDEPEND="virtual/xft
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~alpha ~ppc ~amd64"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}