diff options
author | Daniel Robbins <drobbins@gentoo.org> | 2002-07-30 18:00:50 +0000 |
---|---|---|
committer | Daniel Robbins <drobbins@gentoo.org> | 2002-07-30 18:00:50 +0000 |
commit | b19b7c841f61972c6b70c1f00a88d88582c13a88 (patch) | |
tree | 005b96292c3a71a023b2ff63dac1ed5193cbf594 | |
parent | new gcc; cleanups; fix gjc to be disabled (diff) | |
download | historical-b19b7c841f61972c6b70c1f00a88d88582c13a88.tar.gz historical-b19b7c841f61972c6b70c1f00a88d88582c13a88.tar.bz2 historical-b19b7c841f61972c6b70c1f00a88d88582c13a88.zip |
conflict fix?
-rw-r--r-- | profiles/package.mask | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index 1e0fcace404d..9987535881fb 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -22,6 +22,10 @@ ## End example ## +# Daniel Robbins <drobbins@gentoo.org> (30 Jul 2002) +# no corresponding PyQt on cvs to get this thing to compile +dev-python/anygui + # <blizzy@gentoo.org> (30 Jul 2002) # masked for testing =net-im/gnomeicu-0.98.2-r4 @@ -32,7 +36,8 @@ media-video/kxine # George <george@gentoo.org> (29 Jul 2002) # masked for testing -dev-libs/lam-mpi +#dev-libs/lam-mpi +#works for me (drobbins@gentoo.org), and fftw needs it so I'm unmasking it (30 Jul 2002) # Spider <spider@gentoo.org> (29 Jul 2002) # New version, lots of different USE flags that I havent tested together. @@ -369,6 +374,7 @@ net-mail/exmh # and a more erratic release schedule; only tomcat 3.2.2 # depends on it, and 3.2.2 is old. dev-java/jaxp +=dev-db/postgresql-7.1-r1 =net-www/tomcat-3.2.2 #azarah@gentoo.org (03 Jul 2002) @@ -758,18 +764,10 @@ dev-lang/tcl-tk # Doesn't seem to work with xfs :-( >=sys-apps/grub-0.91 -#tod@gentoo.org, 8 Feb 2002 -#buggy version, use 0.1.1 instead -=dev-python/anygui-0.1 - -#simply won't compile for us -=dev-python/PyQt-3.0 - # We are masking out the older pams now, in order to get the # new one propogated into everybodys systems. ( Woodchip - Mar 20 2002) <sys-libs/pam-0.75-r4 - =dev-ruby/mod-ruby-0.9.7 #security update |