Handle decrypted dirs (from archives) specially

To avoid problems merging existing directories after
extraction they get a suffixed number. This also adds
a workaround about a gpgtar bug (GnuPG-Bug-Id: 3500) that
leads to broken directory names.