profiles/prefix/darwin/macos: work with funny masking/unmasking behaviour

can't mask a generic thing and unmask a specific thing apparently, so
take the long and explicit road of masking everything specifically and
unmasking just the one specific thing per profile

Signed-off-by: Fabian Groffen <grobian@gentoo.org>

7 files changed, 21 insertions, 17 deletions

diff --git a/profiles/prefix/darwin/macos/10.12/package.mask b/profiles/prefix/darwin/macos/10.12/package.mask
index c103679ebe56..2ae88c5d9211 100644
--- a/profiles/prefix/darwin/macos/10.12/package.mask
+++ b/profiles/prefix/darwin/macos/10.12/package.mask
@@ -1,2 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
+# Unmask versions matching the OS profile
+-sys-kernel/xnu-headers:10.12
+-sys-libs/darwin-libc-headers:10.12
diff --git a/profiles/prefix/darwin/macos/10.12/package.unmask b/profiles/prefix/darwin/macos/10.12/package.unmask
index 976d5958e044..6f1df312f197 100644
--- a/profiles/prefix/darwin/macos/10.12/package.unmask
+++ b/profiles/prefix/darwin/macos/10.12/package.unmask
@@ -1,11 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
-# Unmask versions matching the OS profile
-sys-kernel/xnu-headers:10.12
-sys-libs/darwin-libc-headers:10.12
-
 # James Le Cuirot <chewi@gentoo.org> (2015-07-29)
 # Recent releases are supported in >10.10.
 dev-java/oracle-jdk-bin
diff --git a/profiles/prefix/darwin/macos/10.13/package.mask b/profiles/prefix/darwin/macos/10.13/package.mask
index c103679ebe56..1bb624aa74a4 100644
--- a/profiles/prefix/darwin/macos/10.13/package.mask
+++ b/profiles/prefix/darwin/macos/10.13/package.mask
@@ -1,2 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
+# Unmask versions matching the OS profile
+-sys-kernel/xnu-headers:10.13
+-sys-libs/darwin-libc-headers:10.13
diff --git a/profiles/prefix/darwin/macos/10.13/package.unmask b/profiles/prefix/darwin/macos/10.13/package.unmask
index 8d5dc6869f26..6f1df312f197 100644
--- a/profiles/prefix/darwin/macos/10.13/package.unmask
+++ b/profiles/prefix/darwin/macos/10.13/package.unmask
@@ -1,11 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
-# Unmask versions matching the OS profile
-sys-kernel/xnu-headers:10.13
-sys-libs/darwin-libc-headers:10.13
-
 # James Le Cuirot <chewi@gentoo.org> (2015-07-29)
 # Recent releases are supported in >10.10.
 dev-java/oracle-jdk-bin
diff --git a/profiles/prefix/darwin/macos/10.14/package.mask b/profiles/prefix/darwin/macos/10.14/package.mask
index c103679ebe56..e3f098738d17 100644
--- a/profiles/prefix/darwin/macos/10.14/package.mask
+++ b/profiles/prefix/darwin/macos/10.14/package.mask
@@ -1,2 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
+# Unmask versions matching the OS profile
+-sys-kernel/xnu-headers:10.14
+-sys-libs/darwin-libc-headers:10.14
diff --git a/profiles/prefix/darwin/macos/10.14/package.unmask b/profiles/prefix/darwin/macos/10.14/package.unmask
index d6a37a4480bf..6f1df312f197 100644
--- a/profiles/prefix/darwin/macos/10.14/package.unmask
+++ b/profiles/prefix/darwin/macos/10.14/package.unmask
@@ -1,11 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
-# Unmask versions matching the OS profile
-sys-kernel/xnu-headers:10.14
-sys-libs/darwin-libc-headers:10.14
-
 # James Le Cuirot <chewi@gentoo.org> (2015-07-29)
 # Recent releases are supported in >10.10.
 dev-java/oracle-jdk-bin
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 56e44d1bdef9..017bcf4c1216 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -4,8 +4,12 @@
 # Fabian Groffen <grobian@gentoo.org> (2019-11-11)
 # We mask all system headers, and only unmask the slot matching the OS
 # install in the version profiles
-sys-kernel/xnu-headers
-sys-libs/darwin-libc-headers
+sys-kernel/xnu-headers:10.12
+sys-libs/darwin-libc-headers:10.12
+sys-kernel/xnu-headers:10.13
+sys-libs/darwin-libc-headers:10.13
+sys-kernel/xnu-headers:10.14
+sys-libs/darwin-libc-headers:10.14
 
 # Fabian Groffen <grobian@gentoo.org> (2019-04-30)
 # Fails to install, bug #684030