dev-python/pypy*: Fix pkg_{pretend,setup} not to run for binpkgs

Package-Manager: portage-2.2.20

diff --git a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
index 69201aab63c62b8fe3b5c0c0b56d086c63963ac9..3f298b8ba69f69a1fc3e6b9839f91a986feae9bb 100644 (file)
--- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
@@ -76,7 +76,9 @@ PDEPEND="app-admin/python-updater"
 S=${WORKDIR}/pypy-${PV}-src
 
 pkg_setup() {
-       use doc && python-any-r1_pkg_setup
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               use doc && python-any-r1_pkg_setup
+       fi
 }
 
 src_prepare() {

diff --git a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild
index 8937e447c283f850a8170fe79aa38ca1721ca0f9..2610c6965745b08732f43ed3ad33990cbcfdfe0f 100644 (file)
--- a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild
@@ -76,7 +76,9 @@ PDEPEND="app-admin/python-updater"
 S=${WORKDIR}/pypy-${PV}-src
 
 pkg_setup() {
-       use doc && python-any-r1_pkg_setup
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               use doc && python-any-r1_pkg_setup
+       fi
 }
 
 src_prepare() {

diff --git a/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild
index e32a5a3e37b45af378c87c6b94066e2b0ba48ab8..bc165d35aba2b0241a54c203e82f5774ce5b5543 100644 (file)
--- a/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild
@@ -78,7 +78,9 @@ PDEPEND="app-admin/python-updater"
 S=${WORKDIR}/pypy-${PV}-src
 
 pkg_setup() {
-       use doc && python-any-r1_pkg_setup
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               use doc && python-any-r1_pkg_setup
+       fi
 }
 
 src_prepare() {

diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild
index 71abed3b6c9d3b4a1584b06aeec621c3ef2de5ad..e57a65c2bde600c582ee6844f43b0ae32c5b90a9 100644 (file)
--- a/dev-python/pypy/pypy-2.4.0.ebuild
+++ b/dev-python/pypy/pypy-2.4.0.ebuild
@@ -39,42 +39,46 @@ PDEPEND="app-admin/python-updater"
 S="${WORKDIR}/${P}-src"
 
 pkg_pretend() {
-       if use low-memory; then
-               if ! python_is_installed pypy; then
-                       eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-                       eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-                       eerror
-                       eerror "  $ emerge -1v dev-python/pypy-bin"
-                       eerror
-                       eerror "before attempting to build dev-python/pypy[low-memory]."
-                       die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               if use low-memory; then
+                       if ! python_is_installed pypy; then
+                               eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+                               eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+                               eerror
+                               eerror "  $ emerge -1v dev-python/pypy-bin"
+                               eerror
+                               eerror "before attempting to build dev-python/pypy[low-memory]."
+                               die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+                       fi
+
+                       CHECKREQS_MEMORY="1750M"
+                       use amd64 && CHECKREQS_MEMORY="3500M"
+               else
+                       CHECKREQS_MEMORY="3G"
+                       use amd64 && CHECKREQS_MEMORY="6G"
                fi
 
-               CHECKREQS_MEMORY="1750M"
-               use amd64 && CHECKREQS_MEMORY="3500M"
-       else
-               CHECKREQS_MEMORY="3G"
-               use amd64 && CHECKREQS_MEMORY="6G"
+               check-reqs_pkg_pretend
        fi
-
-       check-reqs_pkg_pretend
 }
 
 pkg_setup() {
-       pkg_pretend
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               pkg_pretend
 
-       if python_is_installed pypy; then
-               if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-                       einfo "Using already-installed PyPy to perform the translation."
-                       local EPYTHON=pypy
-               else
-                       einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-                       einfo "recommends using PyPy for that. If you wish to do so, please unset"
-                       einfo "the EPYTHON variable."
+               if python_is_installed pypy; then
+                       if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+                               einfo "Using already-installed PyPy to perform the translation."
+                               local EPYTHON=pypy
+                       else
+                               einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+                               einfo "recommends using PyPy for that. If you wish to do so, please unset"
+                               einfo "the EPYTHON variable."
+                       fi
                fi
-       fi
 
-       python-any-r1_pkg_setup
+               python-any-r1_pkg_setup
+       fi
 }
 
 src_prepare() {

diff --git a/dev-python/pypy/pypy-2.5.1.ebuild b/dev-python/pypy/pypy-2.5.1.ebuild
index ac264098b20d73339a3ea9dc2d09310af91fa1dc..0e367df58e67adc1022988bc8ab6a9ac465b13e5 100644 (file)
--- a/dev-python/pypy/pypy-2.5.1.ebuild
+++ b/dev-python/pypy/pypy-2.5.1.ebuild
@@ -39,42 +39,46 @@ PDEPEND="app-admin/python-updater"
 S="${WORKDIR}/${P}-src"
 
 pkg_pretend() {
-       if use low-memory; then
-               if ! python_is_installed pypy; then
-                       eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-                       eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-                       eerror
-                       eerror "  $ emerge -1v dev-python/pypy-bin"
-                       eerror
-                       eerror "before attempting to build dev-python/pypy[low-memory]."
-                       die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               if use low-memory; then
+                       if ! python_is_installed pypy; then
+                               eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+                               eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+                               eerror
+                               eerror "  $ emerge -1v dev-python/pypy-bin"
+                               eerror
+                               eerror "before attempting to build dev-python/pypy[low-memory]."
+                               die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+                       fi
+
+                       CHECKREQS_MEMORY="1750M"
+                       use amd64 && CHECKREQS_MEMORY="3500M"
+               else
+                       CHECKREQS_MEMORY="3G"
+                       use amd64 && CHECKREQS_MEMORY="6G"
                fi
 
-               CHECKREQS_MEMORY="1750M"
-               use amd64 && CHECKREQS_MEMORY="3500M"
-       else
-               CHECKREQS_MEMORY="3G"
-               use amd64 && CHECKREQS_MEMORY="6G"
+               check-reqs_pkg_pretend
        fi
-
-       check-reqs_pkg_pretend
 }
 
 pkg_setup() {
-       pkg_pretend
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               pkg_pretend
 
-       if python_is_installed pypy; then
-               if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-                       einfo "Using already-installed PyPy to perform the translation."
-                       local EPYTHON=pypy
-               else
-                       einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-                       einfo "recommends using PyPy for that. If you wish to do so, please unset"
-                       einfo "the EPYTHON variable."
+               if python_is_installed pypy; then
+                       if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+                               einfo "Using already-installed PyPy to perform the translation."
+                               local EPYTHON=pypy
+                       else
+                               einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+                               einfo "recommends using PyPy for that. If you wish to do so, please unset"
+                               einfo "the EPYTHON variable."
+                       fi
                fi
-       fi
 
-       python-any-r1_pkg_setup
+               python-any-r1_pkg_setup
+       fi
 }
 
 src_prepare() {

diff --git a/dev-python/pypy/pypy-2.6.0.ebuild b/dev-python/pypy/pypy-2.6.0.ebuild
index 18a8810327d8b801360dc4803485ea4ae2ec2869..1fa41e113cefb637936424af417e3c7640b40be3 100644 (file)
--- a/dev-python/pypy/pypy-2.6.0.ebuild
+++ b/dev-python/pypy/pypy-2.6.0.ebuild
@@ -42,42 +42,46 @@ PDEPEND="app-admin/python-updater"
 S="${WORKDIR}/${P}-src"
 
 pkg_pretend() {
-       if use low-memory; then
-               if ! python_is_installed pypy; then
-                       eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-                       eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-                       eerror
-                       eerror "  $ emerge -1v dev-python/pypy-bin"
-                       eerror
-                       eerror "before attempting to build dev-python/pypy[low-memory]."
-                       die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               if use low-memory; then
+                       if ! python_is_installed pypy; then
+                               eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+                               eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+                               eerror
+                               eerror "  $ emerge -1v dev-python/pypy-bin"
+                               eerror
+                               eerror "before attempting to build dev-python/pypy[low-memory]."
+                               die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+                       fi
+
+                       CHECKREQS_MEMORY="1750M"
+                       use amd64 && CHECKREQS_MEMORY="3500M"
+               else
+                       CHECKREQS_MEMORY="3G"
+                       use amd64 && CHECKREQS_MEMORY="6G"
                fi
 
-               CHECKREQS_MEMORY="1750M"
-               use amd64 && CHECKREQS_MEMORY="3500M"
-       else
-               CHECKREQS_MEMORY="3G"
-               use amd64 && CHECKREQS_MEMORY="6G"
+               check-reqs_pkg_pretend
        fi
-
-       check-reqs_pkg_pretend
 }
 
 pkg_setup() {
-       pkg_pretend
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               pkg_pretend
 
-       if python_is_installed pypy; then
-               if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-                       einfo "Using already-installed PyPy to perform the translation."
-                       local EPYTHON=pypy
-               else
-                       einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-                       einfo "recommends using PyPy for that. If you wish to do so, please unset"
-                       einfo "the EPYTHON variable."
+               if python_is_installed pypy; then
+                       if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+                               einfo "Using already-installed PyPy to perform the translation."
+                               local EPYTHON=pypy
+                       else
+                               einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+                               einfo "recommends using PyPy for that. If you wish to do so, please unset"
+                               einfo "the EPYTHON variable."
+                       fi
                fi
-       fi
 
-       python-any-r1_pkg_setup
+               python-any-r1_pkg_setup
+       fi
 }
 
 src_prepare() {

diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild b/dev-python/pypy3/pypy3-2.4.0.ebuild
index 9903c1bc00266030dd19c0ebc3761c47b165fd2a..85b260bf315e06fff89524587a7d88fb4a1bad9b 100644 (file)
--- a/dev-python/pypy3/pypy3-2.4.0.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0.ebuild
@@ -41,32 +41,36 @@ PDEPEND="app-admin/python-updater"
 S="${WORKDIR}/${P}-src"
 
 pkg_pretend() {
-       if use low-memory; then
-               CHECKREQS_MEMORY="1750M"
-               use amd64 && CHECKREQS_MEMORY="3500M"
-       else
-               CHECKREQS_MEMORY="3G"
-               use amd64 && CHECKREQS_MEMORY="6G"
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               if use low-memory; then
+                       CHECKREQS_MEMORY="1750M"
+                       use amd64 && CHECKREQS_MEMORY="3500M"
+               else
+                       CHECKREQS_MEMORY="3G"
+                       use amd64 && CHECKREQS_MEMORY="6G"
+               fi
        fi
 
        check-reqs_pkg_pretend
 }
 
 pkg_setup() {
-       pkg_pretend
-
-       # unset to allow forcing pypy below :)
-       use low-memory && local EPYTHON=
-       if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-               einfo "Using PyPy to perform the translation."
-               local EPYTHON=pypy
-       else
-               einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-               einfo "recommends using PyPy for that. If you wish to do so, please install"
-               einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-       fi
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               pkg_pretend
+
+               # unset to allow forcing pypy below :)
+               use low-memory && local EPYTHON=
+               if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+                       einfo "Using PyPy to perform the translation."
+                       local EPYTHON=pypy
+               else
+                       einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+                       einfo "recommends using PyPy for that. If you wish to do so, please install"
+                       einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+               fi
 
-       python-any-r1_pkg_setup
+               python-any-r1_pkg_setup
+       fi
 }
 
 src_prepare() {