Remove the tiny digest files from the tree. They are a major annoyance as on a
-typical configuration they waste a lot of discspace and the simple transmission
+typical configuration they waste a lot of disk space and the simple transmission
of the names for all digest files during a emerge--sync needs a substantial
amount of bandwidth.

Reduce redundancy when multiple hash functions are used

@@ -112,7 +112,7 @@

EBUILD for all ebuilds

MISCFILE for files not directly used by ebuilds like ChangeLog or
metadata.xml files

-

SRCURI for release tarballs recorded in the SRC_URI variable of an ebuild,
+

DISTFILE for release tarballs recorded in the SRC_URI variable of an ebuild,
these were previously recorded in the digest files

Normal users that don't use a "tuned" filesystem for the portage tree are
-wasting several dozen to a few hundred megabytes of discspace with the current
+wasting several dozen to a few hundred megabytes of disk space with the current
system, largely caused by the digest files.
This is due to the filesystem overhead present in most filesystem that
have a standard blocksize of four kilobytes while most digest files are under
@@ -192,7 +192,7 @@
per digest file (likely even more). At the time of this writing the tree contains
roughly 22.000 digest files, so the overall waste caused by digest files is
estimated at about 70-100 megabytes.
-Furthermore it is assumed that this will also reduce the discspace wasted by
+Furthermore it is assumed that this will also reduce the disk space wasted by
the Manifest files as they now contain more content, but this hasn't been
verified yet.

By unifying the digest files with the Manifest these tiny files are eliminated
@@ -210,7 +210,7 @@

The current system theoretically allows for a SRCURI type file to be recorded
+

The current system theoretically allows for a DISTFILE type file to be recorded
in multiple digest files with different sizes and/or checksums. In such a case
one version of a package would report a checksum violation while another one
would not. This could create confusion and uncertainity among users.
@@ -221,7 +221,7 @@

Right now portage verifies the checksum of every file listed in the Manifest
-before using any file of the package and all SRCURI files of an ebuild
+before using any file of the package and all DISTFILE files of an ebuild
before using that ebuild. This is unnecessary in many cases:

During the "depend" phase (when the ebuild metadata is generated) only
@@ -234,7 +234,7 @@

Generally files of type MISCFILE don't need to be verified as they are
only used in very specific situations, aren't executed (just parsed at most)
and don't affect the package build process.

-

Files of type SRCURI only need to be verified directly after fetching and
+

Files of type DISTFILE only need to be verified directly after fetching and
before unpacking them (which often will be one step), not every time their
associated ebuild is used.

@@ -320,7 +320,7 @@
like any other checksum. But so far no real benefit (other than a slightly
more modular implementation) for this has been seen while it has several
drawbacks: For once, unlike checksums, the size field is definitely required
-for all SRCURI files, also it would slightly increase the length of
+for all DISTFILE files, also it would slightly increase the length of
each entry by adding a SIZE keyword.

removal of the MISCFILE type: It has been suggested to completely drop
entries of type MISCFILE. This would result in a minor space reduction
@@ -378,7 +378,7 @@