(QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true"

(Portage version: 2.1.3_rc6)

13 files changed, 41 insertions, 40 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 00e77519bb68..8aacd99c1fbc 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.78 2007/06/17 14:02:12 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.79 2007/07/01 22:50:47 peper Exp $
+
+  01 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  ati-drivers-8.27.10-r1.ebuild, ati-drivers-8.28.8.ebuild,
+  ati-drivers-8.29.6.ebuild, ati-drivers-8.30.3.ebuild,
+  ati-drivers-8.30.3-r1.ebuild, ati-drivers-8.32.5.ebuild,
+  ati-drivers-8.33.6-r1.ebuild, ati-drivers-8.34.8.ebuild,
+  ati-drivers-8.35.5.ebuild, ati-drivers-8.36.5.ebuild,
+  ati-drivers-8.37.6.ebuild, ati-drivers-8.37.6-r1.ebuild:
+  (QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true"
 
   17 Jun 2007; Marien Zwart <marienz@gentoo.org>
   ati-drivers-8.37.6-r1.ebuild:
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
index a471c8f3212f..34e6787d570f 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild,v 1.5 2007/03/10 21:40:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild,v 1.6 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi doc opengl"
 
@@ -29,7 +29,8 @@ DEPEND=">=virtual/linux-sources-2.4
 PROVIDE="virtual/opengl"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip multilib-pkg-force stricter"
+RESTRICT="nostrip stricter"
+EMULTILIB_PKG="true"
 
 MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
index 68bb1e2184d7..acbbd6399b78 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild,v 1.3 2007/03/10 21:40:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild,v 1.4 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi doc opengl"
 
@@ -28,7 +28,8 @@ DEPEND=">=virtual/linux-sources-2.4
 PROVIDE="virtual/opengl"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip multilib-pkg-force stricter"
+RESTRICT="nostrip stricter"
+EMULTILIB_PKG="true"
 
 MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
index f3850e649f61..5f5551516f80 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild,v 1.3 2007/03/10 21:40:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild,v 1.4 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi doc opengl"
 
@@ -28,7 +28,8 @@ DEPEND=">=virtual/linux-sources-2.4
 PROVIDE="virtual/opengl"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip multilib-pkg-force stricter"
+RESTRICT="nostrip stricter"
+EMULTILIB_PKG="true"
 
 MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
index 0c7ec5daaf66..7903e2be3a4a 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild,v 1.4 2007/03/10 21:40:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild,v 1.5 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi doc opengl"
 
@@ -30,7 +30,8 @@ PROVIDE="virtual/opengl"
 S="${WORKDIR}/common/lib/modules/fglrx/build_mod"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip multilib-pkg-force stricter"
+RESTRICT="nostrip stricter"
+EMULTILIB_PKG="true"
 
 QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
 QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
index 57464b3fa113..66f715ffaa49 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild,v 1.2 2007/03/10 21:40:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild,v 1.3 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi doc opengl"
 
@@ -28,7 +28,8 @@ DEPEND=">=virtual/linux-sources-2.4
 PROVIDE="virtual/opengl"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip multilib-pkg-force stricter"
+RESTRICT="nostrip stricter"
+EMULTILIB_PKG="true"
 
 MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
index 58ad407803d2..37666f59d0f0 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild,v 1.5 2007/03/10 21:40:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild,v 1.6 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi doc opengl"
 
@@ -31,7 +31,8 @@ PROVIDE="virtual/opengl"
 S="${WORKDIR}/common/lib/modules/fglrx/build_mod"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip multilib-pkg-force stricter test"
+RESTRICT="nostrip stricter test"
+EMULTILIB_PKG="true"
 
 QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
 QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
index 09e8a1d92c4e..aa703745a14d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild,v 1.2 2007/03/10 21:40:29 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild,v 1.3 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi doc opengl"
 
@@ -28,7 +28,8 @@ DEPEND=">=virtual/linux-sources-2.4
 S="${WORKDIR}/common/lib/modules/fglrx/build_mod"
 
 ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip multilib-pkg-force test"
+RESTRICT="nostrip test"
+EMULTILIB_PKG="true"
 
 QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so
 	usr/lib/opengl/ati/lib/libGL.so.1.2"
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild
index 3f5ac4afabf4..da7c7a9d8726 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild,v 1.4 2007/03/29 23:01:33 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild,v 1.5 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi qt3"
 
@@ -30,10 +30,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto"
 
-# Ignore QA warnings about multilib-pkg-force not existing:
-# multilib.eclass uses it (without it we do not install the 32 bit
-# libraries on amd64) --marienz
-RESTRICT="multilib-pkg-force"
+EMULTILIB_PKG="true"
 
 QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
 	usr/lib/opengl/ati/lib/libGL.so.1.2"
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild
index a05fe0648052..38dbaf2bf8e0 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild,v 1.3 2007/05/25 06:57:22 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild,v 1.4 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi qt3"
 
@@ -30,10 +30,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto"
 
-# Ignore QA warnings about multilib-pkg-force not existing:
-# multilib.eclass uses it (without it we do not install the 32 bit
-# libraries on amd64) --marienz
-RESTRICT="multilib-pkg-force"
+EMULTILIB_PKG="true"
 
 QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
 	usr/lib/opengl/ati/lib/libGL.so.1.2
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild
index c8d459d48402..138b701b3fc0 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild,v 1.1 2007/05/24 22:22:47 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.36.5.ebuild,v 1.2 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi qt3"
 
@@ -32,10 +32,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto"
 
-# Ignore QA warnings about multilib-pkg-force not existing:
-# multilib.eclass uses it (without it we do not install the 32 bit
-# libraries on amd64) --marienz
-RESTRICT="multilib-pkg-force"
+EMULTILIB_PKG="true"
 
 QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
 	usr/lib/opengl/ati/lib/libGL.so.1.2
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
index 60f3e34cf410..0db3f54ac063 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild,v 1.2 2007/06/17 14:02:12 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild,v 1.3 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi qt3 multilib"
 
@@ -33,10 +33,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto"
 
-# Ignore QA warnings about multilib-pkg-force not existing:
-# multilib.eclass uses it (without it we do not install the 32 bit
-# libraries on amd64) --marienz
-RESTRICT="multilib-pkg-force"
+EMULTILIB_PKG="true"
 
 QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
 	usr/lib/opengl/ati/lib/libGL.so.1.2
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.37.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.37.6.ebuild
index 9e602d2532ce..79b152f0838c 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.37.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.37.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.37.6.ebuild,v 1.1 2007/06/01 18:37:36 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.37.6.ebuild,v 1.2 2007/07/01 22:50:47 peper Exp $
 
 IUSE="acpi qt3"
 
@@ -32,10 +32,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto"
 
-# Ignore QA warnings about multilib-pkg-force not existing:
-# multilib.eclass uses it (without it we do not install the 32 bit
-# libraries on amd64) --marienz
-RESTRICT="multilib-pkg-force"
+EMULTILIB_PKG="true"
 
 QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
 	usr/lib/opengl/ati/lib/libGL.so.1.2