From: Mamoru Komachi <usata@gentoo.org>
Date: Thu, 25 Nov 2004 10:54:22 +0000 (+0000)
Subject: Masked imlib (because of gtk+-1 mask).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed88ef99cc42683eb8c63d36bc9ff895a3a2a429;p=gentoo.git

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

diff --git a/profiles/default-darwin/macos/use.mask b/profiles/default-darwin/macos/use.mask
index 3b56957f1103..6b94b98c507b 100644
--- 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 3534797bbdc2..8a19c76feedd 100644
--- 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