Mask fdftk useflag in base profile and unmask only for x86; move it from use.desc to use.local.desc. Closes bug #157650 submitted by Timothy Redaelli (drizzt). Commit acknowledged by Jakub.

9 files changed, 14 insertions, 21 deletions

diff --git a/profiles/selinux/2005.1/alpha/use.mask b/profiles/selinux/2005.1/alpha/use.mask
index e31e4ededc62..02289f5c2181 100644
--- a/profiles/selinux/2005.1/alpha/use.mask
+++ b/profiles/selinux/2005.1/alpha/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/alpha/use.mask,v 1.4 2006/12/08 01:23:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/alpha/use.mask,v 1.5 2006/12/29 21:13:18 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -93,7 +93,6 @@ mpm-peruser
 
 pike
 
-fdftk
 
 timidity
 
diff --git a/profiles/selinux/2005.1/amd64/use.mask b/profiles/selinux/2005.1/amd64/use.mask
index 5ffdb309bbdf..78fab91732dd 100644
--- a/profiles/selinux/2005.1/amd64/use.mask
+++ b/profiles/selinux/2005.1/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/use.mask,v 1.6 2006/12/08 01:23:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/use.mask,v 1.7 2006/12/29 21:13:18 flameeyes Exp $
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # multilib is forced on when we have ${MULTILIB_ABIS} defined
@@ -20,7 +20,6 @@ firebird
 
 # 2004/06/22 - Taken from 2004.0 profile
 # x86 binary only, used by php
-fdftk
 
 # 2004/06/22 - Taken from 2004.0 profile
 # masked
diff --git a/profiles/selinux/2005.1/x86/use.mask b/profiles/selinux/2005.1/x86/use.mask
index 6985aeade92d..1d6d611792ca 100644
--- a/profiles/selinux/2005.1/x86/use.mask
+++ b/profiles/selinux/2005.1/x86/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86/use.mask,v 1.7 2006/08/11 00:17:12 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86/use.mask,v 1.8 2006/12/29 21:13:18 flameeyes Exp $
 
 -3dnow
 -3dnowext
@@ -15,3 +15,6 @@
 -sse2
 -svga
 -win32codecs
+
+# Adobe FDF toolkit is x86 only.
+-fdftk
diff --git a/profiles/selinux/alpha/use.mask b/profiles/selinux/alpha/use.mask
index 1d587908b489..f17db42c4e17 100644
--- a/profiles/selinux/alpha/use.mask
+++ b/profiles/selinux/alpha/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/use.mask,v 1.4 2006/12/08 01:23:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/use.mask,v 1.5 2006/12/29 21:13:18 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -96,7 +96,6 @@ mpm-peruser
 
 pike
 
-fdftk
 
 timidity
 
diff --git a/profiles/selinux/amd64/use.mask b/profiles/selinux/amd64/use.mask
index 5d120c55d992..626c940d7ab5 100644
--- a/profiles/selinux/amd64/use.mask
+++ b/profiles/selinux/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/amd64/use.mask,v 1.3 2006/12/21 16:21:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/amd64/use.mask,v 1.4 2006/12/29 21:13:18 flameeyes Exp $
 
 # SECTION: Unmask
 
@@ -89,10 +89,6 @@ pvm
 firebird
 
 # 2004/06/22 - Taken from 2004.0 profile
-# x86 binary only, used by php
-fdftk
-
-# 2004/06/22 - Taken from 2004.0 profile
 # masked
 3dfx
 
diff --git a/profiles/selinux/mips/use.mask b/profiles/selinux/mips/use.mask
index 53f77dac57ae..e2d2d39d0334 100644
--- a/profiles/selinux/mips/use.mask
+++ b/profiles/selinux/mips/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/mips/use.mask,v 1.3 2006/12/08 01:23:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/mips/use.mask,v 1.4 2006/12/29 21:13:18 flameeyes Exp $
 
 # Untested on mips, masking for now.
 cdb
@@ -158,10 +158,6 @@ gphoto2
 # This will probablly work, but no hardware to test with
 gnokii
 
-# Hardave Riar <hardave@gentoo.org>
-# x86 binary only package
-fdftk
-
 # Ciaran McCreesh <ciaranm@gentoo.org>
 # unresolved dep, bug #82428
 emboss
diff --git a/profiles/selinux/ppc/use.mask b/profiles/selinux/ppc/use.mask
index 51df70d4d3f9..71b7f7e84e83 100644
--- a/profiles/selinux/ppc/use.mask
+++ b/profiles/selinux/ppc/use.mask
@@ -4,7 +4,6 @@
 acpi
 afs
 avi
-fdftk
 lm_sensors
 rar
 
diff --git a/profiles/selinux/sparc/use.mask b/profiles/selinux/sparc/use.mask
index 37d380ce8319..fd333f70d62d 100644
--- a/profiles/selinux/sparc/use.mask
+++ b/profiles/selinux/sparc/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/sparc/use.mask,v 1.5 2006/12/08 01:23:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/sparc/use.mask,v 1.6 2006/12/29 21:13:18 flameeyes Exp $
 
 # This file contains a list of useflags that cannot be used on sparc.
 
@@ -17,7 +17,6 @@ djbfft
 dvb
 dmi
 emboss
-fdftk
 glitz
 hal
 i8x0
diff --git a/profiles/selinux/x86/use.mask b/profiles/selinux/x86/use.mask
index 1b3d003a89b8..251e7ce77b56 100644
--- a/profiles/selinux/x86/use.mask
+++ b/profiles/selinux/x86/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/x86/use.mask,v 1.1 2006/10/08 18:37:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/x86/use.mask,v 1.2 2006/12/29 21:13:18 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # x86 profile.  This works, for example, if another architecture's
@@ -54,3 +54,6 @@ ibm
 
 # psyco works on x86
 -psyco
+
+# Adobe FDF toolkit is x86 only.
+-fdftk