From 149d6e87069036aec413834ff93fa59fb9db2ab6 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sat, 10 May 2014 14:01:13 +0100
Subject: [PATCH] Update package names to reflect Gentoo ones

---
 blivet/devices.py           | 10 +++++-----
 blivet/formats/fs.py        |  4 ++--
 blivet/formats/luks.py      |  2 +-
 blivet/formats/multipath.py |  2 +-
 blivet/platform.py          |  6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/blivet/devices.py b/blivet/devices.py
index 1af4e00..137a61b 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -1987,7 +1987,7 @@ class DMCryptDevice(DMDevice):
 class LUKSDevice(DMCryptDevice):
     """ A mapped LUKS device. """
     _type = "luks/dm-crypt"
-    _packages = ["cryptsetup-luks"]
+    _packages = ["cryptsetup"]
 
     def __init__(self, name, format=None, size=None, uuid=None,
                  exists=False, sysfsPath='', parents=None):
@@ -3612,7 +3612,7 @@ class DMRaidArrayDevice(DMDevice):
 class MultipathDevice(DMDevice):
     """ A multipath device """
     _type = "dm-multipath"
-    _packages = ["device-mapper-multipath"]
+    _packages = ["multipath-tools"]
     _services = ["multipathd"]
     _partitionable = True
     _isDisk = True
@@ -3990,7 +3990,7 @@ class LoopDevice(StorageDevice):
 class iScsiDiskDevice(DiskDevice, NetworkStorageDevice):
     """ An iSCSI disk. """
     _type = "iscsi"
-    _packages = ["iscsi-initiator-utils", "dracut-network"]
+    _packages = ["open-iscsi"]
 
     def __init__(self, device, **kwargs):
         self.node = kwargs.pop("node")
@@ -4055,7 +4055,7 @@ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice):
 class FcoeDiskDevice(DiskDevice, NetworkStorageDevice):
     """ An FCoE disk. """
     _type = "fcoe"
-    _packages = ["fcoe-utils", "dracut-network"]
+    _packages = ["fcoe-utils"]
 
     def __init__(self, device, **kwargs):
         self.nic = kwargs.pop("nic")
@@ -4227,7 +4227,7 @@ class DASDDevice(DiskDevice):
 class NFSDevice(StorageDevice, NetworkStorageDevice):
     """ An NFS device """
     _type = "nfs"
-    _packages = ["dracut-network"]
+    _packages = []
 
     def __init__(self, device, format=None, parents=None):
         # we could make host/ip, path, &c but will anything use it?
diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index 103717e..a03d3b6 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -1153,7 +1153,7 @@ class ReiserFS(FS):
     _supported = False
     _dump = True
     _check = True
-    _packages = ["reiserfs-utils"]
+    _packages = ["reiserfsprogs"]
     _infofs = "debugreiserfs"
     _defaultInfoOptions = []
     _existingSizeFields = ["Count of blocks on the device:", "Blocksize:"]
@@ -1255,7 +1255,7 @@ class HFSPlus(FS):
     _udevTypes = ["hfsplus"]
     _mkfs = "mkfs.hfsplus"
     _fsck = "fsck.hfsplus"
-    _packages = ["hfsplus-tools"]
+    _packages = ["hfsutils"]
     _formattable = True
     _mountType = "hfsplus"
     _minSize = 1
diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py
index 8f9ae7b..0eea209 100644
--- a/blivet/formats/luks.py
+++ b/blivet/formats/luks.py
@@ -49,7 +49,7 @@ class LUKS(DeviceFormat):
     _formattable = True                 # can be formatted
     _supported = False                  # is supported
     _linuxNative = True                 # for clearpart
-    _packages = ["cryptsetup-luks"]     # required packages
+    _packages = ["cryptsetup"]          # required packages
     _minSize = crypto.LUKS_METADATA_SIZE
 
     def __init__(self, *args, **kwargs):
diff --git a/blivet/formats/multipath.py b/blivet/formats/multipath.py
index 2d6a5f3..b5c808b 100644
--- a/blivet/formats/multipath.py
+++ b/blivet/formats/multipath.py
@@ -39,7 +39,7 @@ class MultipathMember(DeviceFormat):
     _formattable = False                # can be formatted
     _supported = True                   # is supported
     _linuxNative = False                # for clearpart
-    _packages = ["device-mapper-multipath"] # required packages
+    _packages = ["multipath-tools"]     # required packages
     _resizable = False                  # can be resized
     _maxSize = 0                        # maximum size in MB
     _minSize = 0                        # minimum size in MB
diff --git a/blivet/platform.py b/blivet/platform.py
index 31c4f50..f5d4dda 100644
--- a/blivet/platform.py
+++ b/blivet/platform.py
@@ -129,7 +129,7 @@ class Platform(object):
     def packages (self):
         _packages = self._packages
         if flags.boot_cmdline.get('fips', None) == '1':
-            _packages.append('dracut-fips')
+            _packages.append('sys-kernel/dracut')
         return _packages
 
     def setDefaultPartitioning(self):
@@ -211,7 +211,7 @@ class MacEFI(EFI):
     _boot_stage1_format_types = ["macefi"]
     _boot_efi_description = N_("Apple EFI Boot Partition")
     _non_linux_format_types = ["macefi"]
-    _packages = ["mactel-boot"]
+    _packages = []
 
     def setDefaultPartitioning(self):
         ret = Platform.setDefaultPartitioning(self)
@@ -276,7 +276,7 @@ class PS3(PPC):
     pass
 
 class S390(Platform):
-    _packages = ["s390utils"]
+    _packages = ["sys-apps/s390-tools"]
     _disklabel_types = ["msdos", "dasd"]
     _boot_stage1_device_types = ["disk", "partition"]
     _boot_dasd_description = N_("DASD")
-- 
1.9.2