app-emulation/wine: restrict gcc-5 only for 64-bit wine

Also, improve error message a bit.

Gentoo-Bug: 549768
Thanks-to: xpue
Package-Manager: portage-2.2.20.1

diff --git a/app-emulation/wine/wine-1.6.2-r1.ebuild b/app-emulation/wine/wine-1.6.2-r1.ebuild
index 253493563bdf3a70b26d0d8dd62d961bf240c44d..9ba13a7e52f57d6c0647bc2278f3aee85047065b 100644 (file)
--- a/app-emulation/wine/wine-1.6.2-r1.ebuild
+++ b/app-emulation/wine/wine-1.6.2-r1.ebuild
@@ -145,8 +145,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.6.2.ebuild b/app-emulation/wine/wine-1.6.2.ebuild
index 3e554f5bb9ab25b39091c84b63c4c3522a18ca8c..0deb2a37f8887f555c46802525bc825c407bc418 100644 (file)
--- a/app-emulation/wine/wine-1.6.2.ebuild
+++ b/app-emulation/wine/wine-1.6.2.ebuild
@@ -173,6 +173,15 @@ usr/share/applications/wine-winecfg.desktop"
 wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
+       # bug #549768
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
+               eerror
+               return 1
+       fi
+
        if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
                eerror "You need gcc-4.4+ to build 64-bit wine"
                eerror

