summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2010-04-07 15:59:17 +0000
committerPatrick Lauer <patrick@gentoo.org>2010-04-07 15:59:17 +0000
commit9e790f53986f124a209cc8666fafbfa113ba0309 (patch)
tree6746b8c543c1abc8bf923ff8bf6b03aaf5d33bd8 /profiles
parentStable on amd64 wrt bug #313145 (diff)
downloadgentoo-2-9e790f53986f124a209cc8666fafbfa113ba0309.tar.gz
gentoo-2-9e790f53986f124a209cc8666fafbfa113ba0309.tar.bz2
gentoo-2-9e790f53986f124a209cc8666fafbfa113ba0309.zip
Fixing samba masks for 3.5 and unsplit ebuilds
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask20
2 files changed, 12 insertions, 13 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0bd1face5a52..a3157a16562e 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4090 2010/04/07 15:01:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4091 2010/04/07 15:59:17 patrick Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 07 Apr 2010; Patrick Lauer <patrick@gentoo.org> package.mask:
+ Fixing samba masks for 3.5 and unsplit ebuilds
+
07 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Mask x11-plugins/wmudmount because required udisks is masked too.
diff --git a/profiles/package.mask b/profiles/package.mask
index 3fc885aefde1..d06aa6b08364 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11428 2010/04/07 15:01:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11429 2010/04/07 15:59:17 patrick Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,13 @@
#--- END OF EXAMPLES ---
+# Patrick Lauer <patrick@gentoo.org> (07 Apr 2010)
+# Migrating back to unsplit samba ebuilds.
+net-fs/samba-libs
+net-fs/samba-server
+net-fs/samba-client
+
+
# Samuli Suominen <ssuominen@gentoo.org> (07 Apr 2010)
# Missing required lvm2 wrt bug #309757. Unmask soon as it's in tree.
sys-fs/udisks
@@ -313,10 +320,6 @@ net-irc/ircd-hybrid
dev-libs/gobject-introspection
dev-libs/gir-repository
-# Patrick Lauer <patrick@gentoo.org> (26 Feb 2010)
-# Unsplit samba ebuild. might need some testing :)
-=net-fs/samba-3.4.6
-
# Theo Chatzimichos <tampakrap@gentoo.org> (26 Feb 2010)
# Mask knetworkmanager as it is crashy, unusable, under
# heavy development, and snapshot
@@ -403,13 +406,6 @@ dev-db/mysql-community
>=dev-haskell/haddock-2.6
=app-admin/haskell-updater-1*
-# Patrick Lauer <patrick@gentoo.org> (26 Jan 2010)
-# Masking release candidates
->=net-fs/samba-3.5.0_rc2
->=net-fs/samba-libs-3.5.0_rc2
->=net-fs/samba-server-3.5.0_rc2
->=net-fs/samba-client-3.5.0_rc2
-
# Nirbheek Chauhan <nirbheek@gentoo.org> (25 Jan 2010)
# Final rc of networkmanager-0.8 and friends
# Mask for testing