From 03d404bd6611dd00633a4e28db46bf8691c02d06 Mon Sep 17 00:00:00 2001 From: Dan Armak Date: Tue, 8 Oct 2002 07:10:05 +0000 Subject: [PATCH] fix #8843 - add a fix already in our 3.0.x ebuilds to the 3.1.x ones. --- kde-base/kdeaddons/ChangeLog | 6 +++++- kde-base/kdeaddons/kdeaddons-3.1_beta1.ebuild | 9 ++++++++- kde-base/kdeaddons/kdeaddons-3.1_beta2.ebuild | 9 ++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog index 2b51b2b61ad3..b68f884f416c 100644 --- a/kde-base/kdeaddons/ChangeLog +++ b/kde-base/kdeaddons/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeaddons # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.12 2002/09/08 08:44:52 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.13 2002/10/08 07:10:05 danarmak Exp $ + + 08 Oct 2002; Dan Armak ChangeLog : + + As below; add the same fix to the 3.1.x ebuilds (bug #8843). 08 Sep 2002; Dan Armak ChangeLog : diff --git a/kde-base/kdeaddons/kdeaddons-3.1_beta1.ebuild b/kde-base/kdeaddons/kdeaddons-3.1_beta1.ebuild index 34f9db4de71f..0095c419bf7f 100644 --- a/kde-base/kdeaddons/kdeaddons-3.1_beta1.ebuild +++ b/kde-base/kdeaddons/kdeaddons-3.1_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1_beta1.ebuild,v 1.4 2002/10/05 05:39:14 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1_beta1.ebuild,v 1.5 2002/10/08 07:10:05 danarmak Exp $ IUSE="sdl xmms svga" inherit kde-dist @@ -19,3 +19,10 @@ newdepend "~kde-base/kdebase-${PV} use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest" use xmms || export ac_cv_have_xmms=no + +# fix bug #7625 +if [ "$COMPILER" == "gcc3" ]; then + if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then + append-flags -mno-sse2 + fi +fi diff --git a/kde-base/kdeaddons/kdeaddons-3.1_beta2.ebuild b/kde-base/kdeaddons/kdeaddons-3.1_beta2.ebuild index 59c15a53bac1..2d31c3a5def6 100644 --- a/kde-base/kdeaddons/kdeaddons-3.1_beta2.ebuild +++ b/kde-base/kdeaddons/kdeaddons-3.1_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1_beta2.ebuild,v 1.3 2002/10/05 05:39:14 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1_beta2.ebuild,v 1.4 2002/10/08 07:10:05 danarmak Exp $ IUSE="sdl xmms svga" inherit kde-dist @@ -19,3 +19,10 @@ newdepend "~kde-base/kdebase-${PV} use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest" use xmms || export ac_cv_have_xmms=no + +# fix bug #7625 +if [ "$COMPILER" == "gcc3" ]; then + if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then + append-flags -mno-sse2 + fi +fi -- 2.26.2