From 679a1691c3c08a47745aba871e35d27fad3e85af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Fri, 29 Dec 2006 21:13:18 +0000 Subject: [PATCH] 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. --- profiles/base/use.mask | 4 ++++ profiles/default-bsd/use.mask | 6 +----- profiles/default-darwin/use.mask | 1 - profiles/default-linux/alpha/ChangeLog | 5 ++++- profiles/default-linux/alpha/use.mask | 3 +-- profiles/default-linux/amd64/ChangeLog | 5 ++++- profiles/default-linux/amd64/use.mask | 6 +----- profiles/default-linux/arm/use.mask | 1 - profiles/default-linux/hppa/ChangeLog | 5 ++++- profiles/default-linux/hppa/use.mask | 4 ---- profiles/default-linux/ia64/ChangeLog | 5 ++++- profiles/default-linux/ia64/use.mask | 1 - profiles/default-linux/m68k/use.mask | 1 - profiles/default-linux/mips/use.mask | 6 +----- profiles/default-linux/ppc/1.0/use.mask | 1 - profiles/default-linux/ppc/1.0_rc/use.mask | 1 - profiles/default-linux/ppc/1.2/use.mask | 1 - profiles/default-linux/ppc/1.4/use.mask | 1 - profiles/default-linux/ppc/2004.0/use.mask | 1 - profiles/default-linux/ppc/2004.1/use.mask | 1 - profiles/default-linux/ppc/2004.2/use.mask | 1 - profiles/default-linux/ppc/2004.3/use.mask | 1 - profiles/default-linux/ppc/2005.0/use.mask | 1 - profiles/default-linux/ppc/2005.1/ppc/use.mask | 1 - profiles/default-linux/ppc/2005.1/ppc64/use.mask | 1 - profiles/default-linux/ppc/ChangeLog | 8 +++++++- profiles/default-linux/ppc/use.mask | 1 - profiles/default-linux/ppc64/use.mask | 1 - profiles/default-linux/s390/use.mask | 1 - profiles/default-linux/sh/use.mask | 1 - profiles/default-linux/sparc/ChangeLog | 5 ++++- profiles/default-linux/sparc/use.mask | 3 +-- profiles/default-linux/x86/ChangeLog | 5 ++++- profiles/default-linux/x86/use.mask | 5 ++++- profiles/hardened/amd64/use.mask | 6 +----- profiles/hardened/ppc/use.mask | 1 - profiles/hardened/ppc64/use.mask | 1 - profiles/hardened/x86/use.mask | 5 ++++- profiles/selinux/2005.1/alpha/use.mask | 3 +-- profiles/selinux/2005.1/amd64/use.mask | 3 +-- profiles/selinux/2005.1/x86/use.mask | 5 ++++- profiles/selinux/alpha/use.mask | 3 +-- profiles/selinux/amd64/use.mask | 6 +----- profiles/selinux/mips/use.mask | 6 +----- profiles/selinux/ppc/use.mask | 1 - profiles/selinux/sparc/use.mask | 3 +-- profiles/selinux/x86/use.mask | 5 ++++- profiles/uclibc/x86/use.mask | 3 +++ profiles/use.desc | 3 +-- profiles/use.local.desc | 3 ++- 50 files changed, 69 insertions(+), 82 deletions(-) diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 615655e03189..8b58d0e3791b 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -112,3 +112,7 @@ alsa_cards_at91-soc-eti-b1-wm8731 alsa_cards_harmony # Mask specific MIPS drivers alsa_cards_au1x00 + +# Diego Pettenò (29 Dec 2006) +# Adobe FDF toolkit is x86 only. +fdftk diff --git a/profiles/default-bsd/use.mask b/profiles/default-bsd/use.mask index b61b2f9bd33e..a81d233b0982 100644 --- a/profiles/default-bsd/use.mask +++ b/profiles/default-bsd/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/default-bsd/use.mask,v 1.26 2006/12/10 00:55:00 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.27 2006/12/29 21:13:17 flameeyes Exp $ # Linux-dependant flags selinux @@ -31,10 +31,6 @@ win32codecs xvmc xfs -# x86 binary only, used by php -# it should be global masked and unmasked only in x86 profile -fdftk - # This usually refers just to linux-dvb dvb diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask index 0d8b056b4a40..f754535dc791 100644 --- a/profiles/default-darwin/use.mask +++ b/profiles/default-darwin/use.mask @@ -11,7 +11,6 @@ directfb djbfft emul-linux-x86 fbcon -fdftk fmod ggi gpm diff --git a/profiles/default-linux/alpha/ChangeLog b/profiles/default-linux/alpha/ChangeLog index eb512b169776..cbf3e9c62c9d 100644 --- a/profiles/default-linux/alpha/ChangeLog +++ b/profiles/default-linux/alpha/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/x86 profile directory # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/ChangeLog,v 1.18 2006/12/10 21:25:22 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/ChangeLog,v 1.19 2006/12/29 21:13:17 flameeyes Exp $ + + 29 Dec 2006; Diego Pettenò use.mask: + Mask fdftk useflag on base profile and unmask for x86 only. 10 Dec 2006; Bryan Østergaard no-nptl/package.mask: Mask >=gcc-4 in no-nptl profiles. diff --git a/profiles/default-linux/alpha/use.mask b/profiles/default-linux/alpha/use.mask index c56205e4e12a..aa37078e8608 100644 --- a/profiles/default-linux/alpha/use.mask +++ b/profiles/default-linux/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/default-linux/alpha/use.mask,v 1.53 2006/12/08 01:23:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/use.mask,v 1.54 2006/12/29 21:13:17 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/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog index d476252b9320..7e2ab86f8c14 100644 --- a/profiles/default-linux/amd64/ChangeLog +++ b/profiles/default-linux/amd64/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.46 2006/12/27 18:26:39 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.47 2006/12/29 21:13:17 flameeyes Exp $ + + 29 Dec 2006; Diego Pettenò use.mask: + Mask fdftk useflag on base profile and unmask for x86 only. 27 Dec 2006; Chris Gianelloni +2006.1/server/profile.bashrc: diff --git a/profiles/default-linux/amd64/use.mask b/profiles/default-linux/amd64/use.mask index 8a0611595034..5f230e5ea41a 100644 --- a/profiles/default-linux/amd64/use.mask +++ b/profiles/default-linux/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/default-linux/amd64/use.mask,v 1.43 2006/12/21 16:17:14 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.44 2006/12/29 21:13:17 flameeyes Exp $ # SECTION: Unmask @@ -84,10 +84,6 @@ mzscheme # sys-cluster/pvm won't build pvm -# 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/default-linux/arm/use.mask b/profiles/default-linux/arm/use.mask index db1ae9b027ba..617a86ca20e2 100644 --- a/profiles/default-linux/arm/use.mask +++ b/profiles/default-linux/arm/use.mask @@ -20,7 +20,6 @@ java-internal java-external # dont make sense on this arch -fdftk 3dfx # havent tested yet diff --git a/profiles/default-linux/hppa/ChangeLog b/profiles/default-linux/hppa/ChangeLog index 4634acae79d1..99eeaa58c231 100644 --- a/profiles/default-linux/hppa/ChangeLog +++ b/profiles/default-linux/hppa/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for hppa profile # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/ChangeLog,v 1.5 2006/12/06 18:51:12 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/ChangeLog,v 1.6 2006/12/29 21:13:17 flameeyes Exp $ + + 29 Dec 2006; Diego Pettenò use.mask: + Mask fdftk useflag on base profile and unmask for x86 only. 06 Dec 2006; Diego Pettenò use.mask: Unmask HPPA specific ALSA driver. diff --git a/profiles/default-linux/hppa/use.mask b/profiles/default-linux/hppa/use.mask index 3dc84b574bb9..2cd1123e2ed1 100644 --- a/profiles/default-linux/hppa/use.mask +++ b/profiles/default-linux/hppa/use.mask @@ -129,10 +129,6 @@ wifi oci8 informix -# 14 Jul 2004 Gustavo Zacarias -# Adobe's FDFTK toolkit doesn't exist for linux/hppa -fdftk - # 26 Feb 2003 Guy Martin # No lirc support on hppa lirc diff --git a/profiles/default-linux/ia64/ChangeLog b/profiles/default-linux/ia64/ChangeLog index dd53b92cad89..71e0817f5d47 100644 --- a/profiles/default-linux/ia64/ChangeLog +++ b/profiles/default-linux/ia64/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for ia64 profile # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/ChangeLog,v 1.9 2006/12/11 15:09:20 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/ChangeLog,v 1.10 2006/12/29 21:13:17 flameeyes Exp $ + + 29 Dec 2006; Diego Pettenò use.mask: + Mask fdftk useflag on base profile and unmask for x86 only. 11 Dec 2006; use.mask: Use mask sms. diff --git a/profiles/default-linux/ia64/use.mask b/profiles/default-linux/ia64/use.mask index acf4946ba5b4..b67087fdfb46 100644 --- a/profiles/default-linux/ia64/use.mask +++ b/profiles/default-linux/ia64/use.mask @@ -43,7 +43,6 @@ pfpro solid sybase sybase-ct -fdftk qdbm hardened diff --git a/profiles/default-linux/m68k/use.mask b/profiles/default-linux/m68k/use.mask index 7ac253625b12..c28882f8e51f 100644 --- a/profiles/default-linux/m68k/use.mask +++ b/profiles/default-linux/m68k/use.mask @@ -28,7 +28,6 @@ pfpro solid sybase sybase-ct -fdftk djbfft qdbm mzscheme diff --git a/profiles/default-linux/mips/use.mask b/profiles/default-linux/mips/use.mask index dfc632011acf..836faa81477c 100644 --- a/profiles/default-linux/mips/use.mask +++ b/profiles/default-linux/mips/use.mask @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.70 2006/12/08 01:23:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.71 2006/12/29 21:13:17 flameeyes Exp $ # Untested on mips, masking for now. cdb @@ -162,10 +162,6 @@ gphoto2 # This will probablly work, but no hardware to test with gnokii -# Hardave Riar -# x86 binary only package -fdftk - # Ciaran McCreesh # unresolved dep, bug #82428 emboss diff --git a/profiles/default-linux/ppc/1.0/use.mask b/profiles/default-linux/ppc/1.0/use.mask index 0a7e25e5d7b6..463928cf8fe1 100644 --- a/profiles/default-linux/ppc/1.0/use.mask +++ b/profiles/default-linux/ppc/1.0/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/1.0_rc/use.mask b/profiles/default-linux/ppc/1.0_rc/use.mask index 0a7e25e5d7b6..463928cf8fe1 100644 --- a/profiles/default-linux/ppc/1.0_rc/use.mask +++ b/profiles/default-linux/ppc/1.0_rc/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/1.2/use.mask b/profiles/default-linux/ppc/1.2/use.mask index 0a7e25e5d7b6..463928cf8fe1 100644 --- a/profiles/default-linux/ppc/1.2/use.mask +++ b/profiles/default-linux/ppc/1.2/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/1.4/use.mask b/profiles/default-linux/ppc/1.4/use.mask index 0a7e25e5d7b6..463928cf8fe1 100644 --- a/profiles/default-linux/ppc/1.4/use.mask +++ b/profiles/default-linux/ppc/1.4/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/2004.0/use.mask b/profiles/default-linux/ppc/2004.0/use.mask index 8770c23f0485..83ac6745068f 100644 --- a/profiles/default-linux/ppc/2004.0/use.mask +++ b/profiles/default-linux/ppc/2004.0/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/2004.1/use.mask b/profiles/default-linux/ppc/2004.1/use.mask index 261d39a8ffbf..258bd3038588 100644 --- a/profiles/default-linux/ppc/2004.1/use.mask +++ b/profiles/default-linux/ppc/2004.1/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/2004.2/use.mask b/profiles/default-linux/ppc/2004.2/use.mask index 261d39a8ffbf..258bd3038588 100644 --- a/profiles/default-linux/ppc/2004.2/use.mask +++ b/profiles/default-linux/ppc/2004.2/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/2004.3/use.mask b/profiles/default-linux/ppc/2004.3/use.mask index 8770c23f0485..83ac6745068f 100644 --- a/profiles/default-linux/ppc/2004.3/use.mask +++ b/profiles/default-linux/ppc/2004.3/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/2005.0/use.mask b/profiles/default-linux/ppc/2005.0/use.mask index 32b0ded71ab2..f527a65a792b 100644 --- a/profiles/default-linux/ppc/2005.0/use.mask +++ b/profiles/default-linux/ppc/2005.0/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf lm_sensors real diff --git a/profiles/default-linux/ppc/2005.1/ppc/use.mask b/profiles/default-linux/ppc/2005.1/ppc/use.mask index d88ac363ebcd..c66ba1bce9fc 100644 --- a/profiles/default-linux/ppc/2005.1/ppc/use.mask +++ b/profiles/default-linux/ppc/2005.1/ppc/use.mask @@ -7,7 +7,6 @@ afs avi birdstep cmucl -fdftk hdf ip28 lm_sensors diff --git a/profiles/default-linux/ppc/2005.1/ppc64/use.mask b/profiles/default-linux/ppc/2005.1/ppc64/use.mask index bdd316c8cc8b..636e0275348a 100644 --- a/profiles/default-linux/ppc/2005.1/ppc64/use.mask +++ b/profiles/default-linux/ppc/2005.1/ppc64/use.mask @@ -16,7 +16,6 @@ ruby firebird mzscheme chasen -fdftk mono beagle rar diff --git a/profiles/default-linux/ppc/ChangeLog b/profiles/default-linux/ppc/ChangeLog index d6d88f1a7c8b..58e621577bda 100644 --- a/profiles/default-linux/ppc/ChangeLog +++ b/profiles/default-linux/ppc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for Gentoo/ppc profile directory # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ChangeLog,v 1.2 2006/12/16 13:26:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ChangeLog,v 1.3 2006/12/29 21:13:17 flameeyes Exp $ + + 29 Dec 2006; Diego Pettenò 1.0/use.mask, + 1.0_rc/use.mask, 1.2/use.mask, 1.4/use.mask, 2004.0/use.mask, + 2004.1/use.mask, 2004.2/use.mask, 2004.3/use.mask, 2005.0/use.mask, + 2005.1/ppc/use.mask, 2005.1/ppc64/use.mask, use.mask: + Mask fdftk useflag on base profile and unmask for x86 only. 16 Dec 2006; Chris Gianelloni +dev/ppc64/use.mask, +ppc64/use.mask: diff --git a/profiles/default-linux/ppc/use.mask b/profiles/default-linux/ppc/use.mask index 25b85100137b..6a57d78b9a4d 100644 --- a/profiles/default-linux/ppc/use.mask +++ b/profiles/default-linux/ppc/use.mask @@ -4,7 +4,6 @@ acpi afs avi -fdftk lm_sensors rar diff --git a/profiles/default-linux/ppc64/use.mask b/profiles/default-linux/ppc64/use.mask index 4c04d617e468..ff4846397e19 100644 --- a/profiles/default-linux/ppc64/use.mask +++ b/profiles/default-linux/ppc64/use.mask @@ -16,7 +16,6 @@ ruby firebird mzscheme chasen -fdftk mono beagle rar diff --git a/profiles/default-linux/s390/use.mask b/profiles/default-linux/s390/use.mask index 59580ad58c71..82a3350c1d3a 100644 --- a/profiles/default-linux/s390/use.mask +++ b/profiles/default-linux/s390/use.mask @@ -43,7 +43,6 @@ pfpro solid sybase sybase-ct -fdftk # masked until xorg builds diff --git a/profiles/default-linux/sh/use.mask b/profiles/default-linux/sh/use.mask index 9d0a0240d803..1249c3648907 100644 --- a/profiles/default-linux/sh/use.mask +++ b/profiles/default-linux/sh/use.mask @@ -11,7 +11,6 @@ java-internal java-external # dont make sense on this arch -fdftk 3dfx # broken upstream, see libavcodec/sh4/idct_sh4.c:#error diff --git a/profiles/default-linux/sparc/ChangeLog b/profiles/default-linux/sparc/ChangeLog index 07c18576f2c5..50577da56608 100644 --- a/profiles/default-linux/sparc/ChangeLog +++ b/profiles/default-linux/sparc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sparc profile # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.13 2006/12/06 17:48:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.14 2006/12/29 21:13:18 flameeyes Exp $ + + 29 Dec 2006; Diego Pettenò use.mask: + Mask fdftk useflag on base profile and unmask for x86 only. 06 Dec 2006; Diego Pettenò sparc32/use.mask, use.mask: diff --git a/profiles/default-linux/sparc/use.mask b/profiles/default-linux/sparc/use.mask index ff1754136e0e..a13848ddc517 100644 --- a/profiles/default-linux/sparc/use.mask +++ b/profiles/default-linux/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/default-linux/sparc/use.mask,v 1.100 2006/12/21 18:29:14 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/use.mask,v 1.101 2006/12/29 21:13:18 flameeyes Exp $ # This file contains a list of useflags that cannot be used on sparc. @@ -16,7 +16,6 @@ directfb djbfft dvb dmi -fdftk g15 glitz graphlcd diff --git a/profiles/default-linux/x86/ChangeLog b/profiles/default-linux/x86/ChangeLog index daccf9646142..716b17389491 100644 --- a/profiles/default-linux/x86/ChangeLog +++ b/profiles/default-linux/x86/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/x86 profile directory # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.44 2006/12/28 12:16:15 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.45 2006/12/29 21:13:18 flameeyes Exp $ + + 29 Dec 2006; Diego Pettenò use.mask: + Mask fdftk useflag on base profile and unmask for x86 only. 28 Dec 2006; Tristan Heaven no-nptl/2.4/package.mask: x11-misc/revelation requires GNOME 2.16 diff --git a/profiles/default-linux/x86/use.mask b/profiles/default-linux/x86/use.mask index 02cd3e7f18b5..593ded8fe34a 100644 --- a/profiles/default-linux/x86/use.mask +++ b/profiles/default-linux/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/default-linux/x86/use.mask,v 1.22 2006/08/23 20:40:24 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.23 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 diff --git a/profiles/hardened/amd64/use.mask b/profiles/hardened/amd64/use.mask index 865809445743..0193653b4492 100644 --- a/profiles/hardened/amd64/use.mask +++ b/profiles/hardened/amd64/use.mask @@ -1,6 +1,6 @@ # Copyright 2006 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.19 2006/12/21 16:21:29 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.20 2006/12/29 21:13:18 flameeyes Exp $ # 2006/06/13 - Danny van Dyk # Mask clvm on amd64, as it isn't keyworded at all. @@ -83,10 +83,6 @@ pvm # Firebird doesnt build on amd64 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/hardened/ppc/use.mask b/profiles/hardened/ppc/use.mask index 593ff1087750..66fab2fb0ad9 100644 --- a/profiles/hardened/ppc/use.mask +++ b/profiles/hardened/ppc/use.mask @@ -14,7 +14,6 @@ dmi empress empress-bcs esoob -fdftk filepro firebird fmod diff --git a/profiles/hardened/ppc64/use.mask b/profiles/hardened/ppc64/use.mask index 9f5e888e0522..e6164b55c77e 100644 --- a/profiles/hardened/ppc64/use.mask +++ b/profiles/hardened/ppc64/use.mask @@ -20,7 +20,6 @@ ruby firebird mzscheme chasen -fdftk mono beagle rar diff --git a/profiles/hardened/x86/use.mask b/profiles/hardened/x86/use.mask index f4a84c06a1b9..a67b5911201d 100644 --- a/profiles/hardened/x86/use.mask +++ b/profiles/hardened/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/hardened/x86/use.mask,v 1.24 2006/11/23 14:07:36 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.25 2006/12/29 21:13:18 flameeyes Exp $ -3dnow -3dnowext @@ -44,3 +44,6 @@ ibm #input_devices_wacom -x264 + +# Adobe FDF toolkit is x86 only. +-fdftk 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 # 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 @@ -88,10 +88,6 @@ pvm # Firebird doesnt build on amd64 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 -# x86 binary only package -fdftk - # Ciaran McCreesh # 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 diff --git a/profiles/uclibc/x86/use.mask b/profiles/uclibc/x86/use.mask index c0cd81e4e27d..4e9a1329fc57 100644 --- a/profiles/uclibc/x86/use.mask +++ b/profiles/uclibc/x86/use.mask @@ -6,3 +6,6 @@ -sse2 -win32codecs -kqemu + +# Adobe FDF toolkit is x86 only. +-fdftk diff --git a/profiles/use.desc b/profiles/use.desc index fa3f3cc0c541..cafbfcef37f8 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -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/use.desc,v 1.330 2006/12/06 07:08:39 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.331 2006/12/29 21:13:17 flameeyes Exp $ # Keep them sorted @@ -95,7 +95,6 @@ expat - Enable the use of dev-libs/expat fam - Enable FAM (File Alteration Monitor) support fastcgi - Add support for the FastCGI interface fbcon - Adds framebuffer support for the console, via the kernel -fdftk - Add supports for Adobe's FDF toolkit. ffmpeg - Enable ffmpeg support fftw - Use FFTW library for computing Fourier transforms filepro - Adds support for filePro databases diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 086e66fa703f..27b51c16f20d 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.2458 2006/12/29 12:54:45 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.2459 2006/12/29 21:13:17 flameeyes Exp $ # This file contains descriptions of local USE flags, and the ebuilds which # contain them. @@ -365,6 +365,7 @@ dev-lang/php:cli - Enable CLI SAPI dev-lang/php:concurrentmodphp - Make it possible to load both mod_php4 and mod_php5 into the same Apache2 instance (experimental) dev-lang/php:discard-path - Switch on common security setting for CGI SAPI dev-lang/php:fastbuild - Build PHP quicker (experimental) +dev-lang/php:fdftk - Add supports for Adobe's FDF toolkit. dev-lang/php:force-cgi-redirect - Switch on common security setting for CGI SAPI dev-lang/php:hash - Enable the hash extension dev-lang/php:java-external - Use the external java extension rather than the bundled one -- 2.26.2