diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2015-12-22 20:28:26 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2015-12-22 20:28:26 +0300 |
| commit | 79c5a71569059b40c622948fb41ee48a9daf1069 (patch) | |
| tree | f5fcf36b68de7138d56e894f906c3319bdca0411 | |
| parent | 4bd6ede4e184629cc2a76b8f5d6ea50fe0d76bda (diff) | |
wine: disabled gcc5 block
retroshare: deps fix
| -rw-r--r-- | app-emulation/wine/wine-scm.ebuild | 10 | ||||
| -rw-r--r-- | net-p2p/retroshare/retroshare-scm.ebuild | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app-emulation/wine/wine-scm.ebuild b/app-emulation/wine/wine-scm.ebuild index cdb1bd5..a239b2f 100644 --- a/app-emulation/wine/wine-scm.ebuild +++ b/app-emulation/wine/wine-scm.ebuild @@ -157,11 +157,11 @@ 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" - eerror - return 1 - fi +# if [[ $(gcc-major-version) = 5 ]]; then +# eerror "You need gcc-4.x to build wine; 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" diff --git a/net-p2p/retroshare/retroshare-scm.ebuild b/net-p2p/retroshare/retroshare-scm.ebuild index 5e4061b..c0d747a 100644 --- a/net-p2p/retroshare/retroshare-scm.ebuild +++ b/net-p2p/retroshare/retroshare-scm.ebuild @@ -21,8 +21,8 @@ KEYWORDS="" IUSE="cli feedreader qt4 +qt5 voip sqlite" REQUIRED_USE="|| ( cli qt5 qt4 ) - feedreader? ( qt5 ) - voip? ( qt5 ) + feedreader? ( || ( qt5 qt4 ) ) + voip? ( || ( qt5 qt4 ) ) qt4? ( !qt5 ) qt5? ( !qt4 ) " |