diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2015-07-04 09:12:42 +0200 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2015-07-04 09:12:42 +0200 |
| commit | 1bd67f5e85b4c280aa76071a51dc602b5ff2b5ce (patch) | |
| tree | 02cb17b32533dccc76ec9734493f8cc3fe552ac6 /app-emulation | |
| parent | Follow nvidia-drivers: Version bump (diff) | |
| download | multilib-portage-1bd67f5e85b4c280aa76071a51dc602b5ff2b5ce.tar.gz multilib-portage-1bd67f5e85b4c280aa76071a51dc602b5ff2b5ce.tar.bz2 multilib-portage-1bd67f5e85b4c280aa76071a51dc602b5ff2b5ce.zip | |
Version bump
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/wine/wine-1.7.46.ebuild (renamed from app-emulation/wine/wine-1.7.45.ebuild) | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app-emulation/wine/wine-1.7.45.ebuild b/app-emulation/wine/wine-1.7.46.ebuild index b7e828fa0..ff7a85080 100644 --- a/app-emulation/wine/wine-1.7.45.ebuild +++ b/app-emulation/wine/wine-1.7.46.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.45.ebuild,v 1.1 2015/06/18 06:06:00 np-hardass Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.46.ebuild,v 1.1 2015/06/30 02:59:17 np-hardass Exp $ EAPI="5" @@ -11,7 +11,7 @@ PLOCALE_BACKUP="en" inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://source.winehq.org/git/wine.git" + EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" EGIT_BRANCH="master" inherit git-r3 SRC_URI="" @@ -282,6 +282,13 @@ usr/share/applications/wine-winecfg.desktop" 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 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 @@ -330,7 +337,6 @@ src_prepare() { "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${PN}-1.7.45-libunwind-osx-only.patch # only applies to this version ) if use gstreamer; then # See http://bugs.winehq.org/show_bug.cgi?id=30557 |