Filtering out k6 optimization flags with flag-o-matic.

Close bug #16085.

8 files changed, 56 insertions, 25 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 1ae6f1ab21b4..e52d9b4df485 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,11 +1,12 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.42 2003/03/07 23:01:10 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.43 2003/03/07 23:25:49 agenkin Exp $
 
 *xine-lib-1_beta6 (25 Feb 2003)
 
   07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
-  Fixed installation problem for portage >=2.0.47.
+  Fixed installation problem for portage >=2.0.47 (bug #16841).
+  Filter out k6 optimization flags (bug #16085).
 
   27 Feb 2003; Mark Guertin <gerk@gentoo.org> xine-lib-1_beta6.ebuild :
   set ~ppc in keywords
@@ -16,7 +17,8 @@
 *xine-lib-1_beta5-r1 (22 Feb 2003)
 
   07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
-  Fixed installation problem for portage >=2.0.47.
+  Fixed installation problem for portage >=2.0.47 (bug #16841).
+  Filter out k6 optimization flags (bug #16085).
 
   22 Feb 2003; Arcady Genkin <agenkin@gentoo.org> :
   Version bump to 1-beta5.
@@ -30,7 +32,8 @@
 *xine-lib-1_beta4 (28 Jan 2003)
 
   07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
-  Fixed installation problem for portage >=2.0.47.
+  Fixed installation problem for portage >=2.0.47 (bug #16841).
+  Filter out k6 optimization flags (bug #16085).
 
   13 Feb 2003; Arcady Genkin <agenkin@gentoo.org> :
   Removed dependency on kdelibs (bug 15595).
@@ -49,7 +52,8 @@
 *xine-lib-1_beta2 (02 Jan 2003)
 
   07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
-  Fixed installation problem for portage >=2.0.47.
+  Fixed installation problem for portage >=2.0.47 (bug #16841).
+  Filter out k6 optimization flags (bug #16085).
 
   08 Jan 2003; Nick Hadaway <raker@gentoo.org> xine-lib-1_beta2.ebuild :
   Marked stable.
@@ -64,7 +68,8 @@
 *xine-lib-1_beta1 (24 Dec 2002)
 
   07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
-  Fixed installation problem for portage >=2.0.47.
+  Fixed installation problem for portage >=2.0.47 (bug #16841).
+  Filter out k6 optimization flags (bug #16085).
 
   25 Dec 2002; Nick Hadaway <raker@gentoo.org> xine-lib-1_beta1.ebuild :
   Removed {C.CXX}FLAGS as configure sets very specific optimization
@@ -77,7 +82,8 @@
 *xine-lib-1_beta0 (28 Nov 2002)
 
   07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
-  Fixed installation problem for portage >=2.0.47.
+  Fixed installation problem for portage >=2.0.47 (bug #16841).
+  Filter out k6 optimization flags (bug #16085).
 
   28 Nov 2002; Arcady Genkin <agenkin@gentoo.org> xine-lib-1_beta0.ebuild :
   Version bump.
@@ -85,7 +91,8 @@
 *xine-lib-1_alpha2 (28 Nov 2002)
 
   07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
-  Fixed installation problem for portage >=2.0.47.
+  Fixed installation problem for portage >=2.0.47 (bug #16841).
+  Filter out k6 optimization flags (bug #16085).
 
   28 Nov 2002; Arcady Genkin <agenkin@gentoo.org> xine-lib-1_alpha2.ebuild :
   Update to version 1-alpha2.
@@ -93,6 +100,9 @@
 	
 *xine-lib-0.9.13-r2 (02 Nov 2002)
 
+  07 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Filter out k6 optimization flags (bug #16085).
+
   13 Feb 2003; Arcady Genkin <agenkin@gentoo.org> :
   Removed dependency on kdelibs (bug 15595).
 
diff --git a/media-libs/xine-lib/xine-lib-0.9.13-r2.ebuild b/media-libs/xine-lib/xine-lib-0.9.13-r2.ebuild
index 60267b9e121c..4779b49a872b 100644
--- a/media-libs/xine-lib/xine-lib-0.9.13-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.13-r2.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13-r2.ebuild,v 1.5 2003/02/14 00:51:00 agenkin Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13-r2.ebuild,v 1.6 2003/03/07 23:25:49 agenkin Exp $ 
 
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
 
 inherit libtool || die "I lost my inheritance"
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"											   
+inherit flag-o-matic  || die "I lost my inheritance"
 filter-flags "-maltivec -mabi=altivec" 
+replace-flags k6-3 i686
+replace-flags k6-2 i686
+replace-flags k6   i686
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
diff --git a/media-libs/xine-lib/xine-lib-1_alpha2.ebuild b/media-libs/xine-lib/xine-lib-1_alpha2.ebuild
index 29ef0b06607b..53721e67e284 100644
--- a/media-libs/xine-lib/xine-lib-1_alpha2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_alpha2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_alpha2.ebuild,v 1.3 2003/03/07 23:01:10 agenkin Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_alpha2.ebuild,v 1.4 2003/03/07 23:25:49 agenkin Exp $ 
 
 DESCRIPTION="Core libraries for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -31,8 +31,11 @@ S=${WORKDIR}/${PN}-${PV/_/-}
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"											   
+inherit flag-o-matic  || die "I lost my inheritance"
 filter-flags "-maltivec -mabi=altivec" 
+replace-flags k6-3 i686
+replace-flags k6-2 i686
+replace-flags k6   i686
 
 src_compile() {
 
diff --git a/media-libs/xine-lib/xine-lib-1_beta0.ebuild b/media-libs/xine-lib/xine-lib-1_beta0.ebuild
index 184b06bb926f..1bccf9db6ac4 100644
--- a/media-libs/xine-lib/xine-lib-1_beta0.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_beta0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta0.ebuild,v 1.3 2003/03/07 23:01:10 agenkin Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta0.ebuild,v 1.4 2003/03/07 23:25:49 agenkin Exp $ 
 
 DESCRIPTION="Core libraries for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -31,8 +31,11 @@ S=${WORKDIR}/${PN}-${PV/_/-}
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"											   
-filter-flags "-maltivec -mabi=altivec" 
+inherit flag-o-matic  || die "I lost my inheritance"
+filter-flags "-maltivec -mabi=altivec"
+replace-flags k6-3 i686
+replace-flags k6-2 i686
+replace-flags k6   i686
 
 src_compile() {
 
diff --git a/media-libs/xine-lib/xine-lib-1_beta1.ebuild b/media-libs/xine-lib/xine-lib-1_beta1.ebuild
index 364723e33946..ab897939046e 100644
--- a/media-libs/xine-lib/xine-lib-1_beta1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta1.ebuild,v 1.4 2003/03/07 23:01:10 agenkin Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta1.ebuild,v 1.5 2003/03/07 23:25:49 agenkin Exp $ 
 
 DESCRIPTION="Core libraries for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -31,8 +31,11 @@ S=${WORKDIR}/${PN}-${PV/_/-}
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"											   
+inherit flag-o-matic  || die "I lost my inheritance"
 filter-flags "-maltivec -mabi=altivec" 
+replace-flags k6-3 i686
+replace-flags k6-2 i686
+replace-flags k6   i686
 
 src_compile() {
 
diff --git a/media-libs/xine-lib/xine-lib-1_beta2.ebuild b/media-libs/xine-lib/xine-lib-1_beta2.ebuild
index 348505a7edec..511340aacaa2 100644
--- a/media-libs/xine-lib/xine-lib-1_beta2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta2.ebuild,v 1.5 2003/03/07 23:01:10 agenkin Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta2.ebuild,v 1.6 2003/03/07 23:25:49 agenkin Exp $ 
 
 DESCRIPTION="Core libraries for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -31,8 +31,11 @@ S=${WORKDIR}/${PN}-${PV/_/-}
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"											   
+inherit flag-o-matic  || die "I lost my inheritance"
 filter-flags "-maltivec -mabi=altivec" 
+replace-flags k6-3 i686
+replace-flags k6-2 i686
+replace-flags k6   i686
 
 src_compile() {
 
diff --git a/media-libs/xine-lib/xine-lib-1_beta4.ebuild b/media-libs/xine-lib/xine-lib-1_beta4.ebuild
index 83f143b03d3e..d6afbae442b8 100644
--- a/media-libs/xine-lib/xine-lib-1_beta4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta4.ebuild,v 1.5 2003/03/07 23:01:10 agenkin Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta4.ebuild,v 1.6 2003/03/07 23:25:49 agenkin Exp $ 
 
 DESCRIPTION="Core libraries for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -33,8 +33,11 @@ S=${WORKDIR}/${PN}-${PV/_/-}
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"											   
-filter-flags "-maltivec -mabi=altivec" 
+inherit flag-o-matic  || die "I lost my inheritance"
+filter-flags "-maltivec -mabi=altivec"
+replace-flags k6-3 i686
+replace-flags k6-2 i686
+replace-flags k6   i686
 
 src_compile() {
 
diff --git a/media-libs/xine-lib/xine-lib-1_beta6.ebuild b/media-libs/xine-lib/xine-lib-1_beta6.ebuild
index 7919ba7a40cb..9b7fec140de7 100644
--- a/media-libs/xine-lib/xine-lib-1_beta6.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta6.ebuild,v 1.3 2003/03/07 23:01:10 agenkin Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta6.ebuild,v 1.4 2003/03/07 23:25:49 agenkin Exp $ 
 
 DESCRIPTION="Core libraries for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -35,8 +35,11 @@ S=${WORKDIR}/${PN}-${PV/_/-}
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"											   
-filter-flags "-maltivec -mabi=altivec" 
+inherit flag-o-matic  || die "I lost my inheritance"
+filter-flags "-maltivec -mabi=altivec"
+replace-flags k6-3 i686
+replace-flags k6-2 i686
+replace-flags k6   i686
 
 src_compile() {