diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-12-12 16:20:25 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-12 16:20:25 +0000 |
commit | 325270507fd1beb3baeeae15e47bf547ebea9050 (patch) | |
tree | 76e29c35ebb97cda6817e0ef4ff3bcaad7d89fca /app-emulation/wine | |
parent | Add fix from upstream for pngtopnm errors #287725 by Denys Duchier. (diff) | |
download | gentoo-2-325270507fd1beb3baeeae15e47bf547ebea9050.tar.gz gentoo-2-325270507fd1beb3baeeae15e47bf547ebea9050.tar.bz2 gentoo-2-325270507fd1beb3baeeae15e47bf547ebea9050.zip |
Move win64 gcc-4.4 check from DEPEND to src_unpack to avoid problems with stable systems and people changing the version on the fly.
(Portage version: 2.2_rc55/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/wine')
24 files changed, 129 insertions, 47 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index fc9dc416f255..5a1f2ddd9894 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.286 2009/12/07 11:08:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.287 2009/12/12 16:20:25 vapier Exp $ + + 12 Dec 2009; Mike Frysinger <vapier@gentoo.org> wine-1.1.13.ebuild, + wine-1.1.14.ebuild, wine-1.1.15.ebuild, wine-1.1.16.ebuild, + wine-1.1.17.ebuild, wine-1.1.18.ebuild, wine-1.1.19.ebuild, + wine-1.1.20.ebuild, wine-1.1.21.ebuild, wine-1.1.22.ebuild, + wine-1.1.23.ebuild, wine-1.1.24.ebuild, wine-1.1.25.ebuild, + wine-1.1.26.ebuild, wine-1.1.27.ebuild, wine-1.1.28.ebuild, + wine-1.1.29.ebuild, wine-1.1.30.ebuild, wine-1.1.31.ebuild, + wine-1.1.32.ebuild, wine-1.1.33.ebuild, wine-1.1.34.ebuild, + wine-9999.ebuild: + Move win64 gcc-4.4 check from DEPEND to src_unpack to avoid problems with + stable systems and people changing the version on the fly. *wine-1.1.34 (07 Dec 2009) diff --git a/app-emulation/wine/wine-1.1.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild index ce83e01a9ed4..c33b6e4dacbf 100644 --- a/app-emulation/wine/wine-1.1.13.ebuild +++ b/app-emulation/wine/wine-1.1.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.17 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.18 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.14.ebuild b/app-emulation/wine/wine-1.1.14.ebuild index 0962bfa1f36c..3cac1b806aba 100644 --- a/app-emulation/wine/wine-1.1.14.ebuild +++ b/app-emulation/wine/wine-1.1.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.12 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.13 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.15.ebuild b/app-emulation/wine/wine-1.1.15.ebuild index 38e057caa49a..d28995968818 100644 --- a/app-emulation/wine/wine-1.1.15.ebuild +++ b/app-emulation/wine/wine-1.1.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.14 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.15 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.16.ebuild b/app-emulation/wine/wine-1.1.16.ebuild index 020cda45d1c5..b1facb627489 100644 --- a/app-emulation/wine/wine-1.1.16.ebuild +++ b/app-emulation/wine/wine-1.1.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.13 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.14 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.17.ebuild b/app-emulation/wine/wine-1.1.17.ebuild index 0c020c8f7c12..30870c315311 100644 --- a/app-emulation/wine/wine-1.1.17.ebuild +++ b/app-emulation/wine/wine-1.1.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.10 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.11 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.18.ebuild b/app-emulation/wine/wine-1.1.18.ebuild index 45dd3f06f440..457ad5f46d20 100644 --- a/app-emulation/wine/wine-1.1.18.ebuild +++ b/app-emulation/wine/wine-1.1.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.10 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.11 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.19.ebuild b/app-emulation/wine/wine-1.1.19.ebuild index 70d85d2781c6..974c924b17cc 100644 --- a/app-emulation/wine/wine-1.1.19.ebuild +++ b/app-emulation/wine/wine-1.1.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.10 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.11 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.20.ebuild b/app-emulation/wine/wine-1.1.20.ebuild index 499403caa0c8..9ce66419e31d 100644 --- a/app-emulation/wine/wine-1.1.20.ebuild +++ b/app-emulation/wine/wine-1.1.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.10 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.11 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.21.ebuild b/app-emulation/wine/wine-1.1.21.ebuild index d49b5fc5ee85..5bbf3a992d85 100644 --- a/app-emulation/wine/wine-1.1.21.ebuild +++ b/app-emulation/wine/wine-1.1.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.9 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.10 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.22.ebuild b/app-emulation/wine/wine-1.1.22.ebuild index 39a0236aab20..f06ed28b5f09 100644 --- a/app-emulation/wine/wine-1.1.22.ebuild +++ b/app-emulation/wine/wine-1.1.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.6 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.7 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.23.ebuild b/app-emulation/wine/wine-1.1.23.ebuild index 0ccace64983c..dd1d41be44e9 100644 --- a/app-emulation/wine/wine-1.1.23.ebuild +++ b/app-emulation/wine/wine-1.1.23.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.6 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.7 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.24.ebuild b/app-emulation/wine/wine-1.1.24.ebuild index 1ea5ee1f7960..4f22dd8916ad 100644 --- a/app-emulation/wine/wine-1.1.24.ebuild +++ b/app-emulation/wine/wine-1.1.24.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.6 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.7 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.25.ebuild b/app-emulation/wine/wine-1.1.25.ebuild index 36153be78e5e..2b2af5e4ad65 100644 --- a/app-emulation/wine/wine-1.1.25.ebuild +++ b/app-emulation/wine/wine-1.1.25.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.6 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.7 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.26.ebuild b/app-emulation/wine/wine-1.1.26.ebuild index e738c2e1a321..dcb3c230d821 100644 --- a/app-emulation/wine/wine-1.1.26.ebuild +++ b/app-emulation/wine/wine-1.1.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.6 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.7 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -59,7 +59,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -78,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.27.ebuild b/app-emulation/wine/wine-1.1.27.ebuild index ad5decd37606..432b26d19e6f 100644 --- a/app-emulation/wine/wine-1.1.27.ebuild +++ b/app-emulation/wine/wine-1.1.27.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.7 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.8 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -60,7 +60,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -79,6 +78,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.28.ebuild b/app-emulation/wine/wine-1.1.28.ebuild index 5ba4e15c5d83..ccb48c4534db 100644 --- a/app-emulation/wine/wine-1.1.28.ebuild +++ b/app-emulation/wine/wine-1.1.28.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.7 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.8 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -60,7 +60,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -79,6 +78,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.29.ebuild b/app-emulation/wine/wine-1.1.29.ebuild index d8eca6c92763..512092e0cf1e 100644 --- a/app-emulation/wine/wine-1.1.29.ebuild +++ b/app-emulation/wine/wine-1.1.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.29.ebuild,v 1.7 2009/12/07 11:07:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.29.ebuild,v 1.8 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -61,7 +61,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -80,6 +79,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.30.ebuild b/app-emulation/wine/wine-1.1.30.ebuild index 7f1707c9211c..8506a5cef2ea 100644 --- a/app-emulation/wine/wine-1.1.30.ebuild +++ b/app-emulation/wine/wine-1.1.30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.4 2009/12/03 03:04:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.5 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -65,7 +65,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -84,6 +83,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.31.ebuild b/app-emulation/wine/wine-1.1.31.ebuild index 44ef758ffa68..f71b988a7d7a 100644 --- a/app-emulation/wine/wine-1.1.31.ebuild +++ b/app-emulation/wine/wine-1.1.31.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.31.ebuild,v 1.3 2009/12/03 03:04:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.31.ebuild,v 1.4 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -64,7 +64,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -83,6 +82,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.32.ebuild b/app-emulation/wine/wine-1.1.32.ebuild index db3445de9b4d..38c9efbf6213 100644 --- a/app-emulation/wine/wine-1.1.32.ebuild +++ b/app-emulation/wine/wine-1.1.32.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.32.ebuild,v 1.3 2009/12/03 03:04:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.32.ebuild,v 1.4 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -64,7 +64,6 @@ RDEPEND=">=media-libs/freetype-2.0.0 scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -83,6 +82,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.33.ebuild b/app-emulation/wine/wine-1.1.33.ebuild index b66f6836fcc9..e1d078316c68 100644 --- a/app-emulation/wine/wine-1.1.33.ebuild +++ b/app-emulation/wine/wine-1.1.33.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.33.ebuild,v 1.3 2009/12/03 03:04:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.33.ebuild,v 1.4 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -63,7 +63,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( @@ -84,6 +83,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-1.1.34.ebuild b/app-emulation/wine/wine-1.1.34.ebuild index 6dfe8d6abd4a..0171a4a5d778 100644 --- a/app-emulation/wine/wine-1.1.34.ebuild +++ b/app-emulation/wine/wine-1.1.34.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.34.ebuild,v 1.1 2009/12/07 11:08:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.34.ebuild,v 1.2 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -63,7 +63,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( @@ -84,6 +83,11 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi +einfo "$(gcc-major-version) * 100 + $(gcc-minor-version)" + if [[ ${PV} == "9999" ]] ; then git_src_unpack else diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 3e8086caca7f..b36b7d4b7b32 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.48 2009/12/03 03:04:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.49 2009/12/12 16:20:25 vapier Exp $ EAPI="2" @@ -63,7 +63,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - win64? ( >=sys-devel/gcc-4.4.0 ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( @@ -84,6 +83,10 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { + if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then + use win64 && die "you need gcc-4.4+ to build 64bit wine" + fi + if [[ ${PV} == "9999" ]] ; then git_src_unpack else |