sys-devel/llvm: Avoid cross-phase function calls, #596644

diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
index 1eaee329a877c90c7f705767d267af95e19a74ab..97394372a2ddfe15be8a8a4df395e2ac8f70d56f 100644 (file)
--- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild
+++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
@@ -48,7 +48,7 @@ PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
 
 S=${WORKDIR}/${P}.src
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -74,8 +74,12 @@ pkg_pretend() {
        check-reqs_pkg_pretend
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-3.5.0.ebuild b/sys-devel/llvm/llvm-3.5.0.ebuild
index 975163516ee196bcbaf4f03f2639f5f855aed57c..d4bb3a2df014be890a1554247e96799c459708ac 100644 (file)
--- a/sys-devel/llvm/llvm-3.5.0.ebuild
+++ b/sys-devel/llvm/llvm-3.5.0.ebuild
@@ -85,7 +85,7 @@ S=${WORKDIR}/${P}.src
 # so why did it call itself ninja in the first place?
 CMAKE_MAKEFILE_GENERATOR=emake
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -133,8 +133,12 @@ pkg_pretend() {
        fi
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index 635a9209e3ee7f00d616032a0807475e07b5fa18..303f969e92527d2596c05e52752f07c65712eabc 100644 (file)
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -87,7 +87,7 @@ S=${WORKDIR}/${P}.src
 # so why did it call itself ninja in the first place?
 CMAKE_MAKEFILE_GENERATOR=emake
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -135,8 +135,12 @@ pkg_pretend() {
        fi
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild
index f0bdc1d8e92d2d6e73b84874e5a893ba12be24f8..5c2cbb215b7c616a8d31d6ee80506f30640c63cd 100644 (file)
--- a/sys-devel/llvm/llvm-3.6.2.ebuild
+++ b/sys-devel/llvm/llvm-3.6.2.ebuild
@@ -91,7 +91,7 @@ S=${WORKDIR}/${P/_}.src
 # so why did it call itself ninja in the first place?
 CMAKE_MAKEFILE_GENERATOR=emake
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -139,8 +139,12 @@ pkg_pretend() {
        fi
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index 3cc7292a470579e964babfb3ce1f0c994c55bd20..b341cc241e4ecacd402578a574a4b3b3d4400691 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -89,7 +89,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 S=${WORKDIR}/${P/_}.src
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -125,8 +125,12 @@ pkg_pretend() {
        check-reqs_pkg_pretend
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
index c1a32cf2ab595811086d4a727461071545435bd8..eb10e619039734cae803d96d1ef6722309291e62 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
@@ -90,7 +90,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 S=${WORKDIR}/${P/_}.src
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -126,8 +126,12 @@ pkg_pretend() {
        check-reqs_pkg_pretend
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index fed4c4eafbd371006b094e10660e910536b232f8..439485f9cb7107a3a43a40223128de6ac0d1956d 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -89,7 +89,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 S=${WORKDIR}/${P/_}.src
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -125,8 +125,12 @@ pkg_pretend() {
        check-reqs_pkg_pretend
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 6c748a12329c0150b497fd18e04856ec62ea55e2..de7426a24fcca5b5658ed852f0c778dbbf8a997c 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -90,7 +90,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 S=${WORKDIR}/${P/_}.src
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -126,8 +126,12 @@ pkg_pretend() {
        check-reqs_pkg_pretend
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-3.9.0-r1.ebuild b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
index 212bac8b1e6a9d2cadd62b29b10dc102990ba76a..7faa108802b4c20d37d1872378076c4bb6c1de01 100644 (file)
--- a/sys-devel/llvm/llvm-3.9.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
@@ -102,7 +102,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 S=${WORKDIR}/${P/_}.src
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -138,8 +138,12 @@ pkg_pretend() {
        check-reqs_pkg_pretend
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_unpack() {

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 711950f5d97bf2c4d794667edec1dbd4fc26a280..1a43cd483419c3a565086a11c355c9ddd8849f28 100644 (file)
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -73,7 +73,7 @@ python_check_deps() {
                || has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
-pkg_pretend() {
+check_space() {
        # in megs
        # !debug !multitarget -O2       400
        # !debug  multitarget -O2       550
@@ -103,8 +103,12 @@ pkg_pretend() {
        check-reqs_pkg_pretend
 }
 
+pkg_pretend() {
+       check_space
+}
+
 pkg_setup() {
-       pkg_pretend
+       check_space
 }
 
 src_prepare() {