[gentoo-commits] proj/releng:master commit in: releases/weekly/portage/admincd/package.mask/, ...

[gentoo-commits] proj/releng:master commit in: releases/weekly/portage/admincd/package.mask/, ...

[Mike Frysinger]

commit:     c28038b0dcc07c9c8bca332f289b98f159387f47
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 21:42:14 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 21:42:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=c28038b0

admincd: sync settings w/installcd

Also drop some old package.keywords settings as those are now stable.

 releases/weekly/portage/admincd/package.keywords/genkernel          | 3 ++-
 releases/weekly/portage/admincd/package.keywords/livecd-tools       | 1 -
 releases/weekly/portage/admincd/package.keywords/packages           | 2 --
 releases/weekly/portage/admincd/package.mask/{packages => modutils} | 0
 releases/weekly/portage/admincd/package.mask/sysvinit               | 1 +
 releases/weekly/portage/admincd/package.use/cifs-utils              | 4 ++++
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/releases/weekly/portage/admincd/package.keywords/genkernel b/releases/weekly/portage/admincd/package.keywords/genkernel
index e90901b..3ca4af8 100644
--- a/releases/weekly/portage/admincd/package.keywords/genkernel
+++ b/releases/weekly/portage/admincd/package.keywords/genkernel
@@ -1 +1,2 @@
-=sys-kernel/genkernel-3.4.52.3
+# Pull in newer version for System.map fixes.
+=sys-kernel/genkernel-3.4.52.4-r1

diff --git a/releases/weekly/portage/admincd/package.keywords/livecd-tools b/releases/weekly/portage/admincd/package.keywords/livecd-tools
deleted file mode 100644
index dd9f635..0000000
--- a/releases/weekly/portage/admincd/package.keywords/livecd-tools
+++ /dev/null
@@ -1 +0,0 @@
-=app-misc/livecd-tools-2.0.3

diff --git a/releases/weekly/portage/admincd/package.keywords/packages b/releases/weekly/portage/admincd/package.keywords/packages
index b4f0f72..e785b45 100644
--- a/releases/weekly/portage/admincd/package.keywords/packages
+++ b/releases/weekly/portage/admincd/package.keywords/packages
@@ -1,7 +1,5 @@
 sys-apps/chname
-=sys-block/fio-2.0.13
 sys-block/lsiutil
 sys-block/megacli
 sys-block/megarc
 sys-fs/ext3grep
-=sys-fs/extundelete-0.2.0-r1

diff --git a/releases/weekly/portage/admincd/package.mask/packages b/releases/weekly/portage/admincd/package.mask/modutils
similarity index 100%
rename from releases/weekly/portage/admincd/package.mask/packages
rename to releases/weekly/portage/admincd/package.mask/modutils

diff --git a/releases/weekly/portage/admincd/package.mask/sysvinit b/releases/weekly/portage/admincd/package.mask/sysvinit
new file mode 100644
index 0000000..b76cffe
--- /dev/null
+++ b/releases/weekly/portage/admincd/package.mask/sysvinit
@@ -0,0 +1 @@
+<sys-apps/sysvinit-2.88-r7

diff --git a/releases/weekly/portage/admincd/package.use/cifs-utils b/releases/weekly/portage/admincd/package.use/cifs-utils
new file mode 100644
index 0000000..b0de5d5
--- /dev/null
+++ b/releases/weekly/portage/admincd/package.use/cifs-utils
@@ -0,0 +1,4 @@
+net-fs/cifs-utils -acl -ads
+sys-libs/ntdb python
+sys-libs/tdb python
+sys-libs/tevent python