base-eclass. Update checksums

107 files changed, 441 insertions, 137 deletions

diff --git a/app-admin/checksec/ChangeLog b/app-admin/checksec/ChangeLog
index 3e729854..d8e7dc3d 100644
--- a/app-admin/checksec/ChangeLog
+++ b/app-admin/checksec/ChangeLog
@@ -4,6 +4,9 @@
 
 *checksec-1.5 (12 Feb 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-admin/checksec/checksec-1.5.ebuild b/app-admin/checksec/checksec-1.5.ebuild
index ef210637..65abbbf9 100644
--- a/app-admin/checksec/checksec-1.5.ebuild
+++ b/app-admin/checksec/checksec-1.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base
+inherit eutils
 
 DESCRIPTION="Check for hardened protections like RELRO, NoExec, Stack protection, ASLR, PIE"
 HOMEPAGE="http://www.trapkit.de/tools/checksec.html"
@@ -16,6 +16,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion"
 S="${WORKDIR}"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	newbin "${DISTDIR}/${P}.sh" "${PN}"
 	if use zsh-completion
diff --git a/app-admin/sudox/ChangeLog b/app-admin/sudox/ChangeLog
index 81a2a392..0c187935 100644
--- a/app-admin/sudox/ChangeLog
+++ b/app-admin/sudox/ChangeLog
@@ -4,6 +4,9 @@
 
 *sudox-3.10 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-admin/sudox/sudox-3.10.ebuild b/app-admin/sudox/sudox-3.10.ebuild
index cde84a5a..231aad04 100644
--- a/app-admin/sudox/sudox-3.10.ebuild
+++ b/app-admin/sudox/sudox-3.10.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="sudox is a wrapper for sudo which can pass X authority data and deal with screen and tmux"
 HOMEPAGE="https://github.com/vaeth/sudox/"
@@ -18,6 +18,10 @@ RDEPEND="app-admin/sudo
 	app-shells/push"
 DEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin "${PN}"
 	if use zsh-completion
diff --git a/app-arch/archwrap/ChangeLog b/app-arch/archwrap/ChangeLog
index 74025b28..99b3b590 100644
--- a/app-arch/archwrap/ChangeLog
+++ b/app-arch/archwrap/ChangeLog
@@ -4,6 +4,9 @@
 
 *archwrap-1.9 (08 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   08 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-arch/archwrap/archwrap-1.9.ebuild b/app-arch/archwrap/archwrap-1.9.ebuild
index d74c93d5..dfed67de 100644
--- a/app-arch/archwrap/archwrap-1.9.ebuild
+++ b/app-arch/archwrap/archwrap-1.9.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="A collection of POSIX shell scripts to invoke archiver programs"
 HOMEPAGE="https://github.com/vaeth/archwrap/"
@@ -17,6 +17,10 @@ IUSE="zsh-completion"
 RDEPEND="app-shells/push"
 DEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	local i
 	insinto /usr/bin
diff --git a/app-arch/bzwc/ChangeLog b/app-arch/bzwc/ChangeLog
index 378bf44b..2096a856 100644
--- a/app-arch/bzwc/ChangeLog
+++ b/app-arch/bzwc/ChangeLog
@@ -4,6 +4,9 @@
 
 *bzwc-2.12 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-arch/bzwc/bzwc-2.12.ebuild b/app-arch/bzwc/bzwc-2.12.ebuild
index 5f6916d6..e5706067 100644
--- a/app-arch/bzwc/bzwc-2.12.ebuild
+++ b/app-arch/bzwc/bzwc-2.12.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="A POSIX shell wrapper for wc, supporting compressed files (xz, lzma, bz2, gz)"
 HOMEPAGE="https://github.com/vaeth/bzwc/"
@@ -17,6 +17,10 @@ IUSE="zsh-completion"
 RDEPEND="app-shells/push"
 DEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	local i
 	insinto /usr/bin
diff --git a/app-dicts/stardict-dictd-BritannicaConcise/ChangeLog b/app-dicts/stardict-dictd-BritannicaConcise/ChangeLog
index 8933501e..fb296e91 100644
--- a/app-dicts/stardict-dictd-BritannicaConcise/ChangeLog
+++ b/app-dicts/stardict-dictd-BritannicaConcise/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild b/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild
index 5ee345c3..d50ff4c5 100644
--- a/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 DICT_PREFIX=""
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 DESCRIPTION="Stardict Dictionary for Dictd.org's The Britannica Concise Encyclopedia"
@@ -13,3 +13,7 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-dicts/stardict-dictd-cced/ChangeLog b/app-dicts/stardict-dictd-cced/ChangeLog
index a47fa633..710f372c 100644
--- a/app-dicts/stardict-dictd-cced/ChangeLog
+++ b/app-dicts/stardict-dictd-cced/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild b/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild
index e997c44e..798e516c 100644
--- a/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 DICT_PREFIX=""
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 DESCRIPTION="Stardict Dictionary for Dictd.org's Collins Cobuild English Dictionary"
@@ -13,3 +13,7 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-dicts/stardict-dictd-longman/ChangeLog b/app-dicts/stardict-dictd-longman/ChangeLog
index dd5884df..1edec86e 100644
--- a/app-dicts/stardict-dictd-longman/ChangeLog
+++ b/app-dicts/stardict-dictd-longman/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild b/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild
index bca685dc..1009346b 100644
--- a/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 DICT_PREFIX=""
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 DESCRIPTION="Stardict Dictionary for Dictd.org's Longman Dictionary of Contemporary English"
@@ -13,3 +13,7 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-dicts/stardict-dictd-merrianwebster/ChangeLog b/app-dicts/stardict-dictd-merrianwebster/ChangeLog
index f4f7a5dc..cc7f40c6 100644
--- a/app-dicts/stardict-dictd-merrianwebster/ChangeLog
+++ b/app-dicts/stardict-dictd-merrianwebster/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild b/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild
index a5c0c986..dae3e44b 100644
--- a/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 DICT_PREFIX=""
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 DESCRIPTION="Stardict Dictionary for Dictd.org's Merrian Webster 10th dictionary"
@@ -13,3 +13,7 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-dicts/stardict-dictd-oald/ChangeLog b/app-dicts/stardict-dictd-oald/ChangeLog
index 5a0d965c..d6d43e04 100644
--- a/app-dicts/stardict-dictd-oald/ChangeLog
+++ b/app-dicts/stardict-dictd-oald/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild b/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild
index 402ddb74..92bf0ef1 100644
--- a/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 DICT_PREFIX=""
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 DESCRIPTION="Stardict Dictionary for Dictd.org's Oxford Advanced Learner's Dictionary"
@@ -13,3 +13,7 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-dicts/stardict-dictd-thesaurus-ee/ChangeLog b/app-dicts/stardict-dictd-thesaurus-ee/ChangeLog
index ed37251c..2e293fea 100644
--- a/app-dicts/stardict-dictd-thesaurus-ee/ChangeLog
+++ b/app-dicts/stardict-dictd-thesaurus-ee/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild b/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild
index e7702266..39ea77ee 100644
--- a/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 DICT_PREFIX=""
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 DESCRIPTION="Stardict Dictionary for Dictd.org's English Thesaurus"
@@ -13,3 +13,7 @@ HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-dicts/stardict-freedict-deu-eng/ChangeLog b/app-dicts/stardict-freedict-deu-eng/ChangeLog
index a938bc19..6f21eb65 100644
--- a/app-dicts/stardict-freedict-deu-eng/ChangeLog
+++ b/app-dicts/stardict-freedict-deu-eng/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild b/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild
index c31ebe4e..cbf419b2 100644
--- a/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild
@@ -6,10 +6,14 @@ EAPI="4"
 FROM_LANG="German"
 TO_LANG="English"
 DICT_PREFIX="dictd_www.freedict.de_"
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-dicts/stardict-freedict-deu-ita/ChangeLog b/app-dicts/stardict-freedict-deu-ita/ChangeLog
index c5a5859a..bcd18005 100644
--- a/app-dicts/stardict-freedict-deu-ita/ChangeLog
+++ b/app-dicts/stardict-freedict-deu-ita/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild b/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild
index bea636f6..945c329e 100644
--- a/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild
@@ -6,10 +6,14 @@ EAPI="4"
 FROM_LANG="German"
 TO_LANG="Italian"
 DICT_PREFIX="dictd_www.freedict.de_"
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-dicts/stardict-freedict-ita-deu/ChangeLog b/app-dicts/stardict-freedict-ita-deu/ChangeLog
index a825339d..6130ab79 100644
--- a/app-dicts/stardict-freedict-ita-deu/ChangeLog
+++ b/app-dicts/stardict-freedict-ita-deu/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild
index f38402c5..2cf5c25c 100644
--- a/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild
@@ -6,10 +6,14 @@ EAPI="4"
 FROM_LANG="Italian"
 TO_LANG="German"
 DICT_PREFIX="dictd_www.freedict.de_"
-inherit base stardict
+inherit eutils stardict
 RESTRICT="mirror"
 
 HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
+
+src_prepare() {
+	epatch_user
+}
diff --git a/app-emacs/mv_emacs/ChangeLog b/app-emacs/mv_emacs/ChangeLog
index 8ff948b7..4644c0b3 100644
--- a/app-emacs/mv_emacs/ChangeLog
+++ b/app-emacs/mv_emacs/ChangeLog
@@ -4,6 +4,9 @@
 
 *mv_emacs-1.0 (01 Mar 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-emacs/mv_emacs/mv_emacs-1.0.ebuild b/app-emacs/mv_emacs/mv_emacs-1.0.ebuild
index 8ef44d66..c602b36e 100644
--- a/app-emacs/mv_emacs/mv_emacs-1.0.ebuild
+++ b/app-emacs/mv_emacs/mv_emacs-1.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base elisp-common vcs-snapshot
+inherit eutils elisp-common vcs-snapshot
 
 DESCRIPTION="A collection of perl scripts (replacement in files, syncing dirs etc)"
 HOMEPAGE="https://github.com/vaeth/mv_emacs/"
@@ -17,6 +17,10 @@ IUSE=""
 
 PDEPEND="virtual/emacs"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	insinto "${SITELISP}/mv_emacs"
 	doins *.el
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 2483e1e9..78f44894 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -2,5 +2,8 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   16 Apr 2012; Martin Väth <martin@mvath.de>
   Bump from the tree to make live ebuild; remove previous ChangeLog
diff --git a/app-portage/eix/eix-99999999.ebuild b/app-portage/eix/eix-99999999.ebuild
index 58118a88..d1d48b3f 100644
--- a/app-portage/eix/eix-99999999.ebuild
+++ b/app-portage/eix/eix-99999999.ebuild
@@ -8,7 +8,7 @@ EGIT_REPO_URI="git://git.berlios.de/${PN}"
 EGIT_PROJECT="${PN}.git"
 [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
 WANT_LIBTOOL=none
-inherit base git-2 autotools multilib bash-completion-r1
+inherit eutils git-2 autotools multilib bash-completion-r1
 
 DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
 HOMEPAGE="http://eix.berlios.de"
@@ -28,13 +28,13 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if has_version "<${CATEGORY}/${PN}-0.25.3"; then
-		local eixcache="${EROOT}"/var/cache/${PN}
-		[[ -f ${eixcache} ]] && rm -f "${eixcache}"
+		local eixcache="${EROOT}/var/cache/${PN}"
+		! test -f "${eixcache}" || rm -f -- "${eixcache}"
 	fi
 }
 
 src_prepare() {
-	base_src_prepare
+	epatch_user
 	eautopoint
 	eautoreconf
 }
diff --git a/app-portage/getdelta/ChangeLog b/app-portage/getdelta/ChangeLog
index 63c0dbc5..1b18e3be 100644
--- a/app-portage/getdelta/ChangeLog
+++ b/app-portage/getdelta/ChangeLog
@@ -4,6 +4,9 @@
 
 *getdelta-0.7.9 (19 Mar 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base.
 
diff --git a/app-portage/getdelta/getdelta-0.7.9.ebuild b/app-portage/getdelta/getdelta-0.7.9.ebuild
index 9893b45f..447db57b 100644
--- a/app-portage/getdelta/getdelta-0.7.9.ebuild
+++ b/app-portage/getdelta/getdelta-0.7.9.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base
+inherit eutils
 
 DESCRIPTION="dynamic deltup client"
 HOMEPAGE="http://linux01.gwdg.de/~nlissne/"
@@ -17,11 +17,11 @@ S="${WORKDIR}"
 RDEPEND="app-portage/deltup
 	dev-util/bdelta"
 
-PATCHES=("${FILESDIR}/eapi2.patch")
 
 src_prepare() {
+	epatch "${FILESDIR}/eapi2.patch"
 	sed -i -e "s:/bin/sh:/bin/bash:" getdelta.sh || die
-	base_src_prepare
+	epatch_user
 }
 
 src_install() {
diff --git a/app-portage/logclean/ChangeLog b/app-portage/logclean/ChangeLog
index 7db43367..1c70a3d6 100644
--- a/app-portage/logclean/ChangeLog
+++ b/app-portage/logclean/ChangeLog
@@ -4,6 +4,9 @@
 
 *logclean-7.7 (07 Jan 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-portage/logclean/logclean-7.7.ebuild b/app-portage/logclean/logclean-7.7.ebuild
index d2a17da2..a047d5ae 100644
--- a/app-portage/logclean/logclean-7.7.ebuild
+++ b/app-portage/logclean/logclean-7.7.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Keep only (compressed) logs of installed packages"
 HOMEPAGE="https://github.com/vaeth/logclean/"
@@ -19,6 +19,10 @@ RDEPEND="dev-lang/perl
 	virtual/perl-Getopt-Long
 	eix? ( app-portage/eix )"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin "${PN}"
 	if use zsh-completion
diff --git a/app-portage/portage-bashrc-mv/ChangeLog b/app-portage/portage-bashrc-mv/ChangeLog
index 3d5ea4d6..f88f17c6 100644
--- a/app-portage/portage-bashrc-mv/ChangeLog
+++ b/app-portage/portage-bashrc-mv/ChangeLog
@@ -4,6 +4,9 @@
 
 *portage-bashrc-mv-10.9 (11 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   11 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-10.9.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-10.9.ebuild
index 628ccdd1..4a43a8ee 100644
--- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-10.9.ebuild
+++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-10.9.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Provide support for /etc/portage/bashrc.d and /etc/portage/package.cflags"
 HOMEPAGE="https://github.com/vaeth/portage-bashrc-mv/"
@@ -15,6 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	insinto /etc/portage
 	doins -r bashrc bashrc.d
diff --git a/app-portage/trickyfetch/ChangeLog b/app-portage/trickyfetch/ChangeLog
index dcf02246..72962ed3 100644
--- a/app-portage/trickyfetch/ChangeLog
+++ b/app-portage/trickyfetch/ChangeLog
@@ -4,6 +4,9 @@
 
 *trickyfetch-6.8 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-portage/trickyfetch/trickyfetch-6.8.ebuild b/app-portage/trickyfetch/trickyfetch-6.8.ebuild
index cfdcb068..1598bddb 100644
--- a/app-portage/trickyfetch/trickyfetch-6.8.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-6.8.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Plugin for FETCHCOMMAND to help organize and cleanup your DISTDIR"
 HOMEPAGE="https://github.com/vaeth/trickyfetch/"
@@ -15,6 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin bin/*
 	if use zsh-completion
diff --git a/app-portage/useflags/ChangeLog b/app-portage/useflags/ChangeLog
index be20aeb1..4b4b9a0e 100644
--- a/app-portage/useflags/ChangeLog
+++ b/app-portage/useflags/ChangeLog
@@ -4,6 +4,9 @@
 
 *useflags-2.6 (08 Jan 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-portage/useflags/useflags-2.6.ebuild b/app-portage/useflags/useflags-2.6.ebuild
index b07f727a..7a476729 100644
--- a/app-portage/useflags/useflags-2.6.ebuild
+++ b/app-portage/useflags/useflags-2.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Print or save the current USE-flag state and compare with older versions"
 HOMEPAGE="https://github.com/vaeth/useflags/"
@@ -19,6 +19,10 @@ RDEPEND="dev-lang/perl
 	virtual/perl-Getopt-Long
 	eix? ( app-portage/eix )"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin "${PN}"
 	if use zsh-completion
diff --git a/app-portage/world-mv/ChangeLog b/app-portage/world-mv/ChangeLog
index 24b23816..78adb9ca 100644
--- a/app-portage/world-mv/ChangeLog
+++ b/app-portage/world-mv/ChangeLog
@@ -4,6 +4,9 @@
 
 *world-mv-3.8 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild. Fix EPREFIX substitution.
 
diff --git a/app-portage/world-mv/world-mv-3.8.ebuild b/app-portage/world-mv/world-mv-3.8.ebuild
index 75c01a8f..d2f263a5 100644
--- a/app-portage/world-mv/world-mv-3.8.ebuild
+++ b/app-portage/world-mv/world-mv-3.8.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 mPN="${PN%-*}"
 DESCRIPTION="Organize your world file and find installed packages or differences to @world"
@@ -20,7 +20,7 @@ RDEPEND=">=sys-apps/portage-2.2"
 
 src_prepare() {
 	sed -i -e "s'\${EPREFIX}'\\'${EPREFIX}\\''" "${mPN}" || die
-	base_src_prepare
+	epatch_user
 }
 
 src_install() {
diff --git a/app-shells/heirloom-sh/ChangeLog b/app-shells/heirloom-sh/ChangeLog
index 0a33bb7d..1867b8fa 100644
--- a/app-shells/heirloom-sh/ChangeLog
+++ b/app-shells/heirloom-sh/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-shells/heirloom-sh/heirloom-sh-050706.ebuild b/app-shells/heirloom-sh/heirloom-sh-050706.ebuild
index 33287a50..5a9ee10d 100644
--- a/app-shells/heirloom-sh/heirloom-sh-050706.ebuild
+++ b/app-shells/heirloom-sh/heirloom-sh-050706.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 RESTRICT="mirror"
 
 DESCRIPTION="Heirloom Bourne Shell, derived from OpenSolaris code SVR4/SVID3"
@@ -18,6 +18,10 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_compile() {
 	append-cppflags -D_GNU_SOURCE
 	emake \
diff --git a/app-shells/oh-my-zsh/ChangeLog b/app-shells/oh-my-zsh/ChangeLog
index 68e672dc..b56c8c4d 100644
--- a/app-shells/oh-my-zsh/ChangeLog
+++ b/app-shells/oh-my-zsh/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
index 32a4d0e6..e8b1c322 100644
--- a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
+++ b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 
 EGIT_REPO_URI="git://github.com/robbyrussell/${PN}.git"
 [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit base git-2
+inherit eutils git-2
 
 DESCRIPTION="A ready-to-use zsh configuration with plugins"
 HOMEPAGE="https://github.com/robbyrussell/oh-my-zsh"
@@ -33,7 +33,7 @@ src_prepare() {
 	sed -i -e 's!~/.oh-my-zsh!'"${ZSH_EDEST}"'!' \
 		"${S}/plugins/dirpersist/dirpersist.plugin.zsh"
 	sed -i -e '/zstyle.*cache/d' "${S}/lib/completion.zsh"
-	base_src_prepare
+	epatch_user
 }
 
 src_install() {
diff --git a/app-shells/runtitle/ChangeLog b/app-shells/runtitle/ChangeLog
index 43debe18..08d27f5c 100644
--- a/app-shells/runtitle/ChangeLog
+++ b/app-shells/runtitle/ChangeLog
@@ -4,6 +4,9 @@
 
 *runtitle-1.1 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-shells/runtitle/runtitle-1.1.ebuild b/app-shells/runtitle/runtitle-1.1.ebuild
index 3aab1645..64f2559f 100644
--- a/app-shells/runtitle/runtitle-1.1.ebuild
+++ b/app-shells/runtitle/runtitle-1.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Scripts to run commands and set the hard status line (windows title)"
 HOMEPAGE="https://github.com/vaeth/runtitle/"
@@ -15,6 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin bin/*
 	if use zsh-completion
diff --git a/app-shells/set_prompt/ChangeLog b/app-shells/set_prompt/ChangeLog
index 4d5ea83d..95c9521c 100644
--- a/app-shells/set_prompt/ChangeLog
+++ b/app-shells/set_prompt/ChangeLog
@@ -4,6 +4,9 @@
 
 *set_prompt-1.11 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/app-shells/set_prompt/set_prompt-1.11.ebuild b/app-shells/set_prompt/set_prompt-1.11.ebuild
index 1b215f66..01baa253 100644
--- a/app-shells/set_prompt/set_prompt-1.11.ebuild
+++ b/app-shells/set_prompt/set_prompt-1.11.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="A POSIX shell wrapper for wc, supporting compressed files (xz, lzma, bz2, gz)"
 HOMEPAGE="https://github.com/vaeth/set_prompt/"
@@ -15,6 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	insinto /etc
 	doins set_prompt.config
diff --git a/app-shells/zsh-run-help/ChangeLog b/app-shells/zsh-run-help/ChangeLog
index 8df59378..e4b6e1fd 100644
--- a/app-shells/zsh-run-help/ChangeLog
+++ b/app-shells/zsh-run-help/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-shells/zsh-run-help/zsh-run-help-1.ebuild b/app-shells/zsh-run-help/zsh-run-help-1.ebuild
index eaa125e3..a7511a09 100644
--- a/app-shells/zsh-run-help/zsh-run-help-1.ebuild
+++ b/app-shells/zsh-run-help/zsh-run-help-1.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base
+inherit eutils
 DESCRIPTION="Directory of help-files (for run-help) for your current zsh"
 HOMEPAGE=""
 
@@ -51,7 +51,7 @@ src_prepare() {
 		eerror "For compatibility reasons, this ebuild ignores LC_ALL."
 		die "Failed to produce necessary files"
 	}
-	base_src_prepare
+	epatch_user
 }
 
 src_install() {
diff --git a/app-shells/zsh-syntax-highlighting/ChangeLog b/app-shells/zsh-syntax-highlighting/ChangeLog
index c8c657d9..c7a253d6 100644
--- a/app-shells/zsh-syntax-highlighting/ChangeLog
+++ b/app-shells/zsh-syntax-highlighting/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
index 030cd99d..5fccabf8 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 EGIT_REPO_URI="git://github.com/zsh-users/zsh-syntax-highlighting.git"
 [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit base git-2
+inherit eutils git-2
 
 DESCRIPTION="Fish shell like syntax highlighting for zsh"
 HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
@@ -21,6 +21,10 @@ PROPERTIES="live"
 RDEPEND="app-shells/zsh"
 DEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dodoc *.md
 	insinto /usr/share/zsh/site-contrib
diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index 55f62e27..ad20c3ee 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   05 May 2012; Martin Väth <martin@mvath.de>
   Update pkgconfig dependency change from main tree.
 
diff --git a/app-text/stardict/stardict-3.0.3-r2.ebuild b/app-text/stardict/stardict-3.0.3-r2.ebuild
index d3dbcb60..7e25cbb7 100644
--- a/app-text/stardict/stardict-3.0.3-r2.ebuild
+++ b/app-text/stardict/stardict-3.0.3-r2.ebuild
@@ -13,7 +13,7 @@ EAPI=4
 GNOME2_LA_PUNT=yes
 GCONF_DEBUG=no
 
-inherit base eutils gnome2 autotools
+inherit eutils gnome2 autotools
 
 DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
 HOMEPAGE="http://code.google.com/p/stardict-3/"
@@ -72,16 +72,15 @@ pkg_setup() {
 		--disable-schemas-install"
 }
 
-PATCHES=(
-		"${FILESDIR}/${P}-correct-glib-include.patch"
-		"${FILESDIR}/${P}-entry.patch"
-		"${FILESDIR}/${P}-gcc46.patch"
-		"${FILESDIR}/${P}-compositelookup_cpp.patch"
-		"${FILESDIR}/${P}-overflow.patch"
-		"${FILESDIR}/${P}-zlib-1.2.5.2.patch"
-)
 src_prepare() {
-	base_src_prepare
+	epatch \
+		"${FILESDIR}"/${P}-correct-glib-include.patch \
+		"${FILESDIR}"/${P}-entry.patch \
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-compositelookup_cpp.patch \
+		"${FILESDIR}"/${P}-overflow.patch \
+		"${FILESDIR}"/${P}-zlib-1.2.5.2.patch
+	epatch_user
 	if ! use gnome
 	then	sed -i \
 				-e "s/GNOME_DOC_INIT/GNOME_DOC_INIT([0.32],[:],[:])/" \
diff --git a/dev-tex/chklref/ChangeLog b/dev-tex/chklref/ChangeLog
index 881942ff..e14fba27 100644
--- a/dev-tex/chklref/ChangeLog
+++ b/dev-tex/chklref/ChangeLog
@@ -4,6 +4,9 @@
 
 *chkltex-2.5.1 (11 Apr 2011)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/dev-tex/chklref/chklref-2.5.1.ebuild b/dev-tex/chklref/chklref-2.5.1.ebuild
index 1596eff0..b84f8c9c 100644
--- a/dev-tex/chklref/chklref-2.5.1.ebuild
+++ b/dev-tex/chklref/chklref-2.5.1.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base # latex-package
+inherit eutils # latex-package
 RESTRICT="mirror"
 
 DESCRIPTION="Finds out useless references in latex files or numbered environments that should not be"
@@ -19,4 +19,11 @@ RDEPEND="virtual/latex-base
 	dev-lang/perl"
 DEPEND="${RDEPEND}"
 
-DOCS=(README)
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	default
+	dodoc README
+}
diff --git a/dev-util/diffhelp/ChangeLog b/dev-util/diffhelp/ChangeLog
index 46ac270f..b5b1d271 100644
--- a/dev-util/diffhelp/ChangeLog
+++ b/dev-util/diffhelp/ChangeLog
@@ -4,6 +4,9 @@
 
 *diffhelp-1.5 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/dev-util/diffhelp/diffhelp-1.5.ebuild b/dev-util/diffhelp/diffhelp-1.5.ebuild
index 328dca1e..f94f6c9b 100644
--- a/dev-util/diffhelp/diffhelp-1.5.ebuild
+++ b/dev-util/diffhelp/diffhelp-1.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="A frontend, beautifier, and path-fixer for diff -u"
 HOMEPAGE="https://github.com/vaeth/diffhelp/"
@@ -15,6 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin "${PN}"
 	if use zsh-completion
diff --git a/dev-util/mv_perl/ChangeLog b/dev-util/mv_perl/ChangeLog
index d69b3540..9db1728b 100644
--- a/dev-util/mv_perl/ChangeLog
+++ b/dev-util/mv_perl/ChangeLog
@@ -4,6 +4,9 @@
 
 *noscript-2.2 (05 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   05 may 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/dev-util/mv_perl/mv_perl-2.2.ebuild b/dev-util/mv_perl/mv_perl-2.2.ebuild
index d9b1e8b1..e34e157f 100644
--- a/dev-util/mv_perl/mv_perl-2.2.ebuild
+++ b/dev-util/mv_perl/mv_perl-2.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="A collection of perl scripts (replacement in files, syncing dirs etc)"
 HOMEPAGE="https://github.com/vaeth/mv_perl/"
@@ -19,6 +19,10 @@ RDEPEND="dev-lang/perl
 	virtual/perl-Getopt-Long
 	virtual/perl-Digest-MD5"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin bin/*
 	dodoc README
diff --git a/dev-util/pyrep/ChangeLog b/dev-util/pyrep/ChangeLog
index 5ccf0c71..82a5bfb6 100644
--- a/dev-util/pyrep/ChangeLog
+++ b/dev-util/pyrep/ChangeLog
@@ -4,6 +4,9 @@
 
 *pyrep-1.1 (02 Mar 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/dev-util/pyrep/pyrep-1.1.ebuild b/dev-util/pyrep/pyrep-1.1.ebuild
index 58274231..fff53308 100644
--- a/dev-util/pyrep/pyrep-1.1.ebuild
+++ b/dev-util/pyrep/pyrep-1.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Search and/or replace regular expressions within many files interactively"
 HOMEPAGE="https://github.com/vaeth/pyrep/"
@@ -17,6 +17,10 @@ IUSE=""
 
 RDEPEND="dev-lang/python"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin "${PN}"
 }
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
new file mode 100644
index 00000000..807fc9b7
--- /dev/null
+++ b/eclass/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for eclass directory
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header $
+
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
+  12 May 2012; Martin Väth <martin@mvath.de>
+  Created ChangeLog
+
diff --git a/eclass/mv_mozextension.eclass b/eclass/mv_mozextension.eclass
index 91819982..c418f520 100644
--- a/eclass/mv_mozextension.eclass
+++ b/eclass/mv_mozextension.eclass
@@ -35,7 +35,7 @@
 # mozilla or not.
 : ${MV_MOZ_EXTDIR=?}
 
-inherit base multilib
+inherit eutils multilib
 
 case ${MV_MOZ_MOZILLAS:-icecat} in
 icecat)
@@ -83,7 +83,11 @@ mv_mozextension_src_unpack() {
 	xpi_unpack "${FILENAME}"
 }
 
-EXPORT_FUNCTIONS src_unpack
+mv_mozextension_src_prepare() {
+	epatch_user
+}
+
+EXPORT_FUNCTIONS src_unpack src_prepare
 
 declare -a MV_MOZ_INS MV_MOZ_PKG MV_MOZ_CPY MV_MOZ_DIR
 
@@ -276,3 +280,5 @@ xpi_install_dirs() {
 	do	[ -n "${d}" ] && test -d "${d}" && xpi_install "${d}"
 	done
 }
+
+
diff --git a/games-rpg/magus/ChangeLog b/games-rpg/magus/ChangeLog
index 82e87474..aa98b344 100644
--- a/games-rpg/magus/ChangeLog
+++ b/games-rpg/magus/ChangeLog
@@ -4,6 +4,9 @@
 
 *magus-1.3.3 (28 May 2011)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   16 Apr 2012; Martin Väth <martin@mvath.de>
   Use eautopoint and relax gettext runtime dependency
 
diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild
index 38b5c44c..46701fc8 100644
--- a/games-rpg/magus/magus-99999999.ebuild
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base autotools flag-o-matic
+inherit eutils autotools flag-o-matic
 RESTRICT="mirror"
 
 case ${PV} in
@@ -156,7 +156,7 @@ my_autoreconf() {
 src_prepare() {
 	local i
 	src_patch
-	base_src_prepare
+	epatch_user
 	for i in "${S}"/*
 	do	my_autoreconf "${i##*/}"
 	done
diff --git a/media-video/video-mv/ChangeLog b/media-video/video-mv/ChangeLog
index 6404633f..66e04636 100644
--- a/media-video/video-mv/ChangeLog
+++ b/media-video/video-mv/ChangeLog
@@ -4,6 +4,9 @@
 
 *video-mv-5.5 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/media-video/video-mv/video-mv-5.5.ebuild b/media-video/video-mv/video-mv-5.5.ebuild
index a74f363a..e801f483 100644
--- a/media-video/video-mv/video-mv-5.5.ebuild
+++ b/media-video/video-mv/video-mv-5.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="A frontend for using mplayer and mencoder as a video recorder"
 HOMEPAGE="https://github.com/vaeth/video-mv/"
@@ -18,6 +18,10 @@ RDEPEND="app-shells/push
 media-video/mplayer"
 DEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	local i
 	insinto /usr/bin
diff --git a/net-dialup/accounting/ChangeLog b/net-dialup/accounting/ChangeLog
index c85147a4..5ba51e6d 100644
--- a/net-dialup/accounting/ChangeLog
+++ b/net-dialup/accounting/ChangeLog
@@ -4,6 +4,9 @@
 
 * accounting-1.60.45.3.1.ebuild
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/net-dialup/accounting/accounting-1.60.45.3.1.ebuild b/net-dialup/accounting/accounting-1.60.45.3.1.ebuild
index 51f55753..983d560b 100644
--- a/net-dialup/accounting/accounting-1.60.45.3.1.ebuild
+++ b/net-dialup/accounting/accounting-1.60.45.3.1.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base rpm toolchain-funcs
+inherit eutils rpm toolchain-funcs
 RESTRICT="mirror"
 
 MY_PN="smpppd"
@@ -42,7 +42,7 @@ src_prepare() {
 		"${CDIR}"/defines.h
 	sed -i -e's!/var/log/[^.]*\.log!'"${ACCOUNTING_LOG}"'!' \
 		"${DDIR}"/accounting.1
-	base_src_prepare
+	epatch_user
 }
 
 src_configure() {
diff --git a/net-dialup/martian/ChangeLog b/net-dialup/martian/ChangeLog
index 8ae4b14a..55a7fd40 100644
--- a/net-dialup/martian/ChangeLog
+++ b/net-dialup/martian/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/net-dialup/martian/martian-20100123.ebuild b/net-dialup/martian/martian-20100123.ebuild
index 4e7966f2..a703ad05 100644
--- a/net-dialup/martian/martian-20100123.ebuild
+++ b/net-dialup/martian/martian-20100123.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base linux-mod eutils
+inherit linux-mod eutils
 
 ARCHRUMP="${PN}-full-${PV}"
 DESCRIPTION="Winmodems with Lucent Apollo (ISA) and Mars (PCI) chipsets"
@@ -25,8 +25,6 @@ MODULE_NAMES="martian_dev(ltmodem::kmodule)"
 CONFIG_CHECK="SERIAL_8250"
 SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL_8250) support."
 
-PATCHES=("${FILESDIR}/grsecurity.patch")
-
 pkg_setup() {
 	linux-mod_pkg_setup
 
@@ -39,6 +37,11 @@ pkg_setup() {
 	BUILD_PARAMS="KERNEL_DIR='${KV_DIR}' SUBLEVEL='21'"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/grsecurity.patch"
+	epatch_user
+}
+
 src_install() {
 	# install kernel module
 	linux-mod_src_install
diff --git a/net-firewall/firewall-mv/ChangeLog b/net-firewall/firewall-mv/ChangeLog
index 65d338c8..55662d3c 100644
--- a/net-firewall/firewall-mv/ChangeLog
+++ b/net-firewall/firewall-mv/ChangeLog
@@ -4,6 +4,9 @@
 
 *firewall-mv-6.6 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/net-firewall/firewall-mv/firewall-mv-6.6.ebuild b/net-firewall/firewall-mv/firewall-mv-6.6.ebuild
index 15a651e7..bb7bb281 100644
--- a/net-firewall/firewall-mv/firewall-mv-6.6.ebuild
+++ b/net-firewall/firewall-mv/firewall-mv-6.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Initialize iptables and net-related sysctl variables"
 HOMEPAGE="https://github.com/vaeth/firewall-mv/"
@@ -23,7 +23,7 @@ src_prepare() {
 		-e "s!/usr/!${EPREFIX%/}/usr/!g" \
 		firewall \
 		firewall.config
-	base_src_prepare
+	epatch_user
 }
 
 src_install() {
diff --git a/net-misc/sshstart/ChangeLog b/net-misc/sshstart/ChangeLog
index 15be0d4d..a4b0719c 100644
--- a/net-misc/sshstart/ChangeLog
+++ b/net-misc/sshstart/ChangeLog
@@ -4,6 +4,9 @@
 
 *sshstart-2.8 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/net-misc/sshstart/sshstart-2.8.ebuild b/net-misc/sshstart/sshstart-2.8.ebuild
index d8048c0f..b84afac7 100644
--- a/net-misc/sshstart/sshstart-2.8.ebuild
+++ b/net-misc/sshstart/sshstart-2.8.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Start ssh-agent/ssh-add only if you really use ssh or friends"
 HOMEPAGE="https://github.com/vaeth/sshstart/"
@@ -18,6 +18,10 @@ RDEPEND="app-shells/push
 	keychain? ( net-misc/keychain )"
 DEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin sshstart
 	dodoc README
diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 362fd8b2..f6c51240 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild b/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild
index e301be87..8e133798 100644
--- a/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base
+inherit eutils
 
 DESCRIPTION="Support for printing to ZjStream-based printers. Fixes bug 271079"
 HOMEPAGE="http://foo2zjs.rkkda.com/"
@@ -82,10 +82,11 @@ RDEPEND="cups? ( net-print/cups )
 KEYWORDS="~x86 ~amd64 ~ppc"
 S="${WORKDIR}/${PN}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-Makefile.patch
-	"${FILESDIR}"/${P}-udevfwld.patch
-)
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-udevfwld.patch
+	epatch_user
+}
 
 src_unpack() {
 	unpack ${P}.tar.gz
diff --git a/sys-apps/cpi/ChangeLog b/sys-apps/cpi/ChangeLog
index fba4e4e3..d34d0df7 100644
--- a/sys-apps/cpi/ChangeLog
+++ b/sys-apps/cpi/ChangeLog
@@ -4,6 +4,9 @@
 
 *cpi-1.6 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/sys-apps/cpi/cpi-1.6.ebuild b/sys-apps/cpi/cpi-1.6.ebuild
index 1b2662fd..87622519 100644
--- a/sys-apps/cpi/cpi-1.6.ebuild
+++ b/sys-apps/cpi/cpi-1.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="A wrapper for cp -i -a, making use of diff"
 HOMEPAGE="https://github.com/vaeth/cpi/"
@@ -15,6 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin "${PN}"
 	if use zsh-completion
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
index b2bbef18..dc63d293 100644
--- a/sys-apps/less/ChangeLog
+++ b/sys-apps/less/ChangeLog
@@ -4,6 +4,9 @@
 
 *less-445-r1.ebuild (10 Nov 2011)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/sys-apps/less/less-445-r1.ebuild b/sys-apps/less/less-445-r1.ebuild
index 37b6d405..a1439181 100644
--- a/sys-apps/less/less-445-r1.ebuild
+++ b/sys-apps/less/less-445-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base
+inherit eutils
 
 DESCRIPTION="Excellent text file viewer, optionally with additional selection feature"
 PATCHN="less-select"
@@ -31,14 +31,10 @@ src_unpack() {
 	if use less-select
 	then	unpack ${PATCHBALL}
 		cd *"${PATCHN}"-*
-		SELECTDIR="${PWD}"
+		SELECTDIR=${PWD}
 	fi
 }
 
-PATCHES=(
-	"${FILESDIR}"/code2color.patch
-)
-
 src_prepare() {
 	if use less-select
 	then	epatch "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" || die
@@ -46,7 +42,8 @@ src_prepare() {
 		sed -i -e 's|\([^a-zA-Z]\)/etc/less-select-key.bin|\1'"${EPREFIX%/}"'/etc/less/select-key.bin|g' \
 			"${SELECTDIR}/bin/less-select" || die
 	fi
-	base_src_prepare
+	epatch "${FILESDIR}"/code2color.patch
+	epatch_user
 }
 
 src_configure() {
diff --git a/sys-apps/starter/ChangeLog b/sys-apps/starter/ChangeLog
index 199679c0..2ead7677 100644
--- a/sys-apps/starter/ChangeLog
+++ b/sys-apps/starter/ChangeLog
@@ -4,6 +4,9 @@
 
 *starter-2.6 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/sys-apps/starter/starter-2.6.ebuild b/sys-apps/starter/starter-2.6.ebuild
index 53ba73bd..0380ecc9 100644
--- a/sys-apps/starter/starter-2.6.ebuild
+++ b/sys-apps/starter/starter-2.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="POSIX shell script and function to schedule commands"
 HOMEPAGE="https://github.com/vaeth/starter/"
@@ -17,6 +17,10 @@ IUSE="zsh-completion"
 RDEPEND="app-shells/push"
 DEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	local i
 	insinto /usr/bin
diff --git a/sys-block/zram-init/ChangeLog b/sys-block/zram-init/ChangeLog
index 36aa70e0..fe8c985c 100644
--- a/sys-block/zram-init/ChangeLog
+++ b/sys-block/zram-init/ChangeLog
@@ -4,6 +4,9 @@
 
 *zram-init-2.1.ebuild (02 Mar 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/sys-block/zram-init/zram-init-2.1.ebuild b/sys-block/zram-init/zram-init-2.1.ebuild
index ed79aa8a..e3265fb1 100644
--- a/sys-block/zram-init/zram-init-2.1.ebuild
+++ b/sys-block/zram-init/zram-init-2.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
 HOMEPAGE="https://github.com/vaeth/zram-init/"
@@ -15,6 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dosbin sbin/*
 	doinitd openrc/init.d/*
diff --git a/sys-fs/aufs-util/ChangeLog b/sys-fs/aufs-util/ChangeLog
index 01945044..d9de4fe5 100644
--- a/sys-fs/aufs-util/ChangeLog
+++ b/sys-fs/aufs-util/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/sys-fs/aufs-util/aufs-util-99999999.2.ebuild b/sys-fs/aufs-util/aufs-util-99999999.2.ebuild
index 47a0cfa3..bcfff4ec 100644
--- a/sys-fs/aufs-util/aufs-util-99999999.2.ebuild
+++ b/sys-fs/aufs-util/aufs-util-99999999.2.ebuild
@@ -5,10 +5,10 @@
 EAPI="4"
 EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git"
 EGIT_BRANCH="aufs2.1"
-EGIT_COMMIT="${EGIT_BRANCH}"
+EGIT_COMMIT=${EGIT_BRANCH}
 EGIT_HAS_SUBMODULES=true
 [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit base git-2 linux-info multilib
+inherit eutils git-2 linux-info multilib
 
 DESCRIPTION="Userspace tools for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -40,5 +40,5 @@ src_prepare() {
 		sed -i -e "1iCFLAGS += -I../local_kernel" -e "${l}" "${i}" || \
 			die "Patching ${i} failed"
 	done
-	base_src_prepare
+	epatch_user
 }
diff --git a/sys-fs/aufs-util/aufs-util-99999999.3.ebuild b/sys-fs/aufs-util/aufs-util-99999999.3.ebuild
index 16d999ec..c4337c93 100644
--- a/sys-fs/aufs-util/aufs-util-99999999.3.ebuild
+++ b/sys-fs/aufs-util/aufs-util-99999999.3.ebuild
@@ -5,10 +5,10 @@
 EAPI="4"
 EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git"
 EGIT_BRANCH="aufs3.0"
-EGIT_COMMIT="${EGIT_BRANCH}"
+EGIT_COMMIT=${EGIT_BRANCH}
 EGIT_HAS_SUBMODULES=true
 [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit base git-2 linux-info multilib
+inherit eutils git-2 linux-info multilib
 
 DESCRIPTION="Userspace tools for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -40,5 +40,5 @@ src_prepare() {
 		sed -i -e "1iCFLAGS += -I../local_kernel" -e "${l}" "${i}" || \
 			die "Patching ${i} failed"
 	done
-	base_src_prepare
+	epatch_user
 }
diff --git a/sys-fs/aufs/ChangeLog b/sys-fs/aufs/ChangeLog
index 2f40d8d6..339225f5 100644
--- a/sys-fs/aufs/ChangeLog
+++ b/sys-fs/aufs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/sys-fs/aufs/aufs-99999999.2.ebuild b/sys-fs/aufs/aufs-99999999.2.ebuild
index 26c6194b..56a3ec77 100644
--- a/sys-fs/aufs/aufs-99999999.2.ebuild
+++ b/sys-fs/aufs/aufs-99999999.2.ebuild
@@ -7,10 +7,10 @@ EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"
 EGIT_PROJECT="aufs2.git"
 # BRANCH/COMMIT will be overridden in pkg_setup (according to kernel version)
 EGIT_BRANCH="aufs2.2"
-EGIT_COMMIT="${EGIT_BRANCH}"
+EGIT_COMMIT=${EGIT_BRANCH}
 EGIT_HAS_SUBMODULES=true
 [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit base git-2 linux-info eutils
+inherit eutils git-2 linux-info eutils
 
 DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -33,17 +33,15 @@ fill_my_patchlist() {
 	local i
 	my_patchlist=()
 	for i
-	do	case "${i}" in
-		*.patch|*.diff)	test -f "${i}" && my_patchlist+=("${i}")
-		;;
+	do	case ${i} in
+		*.patch|*.diff)	! test -f "${i}" || my_patchlist+=("${i}");;
 		esac
 	done
-	:
 }
 
 apply_my_patch() {
 	local r
-	r=''
+	r=
 	if [ ${#} -gt 1 ]
 	then	shift
 		r='-R'
@@ -59,14 +57,14 @@ apply_my_patch() {
 
 apply_my_patchlist() {
 	local r i
-	r=''
-	if [ "${#}" -gt 0 ]
+	r=
+	if [ ${#} -gt 0 ]
 	then	shift
 		r='-R'
 	fi
 	set --
 	for i in "${my_patchlist[@]}"
-	do	if use all-patches || case "${i}" in
+	do	if use all-patches || case ${i} in
 		aufs*)	:;;
 		*)	false;;
 		esac
@@ -106,14 +104,14 @@ pkg_setup() {
 	elog "	AUFSBRANCH=aufs2.2-3.0 emerge -1 aufs"
 	elog "To use the aufs2.1 branch for kernel version 2.6.39 use:"
 	elog "	AUFSBRANCH=aufs2.1-39 emerge -1 aufs"
-	msg=''
+	msg=
 	if [ -n "${msg}" ]
 	then
 		elog "Note that it might be necessary in addition to fetch the newest aufs:"
 		elog "Set ${msg# } and be sure to be online during emerge."
 	fi
 	elog
-	EGIT_COMMIT="${EGIT_BRANCH}"
+	EGIT_COMMIT=${EGIT_BRANCH}
 
 	use kernel-patch || return 0
 	(
@@ -125,27 +123,26 @@ pkg_setup() {
 
 src_prepare() {
 	local i j w v newest all
-	base_src_prepare
+	epatch_user
 	all="2.2.0  2.2.1  2.2.2  2.2.2.r1"
-	newest="${all##* }"
-	v=''
+	newest=${all##* }
+	v=
 	for i in ${GRSECURITYPATCHVER-+}
-	do	case "${i}" in
-		'+')	j="${newest}";;
-		'*')	j="${all}";;
+	do	case ${i} in
+		'+')	j=${newest};;
+		'*')	j=${all};;
 		*)	w=:
 			for j in ${all}
 			do	[ "${i}" = "${j}" ] && w=false && continue
 			done
 			if ${w}
 			then	warn "GRSECURITYPATCHVER contains bad version ${i}"
-			else	j="${i}"
-			fi
-			;;
+			else	j=${i}
+			fi;;
 		esac
 		v="${v} ${j}"
 	done
-	v="${v# }"
+	v=${v# }
 	elog
 	elog "Using GRSECURITYPATCHVER: ${v}"
 	elog "If you want other patches, set GRSECURITYPATCHVER to some or more of:"
diff --git a/sys-fs/aufs/aufs-99999999.3-r1.ebuild b/sys-fs/aufs/aufs-99999999.3-r1.ebuild
index 359dad55..ff5b7252 100644
--- a/sys-fs/aufs/aufs-99999999.3-r1.ebuild
+++ b/sys-fs/aufs/aufs-99999999.3-r1.ebuild
@@ -7,10 +7,10 @@ EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git"
 EGIT_PROJECT="aufs3.git"
 # BRANCH/COMMIT will be overridden in pkg_setup (according to kernel version)
 EGIT_BRANCH="aufs3.0"
-EGIT_COMMIT="${EGIT_BRANCH}"
+EGIT_COMMIT=${EGIT_BRANCH}
 EGIT_HAS_SUBMODULES=true
 [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit base git-2 linux-info eutils
+inherit eutils git-2 linux-info eutils
 
 DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -33,16 +33,15 @@ fill_my_patchlist() {
 	local i
 	my_patchlist=()
 	for i
-	do	case "${i}" in
-		*.patch|*.diff)	test -f "${i}" && my_patchlist+=("${i}");;
+	do	case ${i} in
+		*.patch|*.diff)	! test -f "${i}" || my_patchlist+=("${i}");;
 		esac
 	done
-	:
 }
 
 apply_my_patch() {
 	local r
-	r=''
+	r=
 	if [ ${#} -gt 1 ]
 	then	shift
 		r='-R'
@@ -58,8 +57,8 @@ apply_my_patch() {
 
 apply_my_patchlist() {
 	local r i
-	r=''
-	if [ "${#}" -gt 0 ]
+	r=
+	if [ ${#} -gt 0 ]
 	then	shift
 		r='-R'
 	fi
@@ -103,14 +102,14 @@ pkg_setup() {
 	elog "If this guess for the branch is wrong, set AUFSBRANCH."
 	elog "For example, to use the aufs3.0 branch for kernel version 3.0, use:"
 	elog "	AUFSBRANCH=aufs3.0 emerge -1 aufs"
-	msg=''
+	msg=
 	if [ -n "${msg}" ]
 	then
 		elog "Note that it might be necessary in addition to fetch the newest aufs:"
 		elog "Set ${msg# } and be sure to be online during emerge."
 	fi
 	elog
-	EGIT_COMMIT="${EGIT_BRANCH}"
+	EGIT_COMMIT=${EGIT_BRANCH}
 
 	use kernel-patch || return 0
 	(
@@ -122,14 +121,14 @@ pkg_setup() {
 
 src_prepare() {
 	local i j w v newest all
-	base_src_prepare
+	epatch_user
 	all="2.2.0  2.2.1  2.2.2  2.2.2.r1"
-	newest="${all##* }"
-	v=''
+	newest=${all##* }
+	v=
 	for i in ${GRSECURITYPATCHVER-+}
-	do	case "${i}" in
-		'+')	j="${newest}";;
-		'*')	j="${all}";;
+	do	case ${i} in
+		'+')	j=${newest};;
+		'*')	j=${all};;
 		*)	w=:
 			for j in ${all}
 			do	[ "${i}" = "${j}" ] && w=false && continue
@@ -137,12 +136,11 @@ src_prepare() {
 			if ${w}
 			then	warn "GRSECURITYPATCHVER contains bad version ${i}"
 			else	j="${i}"
-			fi
-			;;
+			fi;;
 		esac
 		v="${v} ${j}"
 	done
-	v="${v# }"
+	v=${v# }
 	elog
 	elog "Using GRSECURITYPATCHVER: ${v}"
 	elog "If you want other patches, set GRSECURITYPATCHVER to some or more of:"
diff --git a/sys-fs/emount/ChangeLog b/sys-fs/emount/ChangeLog
index 9db27a18..afe77d2b 100644
--- a/sys-fs/emount/ChangeLog
+++ b/sys-fs/emount/ChangeLog
@@ -4,6 +4,9 @@
 
 *emount-2.1-r1 (03 Feb 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/sys-fs/emount/emount-2.1-r1.ebuild b/sys-fs/emount/emount-2.1-r1.ebuild
index 51fbdde3..544fc96b 100644
--- a/sys-fs/emount/emount-2.1-r1.ebuild
+++ b/sys-fs/emount/emount-2.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="mount/unmount (and create/remove) dm-crypt filesystems according to your /etc/fstab"
 HOMEPAGE="https://github.com/vaeth/emount/"
@@ -19,6 +19,10 @@ RDEPEND="dev-lang/perl
 	sys-fs/cryptsetup
 	virtual/perl-Getopt-Long"
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	local i
 	insinto /usr/bin
diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog
index 81c13362..4b8df871 100644
--- a/sys-fs/squash_dir/ChangeLog
+++ b/sys-fs/squash_dir/ChangeLog
@@ -4,6 +4,9 @@
 
 *squash_dir-11.10 (07 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   07 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild.
 
diff --git a/sys-fs/squash_dir/squash_dir-11.10.ebuild b/sys-fs/squash_dir/squash_dir-11.10.ebuild
index e853960d..8857f78b 100644
--- a/sys-fs/squash_dir/squash_dir-11.10.ebuild
+++ b/sys-fs/squash_dir/squash_dir-11.10.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 RESTRICT="mirror"
 WANT_LIBTOOL=none
-inherit base autotools vcs-snapshot
+inherit eutils autotools vcs-snapshot
 
 DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist"
 HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html"
@@ -28,7 +28,7 @@ RDEPEND="sys-fs/squashfs-tools
 DEPEND=">=sys-devel/autoconf-2.65"
 
 src_prepare() {
-	base_src_prepare
+	epatch_user
 	eautoreconf
 }
 
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index a7576606..5f2e77f6 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Add old LZMA support back (and revbump) as in the main tree.
   Downgrade revision numbers to match with main tree.
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
index 3cfbac3e..02f1bb59 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base toolchain-funcs
+inherit eutils toolchain-funcs
 
 MY_PV=${PV/_p/-r}
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
@@ -27,7 +27,7 @@ src_prepare() {
 	use progress-redirect && \
 		epatch "${FILESDIR}/${PN}-3.3-progress-stderr.patch"
 	echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h
-	base_src_prepare
+	epatch_user
 }
 
 src_compile() {
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
index 4a8c1c94..f233805f 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base toolchain-funcs
+inherit eutils toolchain-funcs
 
 MY_PV=${PV/_p/-r}
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
@@ -27,7 +27,7 @@ src_prepare() {
 	use progress-redirect && \
 		epatch "${FILESDIR}/${P}-progress-stderr.patch"
 	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
-	base_src_prepare
+	epatch_user
 }
 
 src_compile() {
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
index 90bc7eb4..e451cc0c 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit base toolchain-funcs
+inherit eutils toolchain-funcs
 
 MY_PV=${PV}
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
@@ -30,7 +30,7 @@ S="${WORKDIR}/squashfs${MY_PV}/squashfs-tools"
 src_prepare() {
 	use progress-redirect && \
 		epatch "${FILESDIR}/${PN}-4.0-progress-stderr.patch"
-	base_src_prepare
+	epatch_user
 }
 
 use_sed() {
diff --git a/sys-fs/unionfs-fuse/ChangeLog b/sys-fs/unionfs-fuse/ChangeLog
index c33475de..4a418ce2 100644
--- a/sys-fs/unionfs-fuse/ChangeLog
+++ b/sys-fs/unionfs-fuse/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   15 Apr 2012; Martin Väth <martin@mvath.de>
   Inherit base
 
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild
index ef28ad4e..e352faba 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild
@@ -3,7 +3,7 @@
 # $Header $
 
 EAPI="4"
-inherit base flag-o-matic
+inherit eutils flag-o-matic
 RESTRICT="mirror"
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
 
@@ -18,6 +18,10 @@ IUSE=""
 DEPEND="sys-fs/fuse"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch_user
+}
+
 src_configure() {
 	filter-flags -flto -fuse-linkerplugin -fwhole-program -fno-common
 }
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-99999999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-99999999.ebuild
index 305feebe..61ef452d 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-99999999.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-99999999.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 EHG_REPO_URI="http://podgorny.cz/~bernd/hg/hgwebdir.cgi/0.25"
 S="${WORKDIR}/0.25"
-inherit base mercurial flag-o-matic
+inherit eutils mercurial flag-o-matic
 
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
 
@@ -22,6 +22,10 @@ PROPERTIES="live"
 DEPEND="sys-fs/fuse"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch_user
+}
+
 src_configure() {
 	filter-flags -flto -fuse-linkerplugin -fwhole-program -fno-common
 }
diff --git a/sys-kernel/kernel/ChangeLog b/sys-kernel/kernel/ChangeLog
index 4be95e90..2ba80c5a 100644
--- a/sys-kernel/kernel/ChangeLog
+++ b/sys-kernel/kernel/ChangeLog
@@ -4,6 +4,9 @@
 
 *kernel-1.17 (06 May 2012)
 
+  12 May 2012; Martin Väth <martin@mvath.de>
+  base->eutils
+
   06 May 2012; Martin Väth <martin@mvath.de>
   Version bump, remove old ebuild. Makes app-shells/push mandatory.
 
diff --git a/sys-kernel/kernel/kernel-1.17.ebuild b/sys-kernel/kernel/kernel-1.17.ebuild
index 64345f27..dcf5179c 100644
--- a/sys-kernel/kernel/kernel-1.17.ebuild
+++ b/sys-kernel/kernel/kernel-1.17.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 RESTRICT="mirror"
-inherit base vcs-snapshot
+inherit eutils vcs-snapshot
 
 DESCRIPTION="A POSIX shell script to compile the kernel with user permissions"
 HOMEPAGE="https://github.com/vaeth/kernel/"
@@ -20,6 +20,10 @@ RDEPEND="app-admin/sudo
 	eix? ( app-portage/eix )"
 DEPEND=""
 
+src_prepare() {
+	epatch_user
+}
+
 src_install() {
 	dobin "${PN}"
 }