diff --git a/app-emulation/wine/wine-1.7.10-r1.ebuild b/app-emulation/wine/wine-1.7.10-r1.ebuild
index 8ba3c7867cb7dca8121eb331ce1f7c2dde01453f..2b90cd4e023d86452b7d329ff68b22c75ecd346a 100644 (file)
--- a/app-emulation/wine/wine-1.7.10-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.10-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.11-r1.ebuild b/app-emulation/wine/wine-1.7.11-r1.ebuild
index 8ba3c7867cb7dca8121eb331ce1f7c2dde01453f..2b90cd4e023d86452b7d329ff68b22c75ecd346a 100644 (file)
--- a/app-emulation/wine/wine-1.7.11-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.11-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.12-r1.ebuild b/app-emulation/wine/wine-1.7.12-r1.ebuild
index 8f1448732846c96433773440707bc7b756000a6a..23dbb345f6b16acd1a060ea32099da705e20a3f2 100644 (file)
--- a/app-emulation/wine/wine-1.7.12-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.12-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.13-r1.ebuild b/app-emulation/wine/wine-1.7.13-r1.ebuild
index 8f1448732846c96433773440707bc7b756000a6a..23dbb345f6b16acd1a060ea32099da705e20a3f2 100644 (file)
--- a/app-emulation/wine/wine-1.7.13-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.13-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.14-r1.ebuild b/app-emulation/wine/wine-1.7.14-r1.ebuild
index 8f1448732846c96433773440707bc7b756000a6a..23dbb345f6b16acd1a060ea32099da705e20a3f2 100644 (file)
--- a/app-emulation/wine/wine-1.7.14-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.14-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.15-r1.ebuild b/app-emulation/wine/wine-1.7.15-r1.ebuild
index 8f1448732846c96433773440707bc7b756000a6a..23dbb345f6b16acd1a060ea32099da705e20a3f2 100644 (file)
--- a/app-emulation/wine/wine-1.7.15-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.15-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.16-r1.ebuild b/app-emulation/wine/wine-1.7.16-r1.ebuild
index 8f1448732846c96433773440707bc7b756000a6a..23dbb345f6b16acd1a060ea32099da705e20a3f2 100644 (file)
--- a/app-emulation/wine/wine-1.7.16-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.16-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.17-r1.ebuild b/app-emulation/wine/wine-1.7.17-r1.ebuild
index 8f1448732846c96433773440707bc7b756000a6a..23dbb345f6b16acd1a060ea32099da705e20a3f2 100644 (file)
--- a/app-emulation/wine/wine-1.7.17-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.17-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.18-r1.ebuild b/app-emulation/wine/wine-1.7.18-r1.ebuild
index 8f1448732846c96433773440707bc7b756000a6a..23dbb345f6b16acd1a060ea32099da705e20a3f2 100644 (file)
--- a/app-emulation/wine/wine-1.7.18-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.18-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.19-r2.ebuild b/app-emulation/wine/wine-1.7.19-r2.ebuild
index 3cd7518be4c30ceb65a49b9c9711b07b78121307..c4fa942c8ca2de149ea5a70ef84e8efd2ea09a38 100644 (file)
--- a/app-emulation/wine/wine-1.7.19-r2.ebuild
+++ b/app-emulation/wine/wine-1.7.19-r2.ebuild
@@ -159,8 +159,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.20-r1.ebuild b/app-emulation/wine/wine-1.7.20-r1.ebuild
index 3a7937dbdf4458d3c40d584ca3c672ec1a972974..faab672297ef4214ede2ff8de9d4130222a389ef 100644 (file)
--- a/app-emulation/wine/wine-1.7.20-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.20-r1.ebuild
@@ -161,8 +161,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.21-r1.ebuild b/app-emulation/wine/wine-1.7.21-r1.ebuild
index cf6c955b3a65ad6ce06b1676fbca84f3449d75ba..6c288dae4af692a8d709be00914b2cf0a06591da 100644 (file)
--- a/app-emulation/wine/wine-1.7.21-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.21-r1.ebuild
@@ -161,8 +161,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.22-r1.ebuild b/app-emulation/wine/wine-1.7.22-r1.ebuild
index cf6c955b3a65ad6ce06b1676fbca84f3449d75ba..6c288dae4af692a8d709be00914b2cf0a06591da 100644 (file)
--- a/app-emulation/wine/wine-1.7.22-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.22-r1.ebuild
@@ -161,8 +161,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.28-r1.ebuild b/app-emulation/wine/wine-1.7.28-r1.ebuild
index af9de82405d94d4a6d8f130a9abcd08fe7279569..9ba7ab147f934136d4721aee91ccf8149f1af8d5 100644 (file)
--- a/app-emulation/wine/wine-1.7.28-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.28-r1.ebuild
@@ -161,8 +161,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.29-r1.ebuild b/app-emulation/wine/wine-1.7.29-r1.ebuild
index af9de82405d94d4a6d8f130a9abcd08fe7279569..9ba7ab147f934136d4721aee91ccf8149f1af8d5 100644 (file)
--- a/app-emulation/wine/wine-1.7.29-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.29-r1.ebuild
@@ -161,8 +161,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.3-r1.ebuild b/app-emulation/wine/wine-1.7.3-r1.ebuild
index d76d1c6dadecb62b91057c70a69a49e777527f36..355136d4762751107d32d401072dd4797a7dba41 100644 (file)
--- a/app-emulation/wine/wine-1.7.3-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.3-r1.ebuild
@@ -145,8 +145,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.33-r1.ebuild b/app-emulation/wine/wine-1.7.33-r1.ebuild
index 2b995ea5c27dee0aea4f3060b84e35587330aa04..3d4fb39948a90fef04de939480f155a17841845b 100644 (file)
--- a/app-emulation/wine/wine-1.7.33-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.33-r1.ebuild
@@ -163,8 +163,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.34.ebuild b/app-emulation/wine/wine-1.7.34.ebuild
index d2d3d5c307664e1ddd9995cc2aa5c66204918b5a..274c72f5ab6e56f083b353aaf1c801a1646af203 100644 (file)
--- a/app-emulation/wine/wine-1.7.34.ebuild
+++ b/app-emulation/wine/wine-1.7.34.ebuild
@@ -163,8 +163,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.35.ebuild b/app-emulation/wine/wine-1.7.35.ebuild
index b403d11adebdcac61212505c9bdbee73beac040a..1f3d4d551d4a839390b527be94afb46e5bbfda16 100644 (file)
--- a/app-emulation/wine/wine-1.7.35.ebuild
+++ b/app-emulation/wine/wine-1.7.35.ebuild
@@ -163,8 +163,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.36.ebuild b/app-emulation/wine/wine-1.7.36.ebuild
index aba14f5fb397f9e6a8f691c78aa26115b7ff3360..ca3cc7f886e06142172887932a95e7c511437ca7 100644 (file)
--- a/app-emulation/wine/wine-1.7.36.ebuild
+++ b/app-emulation/wine/wine-1.7.36.ebuild
@@ -162,8 +162,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.37.ebuild b/app-emulation/wine/wine-1.7.37.ebuild
index 51022bbddb6ce72c7ecfae3750bab62149a7976f..ccc7bba7913d0a06e10ab3ad2d7134e1aada9eac 100644 (file)
--- a/app-emulation/wine/wine-1.7.37.ebuild
+++ b/app-emulation/wine/wine-1.7.37.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.38-r1.ebuild b/app-emulation/wine/wine-1.7.38-r1.ebuild
index 6f742e8c43a57a2a512c6fdf531f398465445cc9..2f45dc3f5c186093b705d0467385a0ce7f09b82f 100644 (file)
--- a/app-emulation/wine/wine-1.7.38-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.38-r1.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.39-r1.ebuild b/app-emulation/wine/wine-1.7.39-r1.ebuild
index 43f7f494f0cb371b8e76f339583f56625e18a96d..b8e596c2224bebe02578419ff50c2a840b29eb07 100644 (file)
--- a/app-emulation/wine/wine-1.7.39-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.39-r1.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.4-r1.ebuild b/app-emulation/wine/wine-1.7.4-r1.ebuild
index 2ebc7b83b09ffa4a53e0a24884ebdea3e6f28408..5566fa88b953aafee7d5a357f52b20850c803896 100644 (file)
--- a/app-emulation/wine/wine-1.7.4-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.4-r1.ebuild
@@ -145,8 +145,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.40-r1.ebuild b/app-emulation/wine/wine-1.7.40-r1.ebuild
index 43f7f494f0cb371b8e76f339583f56625e18a96d..b8e596c2224bebe02578419ff50c2a840b29eb07 100644 (file)
--- a/app-emulation/wine/wine-1.7.40-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.40-r1.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.41.ebuild b/app-emulation/wine/wine-1.7.41.ebuild
index 43f7f494f0cb371b8e76f339583f56625e18a96d..b8e596c2224bebe02578419ff50c2a840b29eb07 100644 (file)
--- a/app-emulation/wine/wine-1.7.41.ebuild
+++ b/app-emulation/wine/wine-1.7.41.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.42.ebuild b/app-emulation/wine/wine-1.7.42.ebuild
index 43f7f494f0cb371b8e76f339583f56625e18a96d..b8e596c2224bebe02578419ff50c2a840b29eb07 100644 (file)
--- a/app-emulation/wine/wine-1.7.42.ebuild
+++ b/app-emulation/wine/wine-1.7.42.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.43.ebuild b/app-emulation/wine/wine-1.7.43.ebuild
index 43f7f494f0cb371b8e76f339583f56625e18a96d..b8e596c2224bebe02578419ff50c2a840b29eb07 100644 (file)
--- a/app-emulation/wine/wine-1.7.43.ebuild
+++ b/app-emulation/wine/wine-1.7.43.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.44.ebuild b/app-emulation/wine/wine-1.7.44.ebuild
index 43f7f494f0cb371b8e76f339583f56625e18a96d..b8e596c2224bebe02578419ff50c2a840b29eb07 100644 (file)
--- a/app-emulation/wine/wine-1.7.44.ebuild
+++ b/app-emulation/wine/wine-1.7.44.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.45.ebuild b/app-emulation/wine/wine-1.7.45.ebuild
index b297c85fdfa5be199e00d9c8560d77dbffcba9f9..cce623fe5f4093403223216c7b4be19094690133 100644 (file)
--- a/app-emulation/wine/wine-1.7.45.ebuild
+++ b/app-emulation/wine/wine-1.7.45.ebuild
@@ -164,6 +164,15 @@ usr/share/applications/wine-winecfg.desktop"
 wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
