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>

diff --git a/profiles/prefix/darwin/macos/10.12/package.mask b/profiles/prefix/darwin/macos/10.12/package.mask
index c103679ebe5624cf6d2e48a00f593558c4d6961b..2ae88c5d92118c24f64e87f8d03798e4057522b1 100644 (file)
--- 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 976d5958e04489d82c770664068cd431b2647c7b..6f1df312f1971811d7dcfbaf8f410f169467d435 100644 (file)
--- 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 c103679ebe5624cf6d2e48a00f593558c4d6961b..1bb624aa74a4b4bf99d5ae21b368de039a09bcf9 100644 (file)
--- 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 8d5dc6869f26b68746204b7ffc54d8df1846cca8..6f1df312f1971811d7dcfbaf8f410f169467d435 100644 (file)
--- 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 c103679ebe5624cf6d2e48a00f593558c4d6961b..e3f098738d17fa1c9d735c290d8daf6dec28618a 100644 (file)
--- 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 d6a37a4480bf9f6263c94e9de62bc4ff1800c2da..6f1df312f1971811d7dcfbaf8f410f169467d435 100644 (file)
--- 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 56e44d1bdef956470881b361d11028d048c0c39e..017bcf4c12163ccd2de444d0c840bdd9a773b63f 100644 (file)
--- 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