profiles: Clean up / unify masking of use flag "firebird"

6 files changed, 16 insertions, 9 deletions

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 6a106a3063b5..354467b5023d 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -6,6 +6,10 @@
 
 # SECTION: Unmask
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017)
+# dev-db/firebird is keyworded ~amd64
+-firebird
+
 # cilk has been ported to this arch.
 -cilk
 
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 30b67e51e71e..01113197b388 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017)
+# dev-db/firebird is keyworded ~amd64
+firebird
+
 # Michał Górny <mgorny@gentoo.org> (20 May 2017)
 # The modern versions of CUDA SDK are not suitable for stabilization.
 cuda
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index f0b9a1342bbb..eee848c3d6c2 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -47,11 +47,6 @@ dev-python/apptools test
 # Masked since skype isn't stable
 net-im/bitlbee skype
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (29 Jun 2014)
-# Not yet stabilized dependencies blocking sec bug 514886
-# we need to repeat this here likely because of the use.mask entry
-app-office/libreoffice firebird
-
 # Michał Górny <mgorny@gentoo.org> (30 Mar 2014)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 5cfbcb80234a..a973a33dfdd7 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017)
+# dev-db/firebird is keyworded ~x86
+-firebird
+
 # cilk has been ported to this arch.
 -cilk
 
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 3a096d726fc7..1b0299b3697e 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017)
+# dev-db/firebird is keyworded ~x86
+firebird
+
 # Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
 # sys-libs/libapparmor
 apparmor
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 3aadf24624b6..83015b1cb870 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -152,10 +152,6 @@ media-libs/libcaca java mono
 # dev-libs/opencryptoki will not be stabile any time soon (bug#510204)
 app-crypt/tpm-tools pkcs11
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (29 Jun 2014)
-# Not yet stabilized dependencies blocking sec bug 514886
-app-office/libreoffice firebird
-
 # Sergey Popov <pinkbyte@gentoo.org> (28 Oct 2013)
 # sys-cluster/cman is still in ~arch.
 sys-cluster/pacemaker cman