From be29e670c41eeef7e97735674a6d0472049fe42c Mon Sep 17 00:00:00 2001
From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@gentoo.org>
Date: Thu, 21 Apr 2016 02:00:11 +0000
Subject: [PATCH] Merge admincd / installcd portage configuration.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
---
 releases/weekly/portage/installcd/package.keywords/genkernel  | 2 --
 releases/weekly/portage/installcd/package.mask/libtool        | 1 -
 releases/weekly/portage/installcd/package.mask/modutils       | 2 --
 releases/weekly/portage/installcd/package.mask/openrc         | 2 --
 releases/weekly/portage/installcd/package.mask/perl           | 1 -
 releases/weekly/portage/installcd/package.mask/sysvinit       | 1 -
 releases/weekly/portage/installcd/package.use/cifs-utils      | 4 ----
 .../packages => isos/package.keywords/admincd-packages}       | 0
 .../portage/{admincd => isos}/package.keywords/genkernel      | 0
 .../weekly/portage/{admincd => isos}/package.keywords/zfs     | 0
 .../weekly/portage/{admincd => isos}/package.mask/libtool     | 0
 .../weekly/portage/{admincd => isos}/package.mask/modutils    | 0
 releases/weekly/portage/{admincd => isos}/package.mask/openrc | 0
 releases/weekly/portage/{admincd => isos}/package.mask/perl   | 0
 .../weekly/portage/{admincd => isos}/package.mask/sysvinit    | 0
 .../packages => isos/package.use/admincd-packages}            | 0
 .../weekly/portage/{admincd => isos}/package.use/cifs-utils   | 0
 17 files changed, 13 deletions(-)
 delete mode 100644 releases/weekly/portage/installcd/package.keywords/genkernel
 delete mode 100644 releases/weekly/portage/installcd/package.mask/libtool
 delete mode 100644 releases/weekly/portage/installcd/package.mask/modutils
 delete mode 100644 releases/weekly/portage/installcd/package.mask/openrc
 delete mode 100644 releases/weekly/portage/installcd/package.mask/perl
 delete mode 100644 releases/weekly/portage/installcd/package.mask/sysvinit
 delete mode 100644 releases/weekly/portage/installcd/package.use/cifs-utils
 rename releases/weekly/portage/{admincd/package.keywords/packages => isos/package.keywords/admincd-packages} (100%)
 rename releases/weekly/portage/{admincd => isos}/package.keywords/genkernel (100%)
 rename releases/weekly/portage/{admincd => isos}/package.keywords/zfs (100%)
 rename releases/weekly/portage/{admincd => isos}/package.mask/libtool (100%)
 rename releases/weekly/portage/{admincd => isos}/package.mask/modutils (100%)
 rename releases/weekly/portage/{admincd => isos}/package.mask/openrc (100%)
 rename releases/weekly/portage/{admincd => isos}/package.mask/perl (100%)
 rename releases/weekly/portage/{admincd => isos}/package.mask/sysvinit (100%)
 rename releases/weekly/portage/{admincd/package.use/packages => isos/package.use/admincd-packages} (100%)
 rename releases/weekly/portage/{admincd => isos}/package.use/cifs-utils (100%)

