Use fixed EAPI assignment in the tests

9 files changed, 134 insertions, 151 deletions

diff --git a/paludis/repositories/e/e_repository_TEST_1_setup.sh b/paludis/repositories/e/e_repository_TEST_1_setup.sh
index 4ed17e4..f55666b 100755
--- a/paludis/repositories/e/e_repository_TEST_1_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_1_setup.sh
@@ -246,7 +246,7 @@ src_compile() {
 END
 mkdir -p "cat/econf-source"
 cat <<END > cat/econf-source/econf-source-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -270,10 +270,12 @@ src_install() {
 }
 END
 cp cat/econf-source/econf-source-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/econf-source/econf-source-1.ebuild || exit 1
 cp cat/econf-source/econf-source-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/econf-source/econf-source-2.ebuild || exit 1
 mkdir -p "cat/doman"
 cat <<END > cat/doman/doman-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -325,8 +327,9 @@ src_install() {
 }
 END
 cp cat/doman/doman-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/doman/doman-1.ebuild || exit 1
 cat <<END > cat/doman/doman-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -378,7 +381,7 @@ src_install() {
 END
 mkdir -p "cat/dosym-success"
 cat <<'END' > cat/dosym-success/dosym-success-1.ebuild || exit 1
-EAPI="${PV}"
+EAPI="1"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -420,7 +423,7 @@ pkg_setup() {
 END
 mkdir -p "cat/has-version"
 cat <<'END' > cat/has-version/has-version-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -441,7 +444,7 @@ pkg_setup() {
 END
 mkdir -p "cat/match"
 cat <<'END' > cat/match/match-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -472,7 +475,7 @@ DONE
 END
 mkdir -p "cat/vars"
 cat <<'END' > cat/vars/vars-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -495,7 +498,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/src_prepare"
 cat <<END > cat/src_prepare/src_prepare-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -509,10 +512,12 @@ src_prepare() {
 }
 END
 cp cat/src_prepare/src_prepare-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/src_prepare/src_prepare-1.ebuild || exit 1
 cp cat/src_prepare/src_prepare-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/src_prepare/src_prepare-2.ebuild || exit 1
 mkdir -p "cat/src_configure"
 cat <<END > cat/src_configure/src_configure-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -526,10 +531,12 @@ src_configure() {
 }
 END
 cp cat/src_configure/src_configure-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/src_configure/src_configure-1.ebuild || exit 1
 cp cat/src_configure/src_configure-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/src_configure/src_configure-2.ebuild || exit 1
 mkdir -p "cat/default-src_configure" || exit 1
 cat << END > cat/default-src_configure/default-src_configure-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -553,7 +560,7 @@ src_compile() {
 END
 mkdir -p "cat/default-src_compile" || exit 1
 cat << END > cat/default-src_compile/default-src_compile-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -581,7 +588,7 @@ src_install() {
 END
 mkdir -p "cat/default_src_compile" || exit 1
 cat << END > cat/default_src_compile/default_src_compile-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -610,7 +617,7 @@ src_compile() {
 END
 mkdir -p "cat/src_compile-via-default-func" || exit 1
 cat << END > cat/src_compile-via-default-func/src_compile-via-default-func-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -656,6 +663,7 @@ pkg_setup() {
 END
 mkdir -p "cat/pkg_pretend"
 cat <<"END" > cat/pkg_pretend/pkg_pretend-3.ebuild || exit 1
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -663,7 +671,6 @@ SLOT="0"
 IUSE="enabled-weasel broccoli"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 pkg_pretend() {
     einfo "This is my pkg_pretend. There are many like it, but this one is mine."
@@ -671,6 +678,7 @@ pkg_pretend() {
 END
 mkdir -p "cat/pkg_pretend-failure"
 cat <<"END" > cat/pkg_pretend-failure/pkg_pretend-failure-3.ebuild || exit 1
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -678,7 +686,6 @@ SLOT="0"
 IUSE="enabled-weasel broccoli"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 pkg_pretend() {
     die "This is my pkg_pretend. There are many like it, but this one is mine."
@@ -686,7 +693,7 @@ pkg_pretend() {
 END
 mkdir -p "cat/default_src_install" || exit 1
 cat << 'END' > cat/default_src_install/default_src_install-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -694,7 +701,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -722,7 +728,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/docompress" || exit 1
 cat << 'END' > cat/docompress/docompress-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -741,7 +747,7 @@ src_install() {
 END
 mkdir -p "cat/dodoc-r" || exit 1
 cat << 'END' > cat/dodoc-r/dodoc-r-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -781,7 +787,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/doins-symlink" || exit 1
 cat << 'END' > cat/doins-symlink/doins-symlink-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -834,6 +840,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/banned-functions"
 cat <<END > cat/banned-functions/banned-functions-3.ebuild || exit 1
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -841,7 +848,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="\${WORKDIR}"
 
@@ -852,7 +858,7 @@ src_install() {
 END
 mkdir -p "cat/econf-disable-dependency-tracking" || exit 1
 cat << 'END' > cat/econf-disable-dependency-tracking/econf-disable-dependency-tracking-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -882,7 +888,7 @@ EOF
 }
 END
 cat << 'END' > cat/econf-disable-dependency-tracking/econf-disable-dependency-tracking-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -890,7 +896,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -913,7 +918,7 @@ EOF
 END
 mkdir -p "cat/strict-use" || exit 1
 cat << 'END' > cat/strict-use/strict-use-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -921,7 +926,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -932,7 +936,7 @@ pkg_setup() {
 END
 mkdir -p "cat/strict-use-fail" || exit 1
 cat << 'END' > cat/strict-use-fail/strict-use-fail-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -940,7 +944,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -950,7 +953,7 @@ pkg_setup() {
 END
 mkdir -p "cat/strict-use-injection" || exit 1
 cat << 'END' > cat/strict-use-injection/strict-use-injection-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -958,7 +961,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -971,9 +973,10 @@ pkg_setup() {
 END
 mkdir -p "cat/global-scope-use" || exit 1
 cat << 'END' > cat/global-scope-use/global-scope-use-3.ebuild || exit 1
+EAPI="3"
+
 use spork
 
-EAPI="${PV}"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -981,7 +984,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 END
diff --git a/paludis/repositories/e/e_repository_TEST_2_setup.sh b/paludis/repositories/e/e_repository_TEST_2_setup.sh
index 301c075..2742e52 100755
--- a/paludis/repositories/e/e_repository_TEST_2_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_2_setup.sh
@@ -246,7 +246,7 @@ src_compile() {
 END
 mkdir -p "cat/econf-source"
 cat <<END > cat/econf-source/econf-source-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -270,10 +270,12 @@ src_install() {
 }
 END
 cp cat/econf-source/econf-source-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/econf-source/econf-source-1.ebuild || exit 1
 cp cat/econf-source/econf-source-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/econf-source/econf-source-2.ebuild || exit 1
 mkdir -p "cat/doman"
 cat <<END > cat/doman/doman-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -325,8 +327,9 @@ src_install() {
 }
 END
 cp cat/doman/doman-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/doman/doman-1.ebuild || exit 1
 cat <<END > cat/doman/doman-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -378,7 +381,7 @@ src_install() {
 END
 mkdir -p "cat/dosym-success"
 cat <<'END' > cat/dosym-success/dosym-success-1.ebuild || exit 1
-EAPI="${PV}"
+EAPI="1"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -420,7 +423,7 @@ pkg_setup() {
 END
 mkdir -p "cat/has-version"
 cat <<'END' > cat/has-version/has-version-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -441,7 +444,7 @@ pkg_setup() {
 END
 mkdir -p "cat/match"
 cat <<'END' > cat/match/match-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -472,7 +475,7 @@ DONE
 END
 mkdir -p "cat/vars"
 cat <<'END' > cat/vars/vars-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -495,7 +498,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/src_prepare"
 cat <<END > cat/src_prepare/src_prepare-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -509,10 +512,12 @@ src_prepare() {
 }
 END
 cp cat/src_prepare/src_prepare-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/src_prepare/src_prepare-1.ebuild || exit 1
 cp cat/src_prepare/src_prepare-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/src_prepare/src_prepare-2.ebuild || exit 1
 mkdir -p "cat/src_configure"
 cat <<END > cat/src_configure/src_configure-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -526,10 +531,12 @@ src_configure() {
 }
 END
 cp cat/src_configure/src_configure-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/src_configure/src_configure-1.ebuild || exit 1
 cp cat/src_configure/src_configure-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/src_configure/src_configure-2.ebuild || exit 1
 mkdir -p "cat/default-src_configure" || exit 1
 cat << END > cat/default-src_configure/default-src_configure-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -553,7 +560,7 @@ src_compile() {
 END
 mkdir -p "cat/default-src_compile" || exit 1
 cat << END > cat/default-src_compile/default-src_compile-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -581,7 +588,7 @@ src_install() {
 END
 mkdir -p "cat/default_src_compile" || exit 1
 cat << END > cat/default_src_compile/default_src_compile-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -610,7 +617,7 @@ src_compile() {
 END
 mkdir -p "cat/src_compile-via-default-func" || exit 1
 cat << END > cat/src_compile-via-default-func/src_compile-via-default-func-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -656,6 +663,7 @@ pkg_setup() {
 END
 mkdir -p "cat/pkg_pretend"
 cat <<"END" > cat/pkg_pretend/pkg_pretend-3.ebuild || exit 1
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -663,7 +671,6 @@ SLOT="0"
 IUSE="enabled-weasel broccoli"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 pkg_pretend() {
     einfo "This is my pkg_pretend. There are many like it, but this one is mine."
@@ -671,6 +678,7 @@ pkg_pretend() {
 END
 mkdir -p "cat/pkg_pretend-failure"
 cat <<"END" > cat/pkg_pretend-failure/pkg_pretend-failure-3.ebuild || exit 1
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -678,7 +686,6 @@ SLOT="0"
 IUSE="enabled-weasel broccoli"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 pkg_pretend() {
     die "This is my pkg_pretend. There are many like it, but this one is mine."
@@ -686,7 +693,7 @@ pkg_pretend() {
 END
 mkdir -p "cat/default_src_install" || exit 1
 cat << 'END' > cat/default_src_install/default_src_install-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -694,7 +701,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -722,7 +728,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/docompress" || exit 1
 cat << 'END' > cat/docompress/docompress-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -730,7 +736,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -741,7 +746,7 @@ src_install() {
 END
 mkdir -p "cat/dodoc-r" || exit 1
 cat << 'END' > cat/dodoc-r/dodoc-r-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -749,7 +754,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -781,7 +785,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/doins-symlink" || exit 1
 cat << 'END' > cat/doins-symlink/doins-symlink-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -789,7 +793,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -834,6 +837,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/banned-functions"
 cat <<END > cat/banned-functions/banned-functions-3.ebuild || exit 1
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -841,7 +845,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="\${WORKDIR}"
 
@@ -852,7 +855,7 @@ src_install() {
 END
 mkdir -p "cat/econf-disable-dependency-tracking" || exit 1
 cat << 'END' > cat/econf-disable-dependency-tracking/econf-disable-dependency-tracking-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -860,7 +863,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="0"
 
 S="${WORKDIR}"
 
@@ -882,7 +884,7 @@ EOF
 }
 END
 cat << 'END' > cat/econf-disable-dependency-tracking/econf-disable-dependency-tracking-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -890,7 +892,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -913,7 +914,7 @@ EOF
 END
 mkdir -p "cat/strict-use" || exit 1
 cat << 'END' > cat/strict-use/strict-use-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -921,7 +922,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -932,7 +932,7 @@ pkg_setup() {
 END
 mkdir -p "cat/strict-use-fail" || exit 1
 cat << 'END' > cat/strict-use-fail/strict-use-fail-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -940,7 +940,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -950,7 +949,7 @@ pkg_setup() {
 END
 mkdir -p "cat/strict-use-injection" || exit 1
 cat << 'END' > cat/strict-use-injection/strict-use-injection-3.ebuild || exit 1
-EAPI="${PV}"
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -958,7 +957,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 
@@ -971,9 +969,10 @@ pkg_setup() {
 END
 mkdir -p "cat/global-scope-use" || exit 1
 cat << 'END' > cat/global-scope-use/global-scope-use-3.ebuild || exit 1
+EAPI="3"
+
 use spork
 
-EAPI="${PV}"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -981,7 +980,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 S="${WORKDIR}"
 END
diff --git a/paludis/repositories/e/e_repository_TEST_3_setup.sh b/paludis/repositories/e/e_repository_TEST_3_setup.sh
index 41327ab..a192015 100755
--- a/paludis/repositories/e/e_repository_TEST_3_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_3_setup.sh
@@ -51,6 +51,7 @@ IUSE_IMPLICIT="build"
 END
 mkdir -p "cat/prefix"
 cat <<'END' > cat/prefix/prefix-3.ebuild || exit 1
+EAPI="3"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -58,7 +59,6 @@ SLOT="0"
 IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="3"
 
 pkg_setup() {
     [[ "/" == ${EROOT} ]] || die eroot
diff --git a/paludis/repositories/e/e_repository_TEST_4_setup.sh b/paludis/repositories/e/e_repository_TEST_4_setup.sh
index fbf5b0f..dac1009 100755
--- a/paludis/repositories/e/e_repository_TEST_4_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_4_setup.sh
@@ -256,7 +256,7 @@ src_compile() {
 END
 mkdir -p "cat/econf-source"
 cat <<END > cat/econf-source/econf-source-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -280,10 +280,12 @@ src_install() {
 }
 END
 cp cat/econf-source/econf-source-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/econf-source/econf-source-1.ebuild || exit 1
 cp cat/econf-source/econf-source-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/econf-source/econf-source-2.ebuild || exit 1
 mkdir -p "cat/doman"
 cat <<END > cat/doman/doman-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -335,8 +337,9 @@ src_install() {
 }
 END
 cp cat/doman/doman-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/doman/doman-1.ebuild || exit 1
 cat <<END > cat/doman/doman-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -388,7 +391,7 @@ src_install() {
 END
 mkdir -p "cat/dosym-success"
 cat <<'END' > cat/dosym-success/dosym-success-1.ebuild || exit 1
-EAPI="${PV}"
+EAPI="1"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -430,7 +433,7 @@ pkg_setup() {
 END
 mkdir -p "cat/has-version"
 cat <<'END' > cat/has-version/has-version-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -451,7 +454,7 @@ pkg_setup() {
 END
 mkdir -p "cat/match"
 cat <<'END' > cat/match/match-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -482,7 +485,7 @@ DONE
 END
 mkdir -p "cat/vars"
 cat <<'END' > cat/vars/vars-0.ebuild || exit 1
-EAPI="${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -505,7 +508,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/src_prepare"
 cat <<END > cat/src_prepare/src_prepare-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -519,10 +522,12 @@ src_prepare() {
 }
 END
 cp cat/src_prepare/src_prepare-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/src_prepare/src_prepare-1.ebuild || exit 1
 cp cat/src_prepare/src_prepare-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/src_prepare/src_prepare-2.ebuild || exit 1
 mkdir -p "cat/src_configure"
 cat <<END > cat/src_configure/src_configure-0.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="0"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -536,10 +541,12 @@ src_configure() {
 }
 END
 cp cat/src_configure/src_configure-{0,1}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="1"/' cat/src_configure/src_configure-1.ebuild || exit 1
 cp cat/src_configure/src_configure-{0,2}.ebuild || exit 1
+sed -i -e 's/EAPI="0"/EAPI="2"/' cat/src_configure/src_configure-2.ebuild || exit 1
 mkdir -p "cat/default-src_configure" || exit 1
 cat << END > cat/default-src_configure/default-src_configure-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -563,7 +570,7 @@ src_compile() {
 END
 mkdir -p "cat/default-src_compile" || exit 1
 cat << END > cat/default-src_compile/default-src_compile-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -591,7 +598,7 @@ src_install() {
 END
 mkdir -p "cat/default_src_compile" || exit 1
 cat << END > cat/default_src_compile/default_src_compile-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -620,7 +627,7 @@ src_compile() {
 END
 mkdir -p "cat/src_compile-via-default-func" || exit 1
 cat << END > cat/src_compile-via-default-func/src_compile-via-default-func-2.ebuild || exit 1
-EAPI="\${PV}"
+EAPI="2"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -666,6 +673,7 @@ pkg_setup() {
 END
 mkdir -p "cat/pkg_pretend"
 cat <<"END" > cat/pkg_pretend/pkg_pretend-4.ebuild || exit 1
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -673,7 +681,6 @@ SLOT="0"
 IUSE="enabled-weasel broccoli"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 pkg_pretend() {
     einfo "This is my pkg_pretend. There are many like it, but this one is mine."
@@ -681,6 +688,7 @@ pkg_pretend() {
 END
 mkdir -p "cat/pkg_pretend-failure"
 cat <<"END" > cat/pkg_pretend-failure/pkg_pretend-failure-4.ebuild || exit 1
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -688,7 +696,6 @@ SLOT="0"
 IUSE="enabled-weasel broccoli"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 pkg_pretend() {
     die "This is my pkg_pretend. There are many like it, but this one is mine."
@@ -696,7 +703,7 @@ pkg_pretend() {
 END
 mkdir -p "cat/default_src_install" || exit 1
 cat << 'END' > cat/default_src_install/default_src_install-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -704,7 +711,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -732,7 +738,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/docompress" || exit 1
 cat << 'END' > cat/docompress/docompress-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -740,7 +746,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -751,7 +756,7 @@ src_install() {
 END
 mkdir -p "cat/dodoc-r" || exit 1
 cat << 'END' > cat/dodoc-r/dodoc-r-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -759,7 +764,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -791,7 +795,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/doins-symlink" || exit 1
 cat << 'END' > cat/doins-symlink/doins-symlink-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -799,7 +803,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -844,6 +847,7 @@ pkg_preinst() {
 END
 mkdir -p "cat/banned-functions"
 cat <<END > cat/banned-functions/banned-functions-4.ebuild || exit 1
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -851,7 +855,6 @@ SLOT="0"
 IUSE="spork"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="\${WORKDIR}"
 
@@ -862,7 +865,7 @@ src_install() {
 END
 mkdir -p "cat/econf-disable-dependency-tracking" || exit 1
 cat << 'END' > cat/econf-disable-dependency-tracking/econf-disable-dependency-tracking-4_beta.ebuild || exit 1
-EAPI="${PV%_*}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -891,7 +894,7 @@ EOF
 }
 END
 cat << 'END' > cat/econf-disable-dependency-tracking/econf-disable-dependency-tracking-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -926,7 +929,7 @@ EOF
 END
 mkdir -p "cat/strict-use" || exit 1
 cat << 'END' > cat/strict-use/strict-use-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -934,7 +937,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -945,7 +947,7 @@ pkg_setup() {
 END
 mkdir -p "cat/strict-use-fail" || exit 1
 cat << 'END' > cat/strict-use-fail/strict-use-fail-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -953,7 +955,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -963,7 +964,7 @@ pkg_setup() {
 END
 mkdir -p "cat/strict-use-injection" || exit 1
 cat << 'END' > cat/strict-use-injection/strict-use-injection-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -971,7 +972,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -984,9 +984,10 @@ pkg_setup() {
 END
 mkdir -p "cat/global-scope-use" || exit 1
 cat << 'END' > cat/global-scope-use/global-scope-use-4.ebuild || exit 1
+EAPI="4"
+
 use spork
 
-EAPI="${PV}"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -994,13 +995,12 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 END
 mkdir -p "cat/merge-type" || exit 1
 cat << 'END' > cat/merge-type/merge-type-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -1008,7 +1008,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -1020,7 +1019,7 @@ pkg_setup() {
 END
 mkdir -p "cat/merge-type-bin" || exit 1
 cat << 'END' > cat/merge-type-bin/merge-type-bin-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -1028,7 +1027,6 @@ SLOT="0"
 IUSE="spork enabled"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 
 S="${WORKDIR}"
 
@@ -1040,133 +1038,124 @@ pkg_setup() {
 END
 mkdir -p "cat/required-use-all-good" || exit 1
 cat << 'END' > cat/required-use-all-good/required-use-all-good-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE="enabled1 enabled2 enabled3"
 REQUIRED_USE="enabled1 enabled2 enabled3"
 S="${WORKDIR}"
 END
 mkdir -p "cat/required-use-all-empty" || exit 1
 cat << 'END' > cat/required-use-all-empty/required-use-all-empty-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE=""
 REQUIRED_USE="( ( ( ) ) )"
 S="${WORKDIR}"
 END
 mkdir -p "cat/required-use-all-one-not-good" || exit 1
 cat << 'END' > cat/required-use-all-one-not-good/required-use-all-one-not-good-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE="enabled1 disabled2 enabled3"
 REQUIRED_USE="enabled1 disabled2 enabled3"
 S="${WORKDIR}"
 END
 mkdir -p "cat/required-use-any-good" || exit 1
 cat << 'END' > cat/required-use-any-good/required-use-any-good-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE="disabled1 enabled2 disabled3"
 REQUIRED_USE="|| ( disabled1 enabled2 disabled3 )"
 S="${WORKDIR}"
 END
 mkdir -p "cat/required-use-any-none" || exit 1
 cat << 'END' > cat/required-use-any-none/required-use-any-none-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE="disabled1 disabled2 disabled3"
 REQUIRED_USE="|| ( disabled1 disabled2 disabled3 )"
 S="${WORKDIR}"
 END
 mkdir -p "cat/required-use-any-empty" || exit 1
 cat << 'END' > cat/required-use-any-empty/required-use-any-empty-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE=""
 REQUIRED_USE="|| ( )"
 S="${WORKDIR}"
 END
 mkdir -p "cat/required-use-one-good" || exit 1
 cat << 'END' > cat/required-use-one-good/required-use-one-good-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE="disabled1 enabled2 disabled3"
 REQUIRED_USE="^^ ( disabled1 enabled2 disabled3 )"
 S="${WORKDIR}"
 END
 mkdir -p "cat/required-use-one-none" || exit 1
 cat << 'END' > cat/required-use-one-none/required-use-one-none-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE="disabled1 disabled2 disabled3"
 REQUIRED_USE="^^ ( disabled1 disabled2 disabled3 )"
 S="${WORKDIR}"
 END
 mkdir -p "cat/required-use-one-many" || exit 1
 cat << 'END' > cat/required-use-one-many/required-use-one-many-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="4"
 IUSE="disabled1 enabled2 enabled3"
 REQUIRED_USE="^^ ( disabled1 enabled2 enabled3 )"
 S="${WORKDIR}"
 END
 mkdir -p "cat/doman"
 cat <<"END" > cat/doman/doman-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -1190,7 +1179,7 @@ src_install() {
 END
 mkdir -p "cat/use-with-enable-empty-third"
 cat <<'END' > cat/use-with-enable-empty-third/use-with-enable-empty-third-4.ebuild || exit 1
-EAPI="${PV}"
+EAPI="4"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
diff --git a/paludis/repositories/e/e_repository_TEST_5_setup.sh b/paludis/repositories/e/e_repository_TEST_5_setup.sh
index 7914428..a3ee963 100755
--- a/paludis/repositories/e/e_repository_TEST_5_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_5_setup.sh
@@ -35,13 +35,13 @@ END
 
 mkdir -p "cat/required-use-at-most-one-none" || exit 1
 cat << 'END' > cat/required-use-at-most-one-none/required-use-at-most-one-none-5.ebuild || exit 1
+EAPI="5"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="5"
 IUSE="disabled1 disabled2 disabled3 enabled1 enabled2 enabled3"
 REQUIRED_USE="?? ( disabled1 disabled2 disabled3 )"
 S="${WORKDIR}"
@@ -49,13 +49,13 @@ END
 
 mkdir -p "cat/required-use-at-most-one-one" || exit 1
 cat << 'END' > cat/required-use-at-most-one-one/required-use-at-most-one-one-5.ebuild || exit 1
+EAPI="5"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="5"
 IUSE="disabled1 disabled2 disabled3 enabled1 enabled2 enabled3"
 REQUIRED_USE="?? ( disabled1 enabled2 disabled3 )"
 S="${WORKDIR}"
@@ -63,13 +63,13 @@ END
 
 mkdir -p "cat/required-use-at-most-one-two" || exit 1
 cat << 'END' > cat/required-use-at-most-one-two/required-use-at-most-one-two-5.ebuild || exit 1
+EAPI="5"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="5"
 IUSE="disabled1 disabled2 disabled3 enabled1 enabled2 enabled3"
 REQUIRED_USE="?? ( disabled1 enabled2 enabled3 )"
 S="${WORKDIR}"
@@ -77,7 +77,7 @@ END
 
 mkdir -p "cat/econf-disable-silent-rules" || exit 1
 cat << 'END' > cat/econf-disable-silent-rules/econf-disable-silent-rules-5.ebuild || exit 1
-EAPI="${PV}"
+EAPI="5"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
diff --git a/paludis/repositories/e/e_repository_TEST_pbin_setup.sh b/paludis/repositories/e/e_repository_TEST_pbin_setup.sh
index a06409a..c338544 100755
--- a/paludis/repositories/e/e_repository_TEST_pbin_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_pbin_setup.sh
@@ -37,6 +37,7 @@ IUSE_IMPLICIT="build"
 END
     mkdir -p "cat/simple"
     cat <<END > cat/simple/simple-1.ebuild || exit 1
+EAPI="${e}"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 SRC_URI=""
@@ -44,7 +45,6 @@ SLOT="0"
 IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="test"
-EAPI="${e}"
 S="\${WORKDIR}"
 
 src_unpack() {
@@ -107,6 +107,7 @@ END
 
     mkdir -p "cat/simple"
     cat <<END > cat/simple/simple-1.ebuild || exit 1
+EAPI="${e}"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 DOWNLOADS=""
@@ -114,7 +115,6 @@ SLOT="0"
 MYOPTIONS=""
 LICENCES="GPL-2"
 PLATFORMS="test"
-EAPI="${e}"
 WORK="\${WORKBASE}"
 
 src_unpack() {
@@ -129,6 +129,7 @@ END
 
     mkdir -p "cat/symlinks"
     cat <<END > cat/symlinks/symlinks-1.ebuild || exit 1
+EAPI="${e}"
 DESCRIPTION="The Description"
 HOMEPAGE="http://example.com/"
 DOWNLOADS=""
@@ -136,7 +137,6 @@ SLOT="0"
 MYOPTIONS=""
 LICENCES="GPL-2"
 PLATFORMS="test"
-EAPI="${e}"
 WORK="\${WORKBASE}"
 
 src_unpack() {
diff --git a/paludis/repositories/e/e_repository_TEST_replacing_setup.sh b/paludis/repositories/e/e_repository_TEST_replacing_setup.sh
index c6d7e58..3b14094 100755
--- a/paludis/repositories/e/e_repository_TEST_replacing_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_replacing_setup.sh
@@ -74,10 +74,10 @@ KERNEL="linux"
 END
 mkdir -p "packages/cat/replace-none"
 cat <<'END' > packages/cat/replace-none/replace-none-1.ebuild || exit 1
+EAPI="4"
 S="${WORKDIR}"
 KEYWORDS="test"
 SLOT="0"
-EAPI="4"
 
 pkg_setup() {
     [[ -z "${REPLACING_VERSIONS}" ]] || die "REPLACING_VERSIONS is ${REPLACING_VERSIONS}"
@@ -85,10 +85,10 @@ pkg_setup() {
 END
 mkdir -p "packages/cat/replace-one"
 cat <<'END' > packages/cat/replace-one/replace-one-1.ebuild || exit 1
+EAPI="4"
 S="${WORKDIR}"
 KEYWORDS="test"
 SLOT="0"
-EAPI="4"
 
 pkg_setup() {
     [[ "${REPLACING_VERSIONS}" == "1" ]] || die "REPLACING_VERSIONS is ${REPLACING_VERSIONS}"
@@ -96,10 +96,10 @@ pkg_setup() {
 END
 mkdir -p "packages/cat/replace-many"
 cat <<'END' > packages/cat/replace-many/replace-many-1.ebuild || exit 1
+EAPI="4"
 S="${WORKDIR}"
 KEYWORDS="test"
 SLOT="0"
-EAPI="4"
 
 pkg_setup() {
     [[ "${REPLACING_VERSIONS}" == "1 2 3" ]] || die "REPLACING_VERSIONS is ${REPLACING_VERSIONS}"
diff --git a/paludis/repositories/e/exndbam_repository_TEST_setup.sh b/paludis/repositories/e/exndbam_repository_TEST_setup.sh
index 8264040..3f0244e 100755
--- a/paludis/repositories/e/exndbam_repository_TEST_setup.sh
+++ b/paludis/repositories/e/exndbam_repository_TEST_setup.sh
@@ -22,11 +22,7 @@ echo postinsttest >postinsttest_src1/profiles/repo_name
 echo cat >postinsttest_src1/profiles/categories
 
 cat <<END >postinsttest_src1/cat/pkg/pkg-0.ebuild
-if [[ \${PV} == 0* ]]; then
-    EAPI=1
-else
-    EAPI=paludis-1
-fi
+EAPI=1
 KEYWORDS="test"
 if [[ \${PV} == 2* ]]; then
     SLOT="2"
@@ -58,6 +54,7 @@ pkg_postrm() {
 END
 cp postinsttest_src1/cat/pkg/pkg-{0,0.1}.ebuild
 cp postinsttest_src1/cat/pkg/pkg-{0,1}.ebuild
-cp postinsttest_src1/cat/pkg/pkg-{0,1.1}.ebuild
-cp postinsttest_src1/cat/pkg/pkg-{0,2}.ebuild
+sed -i -e 's/EAPI=1/EAPI=paludis-1/' postinsttest_src1/cat/pkg/pkg-1.ebuild
+cp postinsttest_src1/cat/pkg/pkg-{1,1.1}.ebuild
+cp postinsttest_src1/cat/pkg/pkg-{1,2}.ebuild
 
diff --git a/paludis/repositories/e/vdb_repository_TEST_setup.sh b/paludis/repositories/e/vdb_repository_TEST_setup.sh
index 022b6b2..ef8a06e 100755
--- a/paludis/repositories/e/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/e/vdb_repository_TEST_setup.sh
@@ -113,11 +113,7 @@ echo postinsttest >postinsttest_src1/profiles/repo_name
 echo cat >postinsttest_src1/profiles/categories
 
 cat <<END >postinsttest_src1/cat/pkg/pkg-0.ebuild
-if [[ \${PV} == 0* ]]; then
-    EAPI=1
-else
-    EAPI=paludis-1
-fi
+EAPI=1
 KEYWORDS="test"
 if [[ \${PV} == 2* ]]; then
     SLOT="2"
@@ -149,8 +145,9 @@ pkg_postrm() {
 END
 cp postinsttest_src1/cat/pkg/pkg-{0,0.1}.ebuild
 cp postinsttest_src1/cat/pkg/pkg-{0,1}.ebuild
-cp postinsttest_src1/cat/pkg/pkg-{0,1.1}.ebuild
-cp postinsttest_src1/cat/pkg/pkg-{0,2}.ebuild
+sed -i -e 's/EAPI=1/EAPI=paludis-1/' postinsttest_src1/cat/pkg/pkg-1.ebuild
+cp postinsttest_src1/cat/pkg/pkg-{1,1.1}.ebuild
+cp postinsttest_src1/cat/pkg/pkg-{1,2}.ebuild
 
 mkdir -p removestalefilesvdb removestalefiles/{eclass,profiles/profile,cat/pkg} || exit 1