Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423)

diff --git a/ChangeLog b/ChangeLog
index 80850aee8a7a046d45ae5d1005db0cefbfdbbcc6..862e001eb172017ebecbac39853afc87172f4233 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,17 @@
 # Distributed under the GPL v2
 # $Id$
 
+  03 Jul 2011; Sebastian Pipping <sping@gentoo.org> arch/alpha/modules_load,
+  arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load,
+  arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load,
+  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
+  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
+  defaults/initrd.defaults, defaults/initrd.scripts, defaults/linuxrc,
+  defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh,
+  gen_determineargs.sh, gen_initramfs.sh, genkernel, genkernel.conf,
+  maintenance/docmatcher.py:
+  Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423)
+
   22 Jun 2011; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
   Make --arch-override= affect "make menuconfig" (bug #247246)
 

diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index faf099de3407b86d5767f996b936884432e7f114..731dbf4f7e4c4b2d8dd80949df22e5c9575a119d 100644 (file)
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/arm/modules_load b/arch/arm/modules_load
index cd149515d17f1adbac533ba4bc8fe24b4f4e6f46..4b43271fa13020623e54d9c634a921e1d0fe2eb5 100644 (file)
--- a/arch/arm/modules_load
+++ b/arch/arm/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index 51bdc14f0756eeff99f533dfbf0cc1b74101a572..b3235385c7287fc153828a789091b246c875a885 100644 (file)
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index faf099de3407b86d5767f996b936884432e7f114..731dbf4f7e4c4b2d8dd80949df22e5c9575a119d 100644 (file)
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index faf099de3407b86d5767f996b936884432e7f114..731dbf4f7e4c4b2d8dd80949df22e5c9575a119d 100644 (file)
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index 51bdc14f0756eeff99f533dfbf0cc1b74101a572..b3235385c7287fc153828a789091b246c875a885 100644 (file)
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index faf099de3407b86d5767f996b936884432e7f114..731dbf4f7e4c4b2d8dd80949df22e5c9575a119d 100644 (file)
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index 51bdc14f0756eeff99f533dfbf0cc1b74101a572..b3235385c7287fc153828a789091b246c875a885 100644 (file)
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index faf099de3407b86d5767f996b936884432e7f114..731dbf4f7e4c4b2d8dd80949df22e5c9575a119d 100644 (file)
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index 51bdc14f0756eeff99f533dfbf0cc1b74101a572..b3235385c7287fc153828a789091b246c875a885 100644 (file)
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/um/modules_load b/arch/um/modules_load
index dfe44313a612dfc44ef604fc8e81d877cf1c3a83..625a30482d7c1fa4aade67c7e97c70a0391b7065 100644 (file)
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index 84ec83ec31fa60d969c3fa69c7392009fba18ba6..b7936bf8e46ff532ce66836392ac98cab6b8c4fc 100644 (file)
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -4,7 +4,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index d553165e56c1d46fb9154547640913ea22246fbb..8bae05364fe7e7030223407960cb1471a5228fed 100644 (file)
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 72e8376600742968dba7fba3833b5bfd196a24d7..76d72a70296a8c9e8eb5007ed79f55b5c1eb7278 100755 (executable)
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -79,5 +79,5 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
 
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
-HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb evms lvm dmraid mdadm fs net'
+HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb lvm dmraid mdadm fs net'
 MY_HWOPTS='modules pata sata scsi slowusb usb firewire waitscan dmraid mdadm fs net iscsi'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 37a7eb4c64f304067470322f53083af61a510564..b908ba052e896d5f90b2ddad4c8197ccb956d165 100755 (executable)
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -660,28 +660,10 @@ startVolumes() {
                        # And finally execute it all (/proc/... needed if lvm is compiled without readline)
                        good_msg "Scanning for and activating Volume Groups"
                        printf "%b\n" "${lvm_commands}" | /bin/lvm /proc/self/fd/0
-
-                       # Disable EVMS since lvm is activated and they dont work together.
-                       if [ "${USE_EVMS_NORMAL}" = '1' ]
-                       then
-                               bad_msg "Disabling EVMS Support because LVM started"
-                               bad_msg "Do not add dolvm to the cmdline if this is not what you want"
-                               bad_msg "LVM and EVMS do not work well together"
-                               USE_EVMS_NORMAL=0
-                       fi
                else
                        bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
                fi
        fi
-
-       if [ "${USE_EVMS_NORMAL}" = '1' ]
-       then
-               if [ -e '/sbin/evms_activate' ]
-               then
-                       good_msg "Activating EVMS"
-                       evms_activate
-               fi
-       fi
 }
 
 startiscsi() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 57f26fddc4bfec8f1c3590e4bfc915f2bb71602b..0843f5d8d4439e35646bc0c982a9614f0ef75778 100755 (executable)
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -96,13 +96,6 @@ do
                        DMRAID_OPTS=`parse_opt "${x}"`
                        USE_DMRAID_NORMAL=1
                ;;
-               doevms)
-                       USE_EVMS_NORMAL=1
-               ;;
-               doevms2)
-                       bad_msg 'Using doevms2 is deprecated, use doevms, instead.'
-                       USE_EVMS_NORMAL=1
-               ;;
                # Debug Options
                debug)
                        DEBUG='yes'

