Masked imlib (because of gtk+-1 mask).

diff --git a/profiles/default-darwin/macos/use.mask b/profiles/default-darwin/macos/use.mask
index 3b56957f1103ed81bace4dea4b82b31231a7399d..6b94b98c507b8417464eb723c7ada056a11ea966 100644 (file)
--- a/profiles/default-darwin/macos/use.mask
+++ b/profiles/default-darwin/macos/use.mask
@@ -5,6 +5,9 @@
 gtk
 gtk2
 
+# imlib depends on gtk+-1
+imlib
+
 perl
 
 # tcl ebuild overwrites Apple's tcl, so we mask it (dev-lang/ruby)

diff --git a/profiles/default-macos/ppc/use.mask b/profiles/default-macos/ppc/use.mask
index 3534797bbdc2e5b7c73661efa2a096710900cb5a..8a19c76feeddeb347690870eddfe2cdb23334563 100644 (file)
--- a/profiles/default-macos/ppc/use.mask
+++ b/profiles/default-macos/ppc/use.mask
@@ -34,6 +34,9 @@ tcltk
 gtk
 gtk2
 
+# imlib depends on gtk
+imlib
+
 # masking these until we get deps sorted out
 esd
 mikmod
@@ -71,5 +74,9 @@ svga
 sybase
 sybase-ct
 
+<<<<<<< use.mask
+djbfft
+=======
 djbfft
 perl
+>>>>>>> 1.13