| 1 |
commit: 1bd67f5e85b4c280aa76071a51dc602b5ff2b5ce |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 4 07:12:42 2015 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 4 07:12:42 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=1bd67f5e |
| 7 |
|
| 8 |
Version bump |
| 9 |
|
| 10 |
.../wine/{wine-1.7.45.ebuild => wine-1.7.46.ebuild} | 12 +++++++++--- |
| 11 |
1 file changed, 9 insertions(+), 3 deletions(-) |
| 12 |
|
| 13 |
diff --git a/app-emulation/wine/wine-1.7.45.ebuild b/app-emulation/wine/wine-1.7.46.ebuild |
| 14 |
similarity index 98% |
| 15 |
rename from app-emulation/wine/wine-1.7.45.ebuild |
| 16 |
rename to app-emulation/wine/wine-1.7.46.ebuild |
| 17 |
index b7e828f..ff7a850 100644 |
| 18 |
--- a/app-emulation/wine/wine-1.7.45.ebuild |
| 19 |
+++ b/app-emulation/wine/wine-1.7.46.ebuild |
| 20 |
@@ -1,6 +1,6 @@ |
| 21 |
# Copyright 1999-2015 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
-# $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 $ |
| 24 |
+# $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 $ |
| 25 |
|
| 26 |
EAPI="5" |
| 27 |
|
| 28 |
@@ -11,7 +11,7 @@ PLOCALE_BACKUP="en" |
| 29 |
inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx |
| 30 |
|
| 31 |
if [[ ${PV} == "9999" ]] ; then |
| 32 |
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git" |
| 33 |
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" |
| 34 |
EGIT_BRANCH="master" |
| 35 |
inherit git-r3 |
| 36 |
SRC_URI="" |
| 37 |
@@ -282,6 +282,13 @@ usr/share/applications/wine-winecfg.desktop" |
| 38 |
wine_build_environment_check() { |
| 39 |
[[ ${MERGE_TYPE} = "binary" ]] && return 0 |
| 40 |
|
| 41 |
+ # bug #549768 |
| 42 |
+ if [[ $(gcc-major-version) = 5 ]]; then |
| 43 |
+ eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768" |
| 44 |
+ eerror |
| 45 |
+ return 1 |
| 46 |
+ fi |
| 47 |
+ |
| 48 |
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then |
| 49 |
eerror "You need gcc-4.4+ to build 64-bit wine" |
| 50 |
eerror |
| 51 |
@@ -330,7 +337,6 @@ src_prepare() { |
| 52 |
"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 |
| 53 |
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 |
| 54 |
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 |
| 55 |
- "${FILESDIR}"/${PN}-1.7.45-libunwind-osx-only.patch # only applies to this version |
| 56 |
) |
| 57 |
if use gstreamer; then |
| 58 |
# See http://bugs.winehq.org/show_bug.cgi?id=30557 |
Archives