Filter -O3 from CFLAGS for 1.11.4-r1 too. inherit flag-o-matic more to shut up repoman.

(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)

11 files changed, 35 insertions, 23 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 20cfbb103a0c..8d58dc8e1f51 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.658 2012/06/08 12:07:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.659 2012/06/08 13:40:11 chithanh Exp $
+
+  08 Jun 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xorg-server-1.10.4-r1.ebuild, xorg-server-1.10.6-r1.ebuild,
+  xorg-server-1.10.6.ebuild, xorg-server-1.11.2-r1.ebuild,
+  xorg-server-1.11.2-r2.ebuild, xorg-server-1.11.3.ebuild,
+  xorg-server-1.11.4-r1.ebuild, xorg-server-1.11.4.ebuild,
+  xorg-server-1.12.2.ebuild, xorg-server-1.9.5-r1.ebuild:
+  Filter -O3 from CFLAGS for 1.11.4-r1 too. inherit flag-o-matic more to shut up
+  repoman.
 
   08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   xorg-server-1.10.6-r1.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.10.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.10.4-r1.ebuild
index 89cc79de60fc..7636cb065d08 100644
--- a/x11-base/xorg-server/xorg-server-1.10.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.4-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.4-r1.ebuild,v 1.4 2011/10/22 16:57:28 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.4-r1.ebuild,v 1.5 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
diff --git a/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild b/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
index b5948142206b..ecea3c2ff267 100644
--- a/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild,v 1.4 2012/06/08 12:07:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild,v 1.5 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
diff --git a/x11-base/xorg-server/xorg-server-1.10.6.ebuild b/x11-base/xorg-server/xorg-server-1.10.6.ebuild
index c03a42e06d9c..209a05de0ff9 100644
--- a/x11-base/xorg-server/xorg-server-1.10.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6.ebuild,v 1.1 2012/02/24 00:29:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6.ebuild,v 1.2 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
diff --git a/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild
index 63f2163ea790..fdefb619c677 100644
--- a/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild,v 1.2 2012/01/30 12:38:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.2-r1.ebuild,v 1.3 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
diff --git a/x11-base/xorg-server/xorg-server-1.11.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.11.2-r2.ebuild
index f43fb2b1708e..b08bd694635a 100644
--- a/x11-base/xorg-server/xorg-server-1.11.2-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.11.2-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.2-r2.ebuild,v 1.10 2012/03/08 14:51:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.2-r2.ebuild,v 1.11 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
 XORG_EAUTORECONF=yes
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
diff --git a/x11-base/xorg-server/xorg-server-1.11.3.ebuild b/x11-base/xorg-server/xorg-server-1.11.3.ebuild
index 91e9829f9358..32690d89ca7a 100644
--- a/x11-base/xorg-server/xorg-server-1.11.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.11.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.3.ebuild,v 1.4 2012/03/02 18:02:14 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.3.ebuild,v 1.5 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
 XORG_EAUTORECONF=yes
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
diff --git a/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild
index 92bfc7feafc3..ecb73b592eaf 100644
--- a/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild,v 1.4 2012/06/06 14:57:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild,v 1.5 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
 XORG_EAUTORECONF=yes
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
@@ -176,6 +176,9 @@ pkg_setup() {
 		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
 	done
 	append-cppflags "-I${T}/mesa-symlinks"
+
+	# Make breakage less obvious, bug #402285.
+	replace-flags -O3 -O2
 }
 
 src_install() {
diff --git a/x11-base/xorg-server/xorg-server-1.11.4.ebuild b/x11-base/xorg-server/xorg-server-1.11.4.ebuild
index 41b742a49ded..670dab5f070c 100644
--- a/x11-base/xorg-server/xorg-server-1.11.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.11.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4.ebuild,v 1.3 2012/06/07 19:57:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4.ebuild,v 1.4 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
 XORG_EAUTORECONF=yes
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
diff --git a/x11-base/xorg-server/xorg-server-1.12.2.ebuild b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
index d82fa9fa8644..eb17dac38c9d 100644
--- a/x11-base/xorg-server/xorg-server-1.12.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.1 2012/05/29 23:46:01 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.2 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
diff --git a/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild b/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
index c67c9a756377..7c15644beedf 100644
--- a/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild,v 1.4 2011/10/22 16:57:28 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild,v 1.5 2012/06/08 13:40:11 chithanh Exp $
 
 EAPI=3
-inherit xorg-2 multilib versionator
+inherit flag-o-matic xorg-2 multilib versionator
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"