diff --git a/defaults/modules_load b/defaults/modules_load
index 31f534b1abee2cf4bab2be5a4d8ff75a049456a7..269a40c78ca39fa05d418a280b638923e06d8edf 100644 (file)
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -3,7 +3,6 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror"
-MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
 

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 54cb4117afd79f172492b6dea7c3f669eb3466ed..2d7f77538a6a3c7d1bc2aac4be6be6b01faa2438 100644 (file)
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -236,10 +236,6 @@ INITIALIZATION
 *--no-keymap*::
     Disables keymap selection at boot.
 
-*--evms*::
-    Add in EVMS support from static binaries if they exist on the system:
-    you should run "emerge evms" first (in the host system).
-
 *--lvm*::
     Add in LVM support from static binaries if they exist on the
     system,  or compile static LVM binaries if static ones do not
@@ -417,9 +413,6 @@ which the ramdisk scripts would recognize.
     location. Otherwise the location will be deduced from the DCHP
     request (option root-path)
 
-*doevms*::
-    Activate EVMS volumes on bootup
-
 *dolvm*::
     Activate LVM volumes on bootup
 

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 9e4009e7efb7599f1d8305b635bfc1b1375bf616..f7eb7072085829126bc15d3c5fafbe8455c89b80 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -75,9 +75,6 @@ longusage() {
   echo "       --splash-res=<res>      Select splash theme resolutions to install"
   echo "       --do-keymap-auto        Forces keymap selection at boot"
   echo "       --no-keymap             Disables keymap selection support"
-  echo "       --evms                  Include EVMS support"
-  echo "                               --> 'emerge evms' in the host operating system"
-  echo "                               first"
   echo "       --lvm                   Include LVM support"
   echo "       --mdadm                 Include MDADM/MDMON support"
   echo "       --mdadm-config=<file>   Use file as mdadm.conf in initramfs"
@@ -224,16 +221,6 @@ parse_cmdline() {
                        CMD_KEYMAP=0
                        print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
                        ;;
-               --evms)
-                       CMD_EVMS=1
-                       print_info 2 "CMD_EVMS: ${CMD_EVMS}"
-                       ;;
-               --evms2)
-                       CMD_EVMS=1
-                       print_info 2 "CMD_EVMS: ${CMD_EVMS}"
-                       echo
-                       print_warning 1 "Please use --evms, as --evms2 is deprecated."
-                       ;;
                --lvm)
                        CMD_LVM=1
                        print_info 2 "CMD_LVM: ${CMD_LVM}"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 6f888051cd4d383a5442f322a9dd169df694aa32..ce479cb47c52a59e58328e8a7c1674ca403f980f 100755 (executable)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -108,7 +108,6 @@ determine_real_args() {
        set_config_with_override STRING INSTALL_MOD_PATH     CMD_INSTALL_MOD_PATH
        set_config_with_override BOOL   OLDCONFIG            CMD_OLDCONFIG
        set_config_with_override BOOL   LVM                  CMD_LVM
-       set_config_with_override BOOL   EVMS                 CMD_EVMS
        set_config_with_override BOOL   DMRAID               CMD_DMRAID
        set_config_with_override BOOL   ISCSI                CMD_ISCSI
        set_config_with_override BOOL   BUSYBOX              CMD_BUSYBOX              "yes"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 543f48434fd483f3234cd864d42eca9b60997a18..7fe4421bf99f70e19bce095c22e2bc73e162ee93 100755 (executable)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -279,59 +279,6 @@ append_lvm(){
        rm -r "${TEMP}/initramfs-lvm-temp/"
 }
 
-append_evms(){
-       if [ -d "${TEMP}/initramfs-evms-temp" ]
-       then
-               rm -r "${TEMP}/initramfs-evms-temp/"
-       fi
-       mkdir -p "${TEMP}/initramfs-evms-temp/lib/evms"
-       mkdir -p "${TEMP}/initramfs-evms-temp/etc/"
-       mkdir -p "${TEMP}/initramfs-evms-temp/bin/"
-       mkdir -p "${TEMP}/initramfs-evms-temp/sbin/"
-       if [ "${EVMS}" = '1' ]
-       then
-               print_info 1 '          EVMS: Adding support...'
-               mkdir -p ${TEMP}/initramfs-evms-temp/lib
-               cp -a /lib/ld-* "${TEMP}/initramfs-evms-temp/lib" \
-                       || gen_die 'Could not copy files for EVMS!'
-               if [ -n "`ls /lib/libgcc_s*`" ]
-               then
-                       cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms-temp/lib" \
-                               || gen_die 'Could not copy files for EVMS!'
-               fi
-               cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms-temp/lib" \
-                       || gen_die 'Could not copy files for EVMS!'
-               cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms-temp/lib" \
-                       || gen_die 'Could not copy files for EVMS!'
-               cp -a /lib/libpthread* "${TEMP}/initramfs-evms-temp/lib" \
-                       || gen_die 'Could not copy files for EVMS!'
-               cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms-temp/lib" \
-                       || gen_die 'Could not copy files for EVMS!'
-               cp -a /lib/libevms*so* "${TEMP}/initramfs-evms-temp/lib" \
-                       || gen_die 'Could not copy files for EVMS!'
-               cp -a /lib/evms "${TEMP}/initramfs-evms-temp/lib" \
-                       || gen_die 'Could not copy files for EVMS!'
-               cp -a /lib/evms/* "${TEMP}/initramfs-evms-temp/lib/evms" \
-                       || gen_die 'Could not copy files for EVMS!'
-               cp -a /etc/evms.conf "${TEMP}/initramfs-evms-temp/etc" \
-                       || gen_die 'Could not copy files for EVMS!'
-               cp /sbin/evms_activate "${TEMP}/initramfs-evms-temp/sbin" \
-                       || gen_die 'Could not copy over evms_activate!'
-
-               # Fix EVMS complaining that it can't find the swap utilities.
-               # These are not required in the initramfs
-               for swap_libs in "${TEMP}/initramfs-evms-temp/lib/evms/*/swap*.so"
-               do
-                       rm ${swap_libs}
-               done
-       fi
-       cd "${TEMP}/initramfs-evms-temp/"
-       find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-                       || gen_die "compressing evms cpio"
-       cd "${TEMP}"
-       rm -r "${TEMP}/initramfs-evms-temp/"
-}
-
 append_mdadm(){
        if [ -d "${TEMP}/initramfs-mdadm-temp" ]
        then
@@ -676,7 +623,6 @@ create_initramfs() {
        append_data 'lvm' "${LVM}"
        append_data 'dmraid' "${DMRAID}"
        append_data 'iscsi' "${ISCSI}"
-       append_data 'evms' "${EVMS}"
        append_data 'mdadm' "${MDADM}"
        append_data 'luks' "${LUKS}"
        append_data 'multipath' "${MULTIPATH}"

diff --git a/genkernel b/genkernel
index f72cf43f493e33bf9ad67bfe310509c0d2cb4690..38e445f7a3cf99dc430bee2fb64e1403b1f171a9 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -348,7 +348,6 @@ then
        print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
        [ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
        [ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support'
-       [ "${EVMS}" = '1' ] && print_warning 1 'add "doevms" for evms support'
        [ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
        [ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
        [ "${DMRAID}" = '1' ] && print_warning 1 '      or "dodmraid=<additional options>"'

diff --git a/genkernel.conf b/genkernel.conf
index 420eb9392f7e168742a07f9f18a6cbf86dfffe13..24fcd54faeb7efdd95b7ffd12deacf0d20ccc7a6 100644 (file)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -62,10 +62,6 @@ USECOLOR="yes"
 # Add in GnuPG support
 # GPG="no"
 
-# Add in EVMS support from static binaries if they exist on the system: you
-# should run "emerge evms" first.
-# EVMS="no"
-
 # Add DMRAID support.
 # DMRAID="no"
 

diff --git a/maintenance/docmatcher.py b/maintenance/docmatcher.py
index 848774abadded78328ceaa925d4ca35dfc08b68f..6ba2cf9201273a3c8c27ecf8ccbead761a05cb6c 100644 (file)
--- a/maintenance/docmatcher.py
+++ b/maintenance/docmatcher.py
@@ -27,7 +27,7 @@ EXTRA_VARIABLES = tuple(EXTRA_VARIABLES)
 IGNORE_OPTIONS = ('help', 'version')
 _GPG_PARAMETERS = ('symmetric', )
 IGNORE_PARAMETERS = _GPG_PARAMETERS
-DEPRECATED_PARAMETERS = ('lvm2', 'evms2', 'gensplash', 'gensplash-res')
+DEPRECATED_PARAMETERS = ('lvm2', 'gensplash', 'gensplash-res')
 
 
 def exract_gen_cmdline_sh():