From 196192de5664df4cdd4b3d5221b4b34a00e392e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Wed, 15 Aug 2012 22:50:29 +0200 Subject: [PATCH] Remove tests for deprecated 3_pre2 EAPI. --- bin/ebuild-helpers/doins | 4 ++-- bin/ebuild-helpers/newins | 4 ++-- bin/ebuild.sh | 4 ++-- bin/isolated-functions.sh | 4 ++-- bin/phase-functions.sh | 12 ++++++------ bin/phase-helpers.sh | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins index 443bfdb21..fd7793404 100755 --- a/bin/ebuild-helpers/doins +++ b/bin/ebuild-helpers/doins @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh @@ -40,7 +40,7 @@ if [[ ${INSDESTTREE#${ED}} != "${INSDESTTREE}" ]]; then fi case "$EAPI" in - 0|1|2|3|3_pre2) + 0|1|2|3) PRESERVE_SYMLINKS=n ;; *) diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins index adf2d809e..b5b3ff6f4 100755 --- a/bin/ebuild-helpers/newins +++ b/bin/ebuild-helpers/newins @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh @@ -19,7 +19,7 @@ fi rm -rf "${T}/${2}" || exit $? case "$EAPI" in - 0|1|2|3|3_pre2) + 0|1|2|3) cp "$1" "$T/$2" || exit $? ;; *) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 9829f68b3..d3ca9d999 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -556,7 +556,7 @@ if ! has "$EBUILD_PHASE" clean cleanrm ; then # export EAPI for helpers (especially since we unset it above) export EAPI - if has "$EAPI" 0 1 2 3 3_pre2 ; then + if has "$EAPI" 0 1 2 3 ; then export RDEPEND=${RDEPEND-${DEPEND}} debug-print "RDEPEND: not set... Setting to: ${DEPEND}" fi @@ -578,7 +578,7 @@ if ! has "$EBUILD_PHASE" clean cleanrm ; then pkg_nofetch pkg_postinst pkg_postrm pkg_preinst pkg_prerm pkg_setup src_test src_unpack" ;; - 2|3|3_pre2) + 2|3) _valid_phases="src_compile pkg_config src_configure pkg_info src_install pkg_nofetch pkg_postinst pkg_postrm pkg_preinst src_prepare pkg_prerm pkg_setup src_test src_unpack" diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index dbf988b28..d33c0b61e 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # We need this next line for "die" and "assert". It expands @@ -86,7 +86,7 @@ dump_trace() { } nonfatal() { - if has "${EAPI:-0}" 0 1 2 3 3_pre2 ; then + if has "${EAPI:-0}" 0 1 2 3 ; then die "$FUNCNAME() not supported in this EAPI" fi if [[ $# -lt 1 ]]; then diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index ce251ceb9..352019967 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -364,7 +364,7 @@ dyn_prepare() { if [[ -d $S ]] ; then cd "${S}" - elif has $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to prepare; then cd "${WORKDIR}" @@ -395,7 +395,7 @@ dyn_configure() { if [[ -d $S ]] ; then cd "${S}" - elif has $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to configure; then cd "${WORKDIR}" @@ -428,7 +428,7 @@ dyn_compile() { if [[ -d $S ]] ; then cd "${S}" - elif has $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to compile; then cd "${WORKDIR}" @@ -519,7 +519,7 @@ dyn_install() { if [[ -d $S ]] ; then cd "${S}" - elif has $EAPI 0 1 2 3 3_pre2 ; then + elif has $EAPI 0 1 2 3 ; then cd "${WORKDIR}" elif [[ -z ${A} ]] && ! has_phase_defined_up_to install; then cd "${WORKDIR}" @@ -684,7 +684,7 @@ _ebuild_arg_to_phase() { case "$arg" in pretend) - ! has $eapi 0 1 2 3 3_pre2 && \ + ! has $eapi 0 1 2 3 && \ phase_func=pkg_pretend ;; setup) @@ -780,7 +780,7 @@ _ebuild_phase_funcs() { declare -F src_compile >/dev/null || \ src_compile() { _eapi2_src_compile "$@" ; } - has $eapi 2 3 3_pre2 || declare -F src_install >/dev/null || \ + has $eapi 2 3 || declare -F src_install >/dev/null || \ src_install() { _eapi4_src_install "$@" ; } if has $phase_func $default_phases ; then diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 946520b20..a00475cfb 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 export DESTTREE=/usr @@ -421,7 +421,7 @@ econf() { fi # EAPI=4 adds --disable-dependency-tracking to econf - if ! has "$EAPI" 0 1 2 3 3_pre2 && \ + if ! has "$EAPI" 0 1 2 3 && \ "${ECONF_SOURCE}/configure" --help 2>/dev/null | \ grep -q disable-dependency-tracking ; then set -- --disable-dependency-tracking "$@" -- 2.26.2