From 1ba26efe46b7eb7a91f1b76bc626bcd361e5e82c Mon Sep 17 00:00:00 2001
From: "Gregory M. Tuner" <gmt@be-evil.net>
Date: Fri, 27 Jun 2014 02:53:34 -0700
Subject: package.{un,}mask: mask/unmask pairs

This creates a <foo-X mask and =foo-Z unmask for some instances
where Z<X, and there exists some Y s.t. Z<Y<X, and both
foo-X and foo-Z are multilibutized in the overlay, but foo-Y is
nonmultilibutized and upstream.

Eventually, assuming some better fix to the multilib dependency
crap going on upstream, we'll have to do this for all such instances.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
---
 profiles/multilibpython-base/package.mask   | 7 +++++++
 profiles/multilibpython-base/package.unmask | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/profiles/multilibpython-base/package.mask b/profiles/multilibpython-base/package.mask
index 584263b..e280efc 100644
--- a/profiles/multilibpython-base/package.mask
+++ b/profiles/multilibpython-base/package.mask
@@ -1,3 +1,10 @@
 # prevent mysql overlay dev-db/mysql-5.5.36 which is a live version
 # and has a problem for the moment (needs sync w/ upstream & review)
 =dev-db/mysql-5.5.36
+
+# mask to prevent non-multilib versions spilling through
+<dev-libs/json-glib-1.0.2-r1
+<media-libs/cogl-1.18.0-r1
+<x11-libs/gtk+-3.12.2-r1:3
+<dev-libs/gobject-introspection-1.40.0-r1
+<app-accessibility/at-spi2-atk-2.12.1-r1
diff --git a/profiles/multilibpython-base/package.unmask b/profiles/multilibpython-base/package.unmask
index 87913f3..baefe87 100644
--- a/profiles/multilibpython-base/package.unmask
+++ b/profiles/multilibpython-base/package.unmask
@@ -5,3 +5,11 @@
 =dev-python/sip-4.15.5-r1
 =media-video/libav-10.1-r1
 =dev-libs/nspr-4.10.6-r1
+
+# unmasked to allow multilibutized versions to spill through our own
+# anti-no-multilib masks
+=dev-libs/json-glib-0.16.2-r1
+=media-libs/cogl-1.16.2-r1
+=x11-libs/gtk+-3.10.8-r1
+=dev-libs/gobject-introspection-1.38.0-r1
+=app-accessibility/at-spi2-atk-2.10.2-r1
-- 
cgit v1.2.3-65-gdbad