+       # bug #549768
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
+               eerror
+               return 1
+       fi
+
        if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
                eerror "You need gcc-4.4+ to build 64-bit wine"
                eerror

diff --git a/app-emulation/wine/wine-1.7.46.ebuild b/app-emulation/wine/wine-1.7.46.ebuild
index 43f7f494f0cb371b8e76f339583f56625e18a96d..b8e596c2224bebe02578419ff50c2a840b29eb07 100644 (file)
--- a/app-emulation/wine/wine-1.7.46.ebuild
+++ b/app-emulation/wine/wine-1.7.46.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.47.ebuild b/app-emulation/wine/wine-1.7.47.ebuild
index f2093ebde152db542e4676e7566f099ea45ec5c7..6f861f88458f02c851ad41f69239d538119c08e5 100644 (file)
--- a/app-emulation/wine/wine-1.7.47.ebuild
+++ b/app-emulation/wine/wine-1.7.47.ebuild
@@ -165,8 +165,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.50.ebuild b/app-emulation/wine/wine-1.7.50.ebuild
index c3441505c921d80dfb0a0775cc289715bee2f415..12cfb0489c2b627fe2503f8f28cfd031fcad26f2 100644 (file)
--- a/app-emulation/wine/wine-1.7.50.ebuild
+++ b/app-emulation/wine/wine-1.7.50.ebuild
@@ -166,8 +166,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.8-r1.ebuild b/app-emulation/wine/wine-1.7.8-r1.ebuild
index 905985cdd67d7b30b96072cdee96bef151c12a8d..49d18503a1718310d15e43c07f00c5dc1162ecc3 100644 (file)
--- a/app-emulation/wine/wine-1.7.8-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.8-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-1.7.9-r1.ebuild b/app-emulation/wine/wine-1.7.9-r1.ebuild
index 905985cdd67d7b30b96072cdee96bef151c12a8d..49d18503a1718310d15e43c07f00c5dc1162ecc3 100644 (file)
--- a/app-emulation/wine/wine-1.7.9-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.9-r1.ebuild
@@ -146,8 +146,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index c3441505c921d80dfb0a0775cc289715bee2f415..12cfb0489c2b627fe2503f8f28cfd031fcad26f2 100644 (file)
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -166,8 +166,10 @@ wine_build_environment_check() {
        [[ ${MERGE_TYPE} = "binary" ]] && return 0
 
        # bug #549768
-       if [[ $(gcc-major-version) = 5 ]]; then
-               eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+               eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+               eerror "you may use gcc-config to select an older compiler version."
+               eerror "See https://bugs.gentoo.org/549768"
                eerror
                return 1
        fi