diff --git a/releases/weekly/portage/installcd/package.keywords/genkernel b/releases/weekly/portage/installcd/package.keywords/genkernel
deleted file mode 100644
index 3ca4af85..00000000
--- a/releases/weekly/portage/installcd/package.keywords/genkernel
+++ /dev/null
@@ -1,2 +0,0 @@
-# Pull in newer version for System.map fixes.
-=sys-kernel/genkernel-3.4.52.4-r1
diff --git a/releases/weekly/portage/installcd/package.mask/libtool b/releases/weekly/portage/installcd/package.mask/libtool
deleted file mode 100644
index 9e600485..00000000
--- a/releases/weekly/portage/installcd/package.mask/libtool
+++ /dev/null
@@ -1 +0,0 @@
-<sys-devel/libtool-2.4.3-r2
diff --git a/releases/weekly/portage/installcd/package.mask/modutils b/releases/weekly/portage/installcd/package.mask/modutils
deleted file mode 100644
index 20af96e9..00000000
--- a/releases/weekly/portage/installcd/package.mask/modutils
+++ /dev/null
@@ -1,2 +0,0 @@
-sys-apps/module-init-tools
-sys-apps/modutils
diff --git a/releases/weekly/portage/installcd/package.mask/openrc b/releases/weekly/portage/installcd/package.mask/openrc
deleted file mode 100644
index 2185913f..00000000
--- a/releases/weekly/portage/installcd/package.mask/openrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<sys-apps/openrc-0.13.0
-<sys-process/procps-3.3.9-r2
diff --git a/releases/weekly/portage/installcd/package.mask/perl b/releases/weekly/portage/installcd/package.mask/perl
deleted file mode 100644
index e750717d..00000000
--- a/releases/weekly/portage/installcd/package.mask/perl
+++ /dev/null
@@ -1 +0,0 @@
-<dev-lang/perl-5.18.0
diff --git a/releases/weekly/portage/installcd/package.mask/sysvinit b/releases/weekly/portage/installcd/package.mask/sysvinit
deleted file mode 100644
index b76cffef..00000000
--- a/releases/weekly/portage/installcd/package.mask/sysvinit
+++ /dev/null
@@ -1 +0,0 @@
-<sys-apps/sysvinit-2.88-r7
diff --git a/releases/weekly/portage/installcd/package.use/cifs-utils b/releases/weekly/portage/installcd/package.use/cifs-utils
deleted file mode 100644
index b0de5d58..00000000
--- a/releases/weekly/portage/installcd/package.use/cifs-utils
+++ /dev/null
@@ -1,4 +0,0 @@
-net-fs/cifs-utils -acl -ads
-sys-libs/ntdb python
-sys-libs/tdb python
-sys-libs/tevent python
diff --git a/releases/weekly/portage/admincd/package.keywords/packages b/releases/weekly/portage/isos/package.keywords/admincd-packages
similarity index 100%
rename from releases/weekly/portage/admincd/package.keywords/packages
rename to releases/weekly/portage/isos/package.keywords/admincd-packages
diff --git a/releases/weekly/portage/admincd/package.keywords/genkernel b/releases/weekly/portage/isos/package.keywords/genkernel
similarity index 100%
rename from releases/weekly/portage/admincd/package.keywords/genkernel
rename to releases/weekly/portage/isos/package.keywords/genkernel
diff --git a/releases/weekly/portage/admincd/package.keywords/zfs b/releases/weekly/portage/isos/package.keywords/zfs
similarity index 100%
rename from releases/weekly/portage/admincd/package.keywords/zfs
rename to releases/weekly/portage/isos/package.keywords/zfs
diff --git a/releases/weekly/portage/admincd/package.mask/libtool b/releases/weekly/portage/isos/package.mask/libtool
similarity index 100%
rename from releases/weekly/portage/admincd/package.mask/libtool
rename to releases/weekly/portage/isos/package.mask/libtool
diff --git a/releases/weekly/portage/admincd/package.mask/modutils b/releases/weekly/portage/isos/package.mask/modutils
similarity index 100%
rename from releases/weekly/portage/admincd/package.mask/modutils
rename to releases/weekly/portage/isos/package.mask/modutils
diff --git a/releases/weekly/portage/admincd/package.mask/openrc b/releases/weekly/portage/isos/package.mask/openrc
similarity index 100%
rename from releases/weekly/portage/admincd/package.mask/openrc
rename to releases/weekly/portage/isos/package.mask/openrc
diff --git a/releases/weekly/portage/admincd/package.mask/perl b/releases/weekly/portage/isos/package.mask/perl
similarity index 100%
rename from releases/weekly/portage/admincd/package.mask/perl
rename to releases/weekly/portage/isos/package.mask/perl
diff --git a/releases/weekly/portage/admincd/package.mask/sysvinit b/releases/weekly/portage/isos/package.mask/sysvinit
similarity index 100%
rename from releases/weekly/portage/admincd/package.mask/sysvinit
rename to releases/weekly/portage/isos/package.mask/sysvinit
diff --git a/releases/weekly/portage/admincd/package.use/packages b/releases/weekly/portage/isos/package.use/admincd-packages
similarity index 100%
rename from releases/weekly/portage/admincd/package.use/packages
rename to releases/weekly/portage/isos/package.use/admincd-packages
diff --git a/releases/weekly/portage/admincd/package.use/cifs-utils b/releases/weekly/portage/isos/package.use/cifs-utils
similarity index 100%
rename from releases/weekly/portage/admincd/package.use/cifs-utils
rename to releases/weekly/portage/isos/package.use/cifs-utils