From 883662241ce7ab45515484e7b53a2e967408d203 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 8 Nov 2017 10:19:14 +0100
Subject: Remove remaining special-case documentation for MISC

---
 gemato/manifest.py        | 34 +++++++++++++++++-----------------
 gemato/recursiveloader.py |  3 +--
 gemato/verify.py          |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/gemato/manifest.py b/gemato/manifest.py
index 029f93b..7b482bc 100644
--- a/gemato/manifest.py
+++ b/gemato/manifest.py
@@ -185,50 +185,50 @@ class ManifestEntryDATA(ManifestFileEntry):
         return super(ManifestEntryDATA, self).to_list(self.tag)
 
 
-class ManifestEntryMISC(ManifestFileEntry):
+class ManifestEntryDIST(ManifestFileEntry):
     """
-    Non-obligatory file reference.
+    Distfile reference.
     """
 
-    tag = 'MISC'
+    tag = 'DIST'
 
     @classmethod
     def from_list(cls, l):
-        assert l[0] == cls.tag
         path = cls.process_path(l[:2])
+        if '/' in path:
+            raise gemato.exceptions.ManifestSyntaxError(
+                    'DIST line: file name expected, got directory path: {}'.format(path))
         size, checksums = cls.process_checksums(l)
         return cls(path, size, checksums)
 
     def to_list(self):
-        return super(ManifestEntryMISC, self).to_list(self.tag)
+        return super(ManifestEntryDIST, self).to_list(self.tag)
 
 
-class ManifestEntryDIST(ManifestFileEntry):
+class ManifestEntryEBUILD(ManifestFileEntry):
     """
-    Distfile reference.
+    Deprecated ebuild file reference (equivalent to DATA).
     """
 
-    tag = 'DIST'
+    tag = 'EBUILD'
 
     @classmethod
     def from_list(cls, l):
+        assert l[0] == cls.tag
         path = cls.process_path(l[:2])
-        if '/' in path:
-            raise gemato.exceptions.ManifestSyntaxError(
-                    'DIST line: file name expected, got directory path: {}'.format(path))
         size, checksums = cls.process_checksums(l)
         return cls(path, size, checksums)
 
     def to_list(self):
-        return super(ManifestEntryDIST, self).to_list(self.tag)
+        return super(ManifestEntryEBUILD, self).to_list(self.tag)
 
 
-class ManifestEntryEBUILD(ManifestFileEntry):
+class ManifestEntryMISC(ManifestFileEntry):
     """
-    Deprecated ebuild file reference (equivalent to DATA).
+    Deprecated 'non-strict' checksum (now equivalent to DATA).
     """
 
-    tag = 'EBUILD'
+    tag = 'MISC'
 
     @classmethod
     def from_list(cls, l):
@@ -238,7 +238,7 @@ class ManifestEntryEBUILD(ManifestFileEntry):
         return cls(path, size, checksums)
 
     def to_list(self):
-        return super(ManifestEntryEBUILD, self).to_list(self.tag)
+        return super(ManifestEntryMISC, self).to_list(self.tag)
 
 
 class ManifestEntryAUX(ManifestFileEntry):
@@ -273,9 +273,9 @@ MANIFEST_TAG_MAPPING = {
     'MANIFEST': ManifestEntryMANIFEST,
     'IGNORE': ManifestEntryIGNORE,
     'DATA': ManifestEntryDATA,
-    'MISC': ManifestEntryMISC,
     'DIST': ManifestEntryDIST,
     'EBUILD': ManifestEntryEBUILD,
+    'MISC': ManifestEntryMISC,
     'AUX': ManifestEntryAUX,
 }
 
diff --git a/gemato/recursiveloader.py b/gemato/recursiveloader.py
index daaa298..69aba90 100644
--- a/gemato/recursiveloader.py
+++ b/gemato/recursiveloader.py
@@ -600,8 +600,7 @@ class ManifestRecursiveLoader(object):
         entries, the remaining entries will be removed. This function
         does not check if they were compatible.
 
-        The type of MANIFEST, DATA and MISC derived entries
-        is preserved.
+        The type of MANIFEST and DATA derived entries is preserved.
 
         If the path exists and has no Manifest entry, a new entry
         of type @new_entry_type will be created in the Manifest most
diff --git a/gemato/verify.py b/gemato/verify.py
index 6497cd7..6193e76 100644
--- a/gemato/verify.py
+++ b/gemato/verify.py
@@ -224,7 +224,7 @@ def update_entry_for_path(path, e, hashes=None, expected_dev=None,
     not change.
 
     The file must exist and be a regular file, and the entry must be
-    of MISC, DATA, MANIFEST or a derived type. The path/filename
+    of DATA, MANIFEST or a derived type. The path/filename
     is not updated nor checked.
 
     If @expected_dev is not None, verifies that the file resides
-- 
cgit v1.2.3