diff options
author | Simon Stelling <blubb@gentoo.org> | 2006-02-05 13:45:51 +0000 |
---|---|---|
committer | Simon Stelling <blubb@gentoo.org> | 2006-02-05 13:45:51 +0000 |
commit | 6771afa77d57d9234042d7fc87c412dd5daaef6e (patch) | |
tree | 2fcb374473bc02975910964fe32720d6bf88cf34 /app-emulation | |
parent | revision bump, next security bump as well (diff) | |
download | gentoo-2-6771afa77d57d9234042d7fc87c412dd5daaef6e.tar.gz gentoo-2-6771afa77d57d9234042d7fc87c412dd5daaef6e.tar.bz2 gentoo-2-6771afa77d57d9234042d7fc87c412dd5daaef6e.zip |
remove old 2004.3 multilib checks
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/wine/ChangeLog | 6 | ||||
-rw-r--r-- | app-emulation/wine/wine-0.9.5-r1.ebuild | 18 | ||||
-rw-r--r-- | app-emulation/wine/wine-0.9.7.ebuild | 18 | ||||
-rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 18 |
4 files changed, 11 insertions, 49 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 8f926c409612..7479180b1f6e 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.126 2006/02/03 00:06:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.127 2006/02/05 13:45:51 blubb Exp $ + + 05 Feb 2006; Simon Stelling <blubb@gentoo.org> wine-0.9.5-r1.ebuild, + wine-0.9.7.ebuild, wine-9999.ebuild: + remove old 2004.3 multilib checks *wine-0.9.7 (03 Feb 2006) diff --git a/app-emulation/wine/wine-0.9.5-r1.ebuild b/app-emulation/wine/wine-0.9.5-r1.ebuild index eb393d5e78c1..bccefc9cc719 100644 --- a/app-emulation/wine/wine-0.9.5-r1.ebuild +++ b/app-emulation/wine/wine-0.9.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.5 2006/02/03 00:04:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.6 2006/02/05 13:45:51 blubb Exp $ inherit eutils flag-o-matic multilib @@ -59,21 +59,7 @@ DEPEND="${RDEPEND} sys-devel/flex" pkg_setup() { - if use amd64 ; then - if ! has_m32 ; then - eerror "Your compiler seems to be unable to compile 32bit code." - eerror "Make sure you compile gcc with:" - echo - eerror " USE=multilib FEATURES=-sandbox" - die "Cannot produce 32bit code" - fi - if has_multilib_profile ; then - export ABI=x86 - else - append-flags -m32 - append-ldflags -m32 - fi - fi + use amd64 && has_multilib_profile && export ABI=x86 } src_unpack() { diff --git a/app-emulation/wine/wine-0.9.7.ebuild b/app-emulation/wine/wine-0.9.7.ebuild index eb7a93daace3..421487b10bfb 100644 --- a/app-emulation/wine/wine-0.9.7.ebuild +++ b/app-emulation/wine/wine-0.9.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.7.ebuild,v 1.2 2006/02/03 03:29:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.7.ebuild,v 1.3 2006/02/05 13:45:51 blubb Exp $ inherit eutils flag-o-matic multilib @@ -59,21 +59,7 @@ DEPEND="${RDEPEND} sys-devel/flex" pkg_setup() { - if use amd64 ; then - if ! has_m32 ; then - eerror "Your compiler seems to be unable to compile 32bit code." - eerror "Make sure you compile gcc with:" - echo - eerror " USE=multilib FEATURES=-sandbox" - die "Cannot produce 32bit code" - fi - if has_multilib_profile ; then - export ABI=x86 - else - append-flags -m32 - append-ldflags -m32 - fi - fi + use amd64 && has_multilib_profile && export ABI=x86 } src_unpack() { diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 434ad882ed57..d9974d3880c9 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.7 2006/02/03 03:29:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.8 2006/02/05 13:45:51 blubb Exp $ ECVS_SERVER="cvs.winehq.org:/home/wine" ECVS_MODULE="wine" @@ -66,21 +66,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${ECVS_MODULE} pkg_setup() { - if use amd64 ; then - if ! has_m32 ; then - eerror "Your compiler seems to be unable to compile 32bit code." - eerror "Make sure you compile gcc with:" - echo - eerror " USE=multilib FEATURES=-sandbox" - die "Cannot produce 32bit code" - fi - if has_multilib_profile ; then - export ABI=x86 - else - append-flags -m32 - append-ldflags -m32 - fi - fi + use amd64 && has_multilib_profile && export ABI=x86 } src_unpack() { |