summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD.M.D. Ljungmark <spider@gentoo.org>2002-07-18 21:21:18 +0000
committerD.M.D. Ljungmark <spider@gentoo.org>2002-07-18 21:21:18 +0000
commitf04feb20ce06d90e9ea54a7b4b0903d9ac98f2ed (patch)
treea8009353bfc061528c9adaf460b4cd551084d211 /profiles
parentRemoved my unneeded masks and commented out masks. (diff)
downloadhistorical-f04feb20ce06d90e9ea54a7b4b0903d9ac98f2ed.tar.gz
historical-f04feb20ce06d90e9ea54a7b4b0903d9ac98f2ed.tar.bz2
historical-f04feb20ce06d90e9ea54a7b4b0903d9ac98f2ed.zip
cleaning out drobbins 1.998 Conflicted commit. one down one to go
Diffstat (limited to 'profiles')
-rw-r--r--profiles/package.mask30
1 files changed, 25 insertions, 5 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index 2a1a95127e1f..a1a28bf2471c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -43,7 +43,7 @@
# azarah@gentoo.org (17 Jul 2002)
# needs testing.
-=sys-apps/baselayout-1.8.0
+# =sys-apps/baselayout-1.8.0
# cybersystem@gentoo.org (17 Jul 2002)
# Masking knapster2 - this package is broken on gcc 3.1
@@ -163,7 +163,27 @@
# lostlogic@gentoo.org (09 Jul 2002)
# Masked for testing md5 support
+<<<<<<< package.mask
+=net-misc/openssh-3.4_p1-r3
+
+# seemant@gentoo.org (09 Jul 2002)
+# Masked for testing.
+=app-shells/tcsh-6.11
+
+# sunflare@gentoo.org (08 Jul 2002)
+# Masked for testing.
+=app-admin/mon-0.99.2-r1
+
+# sunflare@gentoo.org (08 Jul 2002)
+# Masked for testing.
+=app-doc/doxygen-1.2.16
+
+# sunflare@gentoo.org (08 Jul 2002)
+# Deleted; will remove this dependency once 0.99.2-r1 comes out of testing.
+=app-admin/mon-0.99.2
+=======
#=net-misc/openssh-3.4_p1-r3
+>>>>>>> 1.998
# sunflare@gentoo.org (08 Jul 2002)
# Masking out the old zsnes, since its version numbering scheme is emulation
@@ -208,7 +228,7 @@ dev-java/jaxp
#azarah@gentoo.org (03 Jul 2002)
#this one moves a lot of stuff around, and have a search dir
#order fix that is very experimental
-=sys-devel/gcc-3.1-r8
+# =sys-devel/gcc-3.1-r8
#lostlogic@gentoo.org (03 Jul 2002)
#new apache ebuild changes a bit how we are handling the group
@@ -848,12 +868,12 @@ gnome-extra/libgnomeuimm
>=media-gfx/gimp-1.3.5
gnome-extra/gal2
# >=app-text/ggv-1.99.0
-dev-libs/libmrproject
->=app-office/mrproject-0.5.91
+#dev-libs/libmrproject
+#>=app-office/mrproject-0.5.91
>=app-office/gnumeric-1.1.3
>=dev-python/pygtk-1.99.0
->=app-arch/file-roller-1.106
+# >=app-arch/file-roller-1.106
>=net-irc/xchat-1.9.1
>=dev-util/glade-1.1.0